mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商户入驻以及生产缴纳保证金 界面修改

Browse Source
This commit is contained in:
jia 2023-09-27 14:17:58 +08:00
parent 805b194fe8
commit a87694f02c
4 changed files with 870 additions and 911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages.json
View File

@ -151,7 +151,7 @@
"path" : "pages/margin/margin",
"style" :
{
"navigationBarTitleText": "",
"navigationBarTitleText":"缴纳保证金",
"enablePullDownRefresh": false
}

106
pages/gather/gather.vue
View File

@ -1,29 +1,14 @@
<template>
<view class="gather">
<view v-if="isFshow">
<view
class="site-box flex_a_c_j_sb"
:style="{ opacity: backColor }"
@click="selectLocation"
>
<view
:class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']"
@click="selectLocation"
>
<view
:class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
style="margin-left: 20rpx"
>
<view class="site-box flex_a_c_j_sb" :style="{ opacity: backColor }" @click="selectLocation">
<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style="margin-left: 20rpx">
</view>
<view class="town_name">{{ street }}</view>
</view>
<navigator
url="/pages/chat/customer_list/index?type=0"
hover-class="none"
>
<view
:class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"
></view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
</navigator>
</view>
</view>
@ -33,26 +18,15 @@
<view class="iconfont icon-weizhi"></view>
<view class="town_name">{{ street }}</view>
</view>
<navigator
url="/pages/chat/customer_list/index?type=0"
hover-class="none"
>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
</navigator>
</view>
</view>
<zbpSwiper
:isSelectPlace="true"
:location_Arr="locationArr"
:town="street"
></zbpSwiper>
<u-empty
:show="jurisdiction"
mode="permission"
:text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"
></u-empty>
<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street"></zbpSwiper>
<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
<view class="business com special_work" v-if="jurisdiction == false">
<view class="title project">
<view>更多功能</view>
@ -61,35 +35,19 @@
</view>
<view class="content">
<block v-if="nowMenuList.length > 0">
<u-transition
v-for="(item, index) in nowMenuList"
:key="item.name"
show
>
<view
class="examine"
@click="
<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
<view class="examine" @click="
editFlag ? removeMenu(item) : clickMenu(item.type, item.data)
"
>
">
<image class="icon_img" :src="item.icon" mode="aspectFit">
</image>
<u-icon
v-if="editFlag"
class="icon"
name="minus-circle-fill"
color="red"
></u-icon>
<u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon>
<text class="text">{{ item.name }}</text>
</view>
</u-transition>
</block>
<view
v-else-if="!editFlag"
@click="editFlag = true"
style="text-align: center; width: 100%; color: #aaa"
>还没有应用,点我添加应用</view
>
<view v-else-if="!editFlag" @click="editFlag = true"
style="text-align: center; width: 100%; color: #aaa">还没有应用,点我添加应用</view>
</view>
</view>
<view v-if="editFlag" class="business com special_work edit_card">
@ -98,11 +56,7 @@
<view class="edit2" @click="editComfirm">完成</view>
</view>
<view class="content">
<u-transition
v-for="(item, index) in AllMenuList"
:key="item.name"
show
>
<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
<view class="examine" @click="pushMenu(item)">
<image class="icon_img" :src="item.icon" mode="aspectFit"> </image>
<u-icon class="icon" name="plus-circle-fill"></u-icon>
@ -112,16 +66,8 @@
</view>
</view>
<u-picker
:defaultIndex="[0, 0]"
:show="showPicker"
ref="uPicker"
:columns="columnData"
@confirm="confirm"
@cancel="showPicker = false"
@change="changeHandler"
keyName="name"
></u-picker>
<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<!-- <m-tabbar native>
<template v-slot:tabbar_index_2>
<view class="custom_style">
@ -195,7 +141,8 @@ export default {
AllMenuList: [{
name: '商户平台',
icon: '/static/applet/shop_app.png',
data: "__UNI__1EE148C",
// data: "__UNI__1EE148C",
data: '/pages/moreProject/moreProject',
type: 2,
},
{
@ -407,9 +354,16 @@ export default {
getUniMp(type, data) {
// #ifdef APP-PLUS
switch (type) {
case 1: uniMP.loadMP(data); break;
case 2: uniMP.loadMPx(data); break;
case 3: uniMP.loadMPurl(data); break;
case 1:
uniMP.loadMP(data);
break;
// case 2: uniMP.loadMPx(data); break;
case 2:
this.navigator(data); break;
case 3:
uniMP.loadMPurl(data);
break;
}
return;
// #endif

28
pages/moreProject/moreProject.vue
View File

@ -1,16 +1,20 @@
<template>
<view class="gather">
<!-- #ifdef MP || APP-PLUS -->
<view class="conten-top">
<view class="" style="position: absolute;left: 30rpx;" @click="logout"><i class="iconfont icon-xiangzuo"
style="font-size: 40rpx;text-align: left;"></i></view>
<view class="" style="font-size: 30rpx;">
<view class="conten-top" :style="'height:'+statusBarHeight+'px'">
<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
<view class=""
style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
商家平台
</view>
</view>
<view style="padding-top:var(--status-bar-height);padding-bottom: 30rpx; margin-bottom: 30rpx;"></view>
<view :style="'height:'+statusBarHeight+'px'"></view>
<!-- #endif -->
<block v-if="isShow&&userInfoData.mer_info.mer_name">
<view class="" v-if="userInfoData.mer_info.setting_status==1">
<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
@ -81,7 +85,7 @@
<view class="examine" @click="navigator(`/pages/margin/margin`)">
<image class="icon_img" src="@/static/images/jy.png">
</image>
<text class="text">保证缴纳金</text>
<text class="text">缴纳保证金</text>
</view>
<!-- <view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
@ -197,7 +201,7 @@
<view class="examine" @click="margin(`/pages/margin/margin`)">
<image class="icon_img" src="@/static/images/jy.png">
</image>
<text class="text">保证缴纳金</text>
<text class="text">缴纳保证金</text>
</view>
<!-- <view class="examine"
@ -317,7 +321,7 @@
<view class="examine" @click="navigator(`/pages/margin/margin`)">
<image class="icon_img" src="@/static/images/jy.png">
</image>
<text class="text">保证缴纳金</text>
<text class="text">缴纳保证金</text>
</view>
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
@ -388,7 +392,7 @@
<view class="examine" @click="navigator(`/pages/margin/margin`)">
<image class="icon_img" src="@/static/images/jy.png">
</image>
<text class="text">保证缴纳金</text>
<text class="text">缴纳保证金</text>
</view>
</view>
</view>
@ -618,7 +622,7 @@
cardno_back: ''
},
Fheight: 0,
statusBarHeight: 0
};
},
computed: {
@ -627,7 +631,7 @@
created() {},
onLoad() {
this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
},
onShow() {
if (this.isLogin) {
@ -954,8 +958,6 @@
.conten-top {
width: 100%;
padding-top: var(--status-bar-height);
padding-bottom: 30rpx;
text-align: center;
background-color: #fff;
position: absolute;

29
pages/store/settled/index.vue
View File

@ -2,13 +2,14 @@
<view class="">
<!-- #ifdef MP || APP-PLUS -->
<view class="conten-top">
<view class="" style="position: absolute;left: 30rpx;" @click="logout"><i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
<view class="" style="font-size: 30rpx;">
<view class="conten-top" :style="'height:'+statusBarHeight+'px'">
<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i class="iconfont icon-xiangzuo"
style="font-size: 40rpx;text-align: left;"></i></view>
<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
商家入驻
</view>
</view>
<view style="height:var(--status-bar-height);margin-bottom: 30rpx;"></view>
<view :style="'height:'+statusBarHeight+'px'"></view>
<!-- #endif -->
<view v-if="!successful" :style="viewColor" >
@ -22,7 +23,7 @@
申请记录
<text class="iconfont icon-xiangyou"></text>
</view>
<view class='list' style="padding-top: var(--status-bar-height);">
<view class='list'>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">商户名称</text>
@ -36,8 +37,8 @@
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">联系电话</text>
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn"
placeholder-class='placeholder' />
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item rel">
@ -236,7 +237,8 @@
<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
</view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
</authorize>
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
ref="verify">
</Verify>
@ -368,7 +370,8 @@
mer_i_id: null, // 商户申请id
isType: false,
num: 10,
detail: {}
detail: {},
statusBarHeight:0
};
},
beforeDestroy() {
@ -397,6 +400,7 @@
}
this.getArea()
this.shoplist()
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
},
onShow() {
@ -957,10 +961,6 @@
.conten-top {
width: 100%;
// height: 120rpx;
padding-top:var(--status-bar-height);
// line-height:230rpx;
padding-bottom: 30rpx;
text-align: center;
background-color: #fff;
position: absolute;
@ -968,6 +968,7 @@
position: fixed;
z-index: 10;
}
.uni-input-placeholder {
color: #B2B2B2;
}
@ -998,7 +999,9 @@
.merchantsSettled {
background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
height: 140vh;
position: relative;
}
.merchantsSettled .merchantBg {