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", "path" : "pages/margin/margin",
"style" : "style" :
{ {
"navigationBarTitleText": "", "navigationBarTitleText":"缴纳保证金",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }

236
pages/gather/gather.vue
View File

@ -1,29 +1,14 @@
<template> <template>
<view class="gather"> <view class="gather">
<view v-if="isFshow"> <view v-if="isFshow">
<view <view class="site-box flex_a_c_j_sb" :style="{ opacity: backColor }" @click="selectLocation">
class="site-box flex_a_c_j_sb" <view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
:style="{ opacity: backColor }" <view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style="margin-left: 20rpx">
@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>
<view class="town_name">{{ street }}</view> <view class="town_name">{{ street }}</view>
</view> </view>
<navigator <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
url="/pages/chat/customer_list/index?type=0" <view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
hover-class="none"
>
<view
:class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"
></view>
</navigator> </navigator>
</view> </view>
</view> </view>
@ -33,26 +18,15 @@
<view class="iconfont icon-weizhi"></view> <view class="iconfont icon-weizhi"></view>
<view class="town_name">{{ street }}</view> <view class="town_name">{{ street }}</view>
</view> </view>
<navigator <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
url="/pages/chat/customer_list/index?type=0"
hover-class="none"
>
<view class="iconfont icon-xiaoxi" style="color: #fff"> </view> <view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
</navigator> </navigator>
</view> </view>
</view> </view>
<zbpSwiper <zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street"></zbpSwiper>
:isSelectPlace="true" <u-empty :show="jurisdiction" mode="permission" :text="emptyText"
:location_Arr="locationArr" icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
: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="business com special_work" v-if="jurisdiction == false">
<view class="title project"> <view class="title project">
<view>更多功能</view> <view>更多功能</view>
@ -61,35 +35,19 @@
</view> </view>
<view class="content"> <view class="content">
<block v-if="nowMenuList.length > 0"> <block v-if="nowMenuList.length > 0">
<u-transition <u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
v-for="(item, index) in nowMenuList" <view class="examine" @click="
:key="item.name"
show
>
<view
class="examine"
@click="
editFlag ? removeMenu(item) : clickMenu(item.type, item.data) editFlag ? removeMenu(item) : clickMenu(item.type, item.data)
" ">
>
<image class="icon_img" :src="item.icon" mode="aspectFit"> <image class="icon_img" :src="item.icon" mode="aspectFit">
</image> </image>
<u-icon <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon>
v-if="editFlag"
class="icon"
name="minus-circle-fill"
color="red"
></u-icon>
<text class="text">{{ item.name }}</text> <text class="text">{{ item.name }}</text>
</view> </view>
</u-transition> </u-transition>
</block> </block>
<view <view v-else-if="!editFlag" @click="editFlag = true"
v-else-if="!editFlag" style="text-align: center; width: 100%; color: #aaa">还没有应用,点我添加应用</view>
@click="editFlag = true"
style="text-align: center; width: 100%; color: #aaa"
>还没有应用,点我添加应用</view
>
</view> </view>
</view> </view>
<view v-if="editFlag" class="business com special_work edit_card"> <view v-if="editFlag" class="business com special_work edit_card">
@ -98,11 +56,7 @@
<view class="edit2" @click="editComfirm">完成</view> <view class="edit2" @click="editComfirm">完成</view>
</view> </view>
<view class="content"> <view class="content">
<u-transition <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
v-for="(item, index) in AllMenuList"
:key="item.name"
show
>
<view class="examine" @click="pushMenu(item)"> <view class="examine" @click="pushMenu(item)">
<image class="icon_img" :src="item.icon" mode="aspectFit"> </image> <image class="icon_img" :src="item.icon" mode="aspectFit"> </image>
<u-icon class="icon" name="plus-circle-fill"></u-icon> <u-icon class="icon" name="plus-circle-fill"></u-icon>
@ -112,16 +66,8 @@
</view> </view>
</view> </view>
<u-picker <u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
:defaultIndex="[0, 0]" @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
:show="showPicker"
ref="uPicker"
:columns="columnData"
@confirm="confirm"
@cancel="showPicker = false"
@change="changeHandler"
keyName="name"
></u-picker>
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
@ -133,48 +79,48 @@
</template> </template>
<script> <script>
import Cache from '@/utils/cache'; import Cache from '@/utils/cache';
import mTabbar from '@/components/m-tabbar/m-tabbar.vue' import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
import zbpSwiper from '@/components/zbpSwiper' import zbpSwiper from '@/components/zbpSwiper'
import { import {
getArea, getArea,
getStreet getStreet
} from '@/api/article.js'; } from '@/api/article.js';
import { import {
mapState, mapState,
mapGetters mapGetters
} from 'vuex' } from 'vuex'
import { import {
getWorkArticleCount, getWorkArticleCount,
getSlideAPI getSlideAPI
} from '@/api/article.js' } from '@/api/article.js'
import { import {
getStoreList, getStoreList,
getUserInfo getUserInfo
} from '@/api/user.js' } from '@/api/user.js'
import { import {
getGeocoder, getGeocoder,
microSeachBarCode, microSeachBarCode,
microEadtProduct microEadtProduct
} from '@/api/store.js' } from '@/api/store.js'
import { import {
Toast Toast
} from '@/libs/uniApi'; } from '@/libs/uniApi';
import { import {
getDiy getDiy
} from '@/api/api.js'; } from '@/api/api.js';
// #ifdef APP-PLUS // #ifdef APP-PLUS
import uniMP from '@/utils/uniMP.js'; import uniMP from '@/utils/uniMP.js';
// #endif // #endif
export default { export default {
components: { components: {
mTabbar, mTabbar,
zbpSwiper zbpSwiper
}, },
data () { data() {
return { return {
locationArr: ({}), locationArr: ({}),
emptyText: '暂无可用应用', emptyText: '暂无可用应用',
@ -195,7 +141,8 @@ export default {
AllMenuList: [{ AllMenuList: [{
name: '商户平台', name: '商户平台',
icon: '/static/applet/shop_app.png', icon: '/static/applet/shop_app.png',
data: "__UNI__1EE148C", // data: "__UNI__1EE148C",
data: '/pages/moreProject/moreProject',
type: 2, type: 2,
}, },
{ {
@ -271,13 +218,13 @@ export default {
computed: { computed: {
...mapGetters(['userInfo', 'location', 'isLogin']) ...mapGetters(['userInfo', 'location', 'isLogin'])
}, },
created () { }, created() {},
onLoad () { onLoad() {
this.Area() this.Area()
this.initMenu(); this.initMenu();
}, },
onShow () { onShow() {
if (this.isLogin) { if (this.isLogin) {
this.emptyText = '暂无可用应用' this.emptyText = '暂无可用应用'
this.jurisdiction = false this.jurisdiction = false
@ -289,15 +236,15 @@ export default {
}, },
onPullDownRefresh () { onPullDownRefresh() {
this.getUserInfo() this.getUserInfo()
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
beforeDestroy () { beforeDestroy() {
// 销毁监听事件 // 销毁监听事件
this.$bus.$off('value-updated') this.$bus.$off('value-updated')
}, },
mounted () { mounted() {
if (this.street.length <= 0) { if (this.street.length <= 0) {
this.appLocation() this.appLocation()
} }
@ -313,7 +260,7 @@ export default {
}, },
// #ifdef APP-PLUS // #ifdef APP-PLUS
onPageScroll (e) { onPageScroll(e) {
const scrollTop = e.scrollTop; const scrollTop = e.scrollTop;
if (scrollTop <= 20) { if (scrollTop <= 20) {
this.backColor = 'rgba(252, 252, 252, 0)' this.backColor = 'rgba(252, 252, 252, 0)'
@ -329,7 +276,7 @@ export default {
// #endif // #endif
methods: { methods: {
scrolling () { scrolling() {
// 滚动条距文档顶部的距离 // 滚动条距文档顶部的距离
let scrollTop = let scrollTop =
window.pageYOffset || window.pageYOffset ||
@ -371,7 +318,7 @@ export default {
}, },
// 初始化菜单 // 初始化菜单
initMenu () { initMenu() {
let now = uni.getStorageSync('gatherNowMenuList'); let now = uni.getStorageSync('gatherNowMenuList');
try { try {
this.nowMenuList = JSON.parse(now); this.nowMenuList = JSON.parse(now);
@ -382,34 +329,41 @@ export default {
this.nowMenuList = []; this.nowMenuList = [];
} }
}, },
clickMenu (e, data) { clickMenu(e, data) {
this.getUniMp(e, data); this.getUniMp(e, data);
}, },
// 添加菜单 // 添加菜单
pushMenu (data) { pushMenu(data) {
this.nowMenuList.push(data); this.nowMenuList.push(data);
this.AllMenuList = this.AllMenuList.filter((item) => { this.AllMenuList = this.AllMenuList.filter((item) => {
return item.name != data.name; return item.name != data.name;
}) })
}, },
// 移除菜单 // 移除菜单
removeMenu (data) { removeMenu(data) {
this.AllMenuList.push(data); this.AllMenuList.push(data);
this.nowMenuList = this.nowMenuList.filter((item) => { this.nowMenuList = this.nowMenuList.filter((item) => {
return item.name != data.name; return item.name != data.name;
}) })
}, },
// 编辑完成 // 编辑完成
editComfirm () { editComfirm() {
this.editFlag = false; this.editFlag = false;
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList)); uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
}, },
getUniMp (type, data) { getUniMp(type, data) {
// #ifdef APP-PLUS // #ifdef APP-PLUS
switch (type) { switch (type) {
case 1: uniMP.loadMP(data); break; case 1:
case 2: uniMP.loadMPx(data); break; uniMP.loadMP(data);
case 3: uniMP.loadMPurl(data); break; break;
// case 2: uniMP.loadMPx(data); break;
case 2:
this.navigator(data); break;
case 3:
uniMP.loadMPurl(data);
break;
} }
return; return;
// #endif // #endif
@ -418,7 +372,7 @@ export default {
title: 'H5不支持打开小程序' title: 'H5不支持打开小程序'
}) })
}, },
changeHandler (e) { changeHandler(e) {
const { const {
columnIndex, columnIndex,
value, value,
@ -435,7 +389,7 @@ export default {
} }
}, },
Area () { Area() {
getArea({ getArea({
city_code: 510500 city_code: 510500
}).then(res => { }).then(res => {
@ -443,17 +397,17 @@ export default {
this.Street(res.data[0]['code']); this.Street(res.data[0]['code']);
}); });
}, },
Street (code) { Street(code) {
getStreet({ getStreet({
area_code: code area_code: code
}).then(res => { }).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data); this.$refs.uPicker.setColumnValues(1, res.data);
}); });
}, },
selectLocation () { selectLocation() {
this.showPicker = true this.showPicker = true
}, },
confirm (e) { confirm(e) {
this.street = e.value[1].name this.street = e.value[1].name
this.$nextTick(() => { this.$nextTick(() => {
@ -462,7 +416,7 @@ export default {
}) })
this.showPicker = false this.showPicker = false
}, },
appLocation () { appLocation() {
uni.getLocation({ uni.getLocation({
type: 'wgs84', type: 'wgs84',
timeout: '10', timeout: '10',
@ -501,13 +455,13 @@ export default {
}, },
navigator (url, t) { navigator(url, t) {
// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息"); // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
uni.navigateTo({ uni.navigateTo({
url: url url: url
}) })
}, },
getUserInfo: function () { getUserInfo: function() {
let that = this; let that = this;
getUserInfo().then(res => { getUserInfo().then(res => {
that.userInfoData = res.data; that.userInfoData = res.data;
@ -528,22 +482,22 @@ export default {
}); });
} }
} }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.gather { .gather {
padding-bottom: 164.91rpx; padding-bottom: 164.91rpx;
background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%); background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
position: relative; position: relative;
} }
.sitebox { .sitebox {
animation-name: fadeIn; animation-name: fadeIn;
animation-duration: 3s; animation-duration: 3s;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
@keyframes fadeIn { @keyframes fadeIn {
from { from {
opacity: 0; opacity: 0;
} }
@ -551,9 +505,9 @@ export default {
to { to {
opacity: 1; opacity: 1;
} }
} }
.site-box1 { .site-box1 {
width: 706rpx; width: 706rpx;
/* #ifdef MP || APP-PLUS */ /* #ifdef MP || APP-PLUS */
height: 160rpx; height: 160rpx;
@ -583,9 +537,9 @@ export default {
.iconfont { .iconfont {
font-size: 35.09rpx; font-size: 35.09rpx;
} }
} }
.site-box { .site-box {
width: 100%; width: 100%;
/* #ifdef MP || APP-PLUS */ /* #ifdef MP || APP-PLUS */
height: 160rpx; height: 160rpx;
@ -627,24 +581,24 @@ export default {
font-size: 30rpx; font-size: 30rpx;
font-size: 35.09rpx; font-size: 35.09rpx;
} }
} }
.top_box { .top_box {
// padding-top: 180rpx; // padding-top: 180rpx;
background: linear-gradient(#36a2ff, #fff); background: linear-gradient(#36a2ff, #fff);
} }
.com { .com {
margin-left: 50%; margin-left: 50%;
transform: translate(-50%); transform: translate(-50%);
} }
.business { .business {
width: 694.74rpx; width: 694.74rpx;
// margin-bottom: 175rpx; // margin-bottom: 175rpx;
} }
.special_work { .special_work {
// padding: 17.54rpx; // padding: 17.54rpx;
width: 694.74rpx; width: 694.74rpx;
margin-top: 52.63rpx; margin-top: 52.63rpx;
@ -734,10 +688,10 @@ export default {
} }
} }
} }
} }
.edit_card { .edit_card {
background-color: #fff; background-color: #fff;
padding-top: 28rpx; padding-top: 28rpx;
} }
</style> </style>

34
pages/moreProject/moreProject.vue
View File

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

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

@ -2,18 +2,19 @@
<view class=""> <view class="">
<!-- #ifdef MP || APP-PLUS --> <!-- #ifdef MP || APP-PLUS -->
<view class="conten-top"> <view class="conten-top" :style="'height:'+statusBarHeight+'px'">
<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="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i class="iconfont icon-xiangzuo"
<view class="" style="font-size: 30rpx;"> 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> </view>
<view style="height:var(--status-bar-height);margin-bottom: 30rpx;"></view> <view :style="'height:'+statusBarHeight+'px'"></view>
<!-- #endif --> <!-- #endif -->
<view v-if="!successful" :style="viewColor" > <view v-if="!successful" :style="viewColor" >
<form report-submit='true'> <form report-submit='true'>
<view class='merchantsSettled' > <view class='merchantsSettled'>
<view class="merchantBgCount"> <view class="merchantBgCount">
<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'" <image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'"
alt=""> alt="">
@ -22,7 +23,7 @@
申请记录 申请记录
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
<view class='list' style="padding-top: var(--status-bar-height);"> <view class='list'>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">商户名称</text> <text class="item-name">商户名称</text>
@ -36,8 +37,8 @@
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">联系电话</text> <text class="item-name">联系电话</text>
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn" <input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
placeholder-class='placeholder' /> @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item rel"> <view class="item rel">
@ -236,12 +237,13 @@
<view class='loadingicon acea-row row-center-wrapper' v-if="loading"> <view class='loadingicon acea-row row-center-wrapper' v-if="loading">
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text> <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
</view> </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' }" <Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
ref="verify"> ref="verify">
</Verify> </Verify>
</view> </view>
<view class="settledSuccessMain " v-else :style="viewColor" > <view class="settledSuccessMain " v-else :style="viewColor">
<view class="settledSuccessful"> <view class="settledSuccessful">
<image class="image" src="../static/images/settledSuccessful.svg" alt=""> <image class="image" src="../static/images/settledSuccessful.svg" alt="">
<view class="title">恭喜，您的资料提交成功！</view> <view class="title">恭喜，您的资料提交成功！</view>
@ -368,7 +370,8 @@
mer_i_id: null, // 商户申请id mer_i_id: null, // 商户申请id
isType: false, isType: false,
num: 10, num: 10,
detail: {} detail: {},
statusBarHeight:0
}; };
}, },
beforeDestroy() { beforeDestroy() {
@ -397,6 +400,7 @@
} }
this.getArea() this.getArea()
this.shoplist() this.shoplist()
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
}, },
onShow() { onShow() {
@ -404,9 +408,9 @@
onReady() {}, onReady() {},
methods: { methods: {
//退出 //退出
logout(){ logout() {
uni.switchTab({ uni.switchTab({
url:'/pages/user/index' url: '/pages/user/index'
}) })
}, },
//关闭弹窗 //关闭弹窗
@ -596,13 +600,13 @@
street_code: this.street_id street_code: this.street_id
}).then((res) => { }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.company ='' this.company = ''
this.organization_code ='' this.organization_code = ''
this.$util.Tips({ this.$util.Tips({
title: res.msg title: res.msg
}); });
return false; return false;
}else{ } else {
this.company = res.data.title this.company = res.data.title
this.organization_code = res.data.organization_code this.organization_code = res.data.organization_code
} }
@ -955,19 +959,16 @@
color: #fff !important; color: #fff !important;
} }
.conten-top{ .conten-top {
width: 100%; width: 100%;
// height: 120rpx;
padding-top:var(--status-bar-height);
// line-height:230rpx;
padding-bottom: 30rpx;
text-align: center; text-align: center;
background-color: #fff; background-color: #fff;
position: absolute; position: absolute;
top:0; top: 0;
position: fixed; position: fixed;
z-index: 10; z-index: 10;
} }
.uni-input-placeholder { .uni-input-placeholder {
color: #B2B2B2; color: #B2B2B2;
} }
@ -998,7 +999,9 @@
.merchantsSettled { .merchantsSettled {
background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
height: 140vh; height: 140vh;
position: relative;
} }
.merchantsSettled .merchantBg { .merchantsSettled .merchantBg {