界面更新

This commit is contained in:
jia 2023-10-09 19:01:21 +08:00
parent a258376e12
commit a429994608
2 changed files with 40 additions and 58 deletions

View File

@ -361,7 +361,7 @@
merstreet, merstreet,
getUserInfo getUserInfo
} from '@/api/user.js'; } from '@/api/user.js';
import { import {
business, business,
intention, intention,
intentionbus intentionbus
@ -463,6 +463,14 @@
limit: 3, limit: 3,
status: 2 status: 2
}, },
where1: {
product_type: 0
},
where2: {
type: 2,
page: 1,
limit: 10
},
loadend: false, loadend: false,
loading: false, loading: false,
loadTitle: '加载更多', loadTitle: '加载更多',
@ -473,9 +481,7 @@
userInfoData: {}, userInfoData: {},
isshow: false, isshow: false,
where1: {
product_type: 0
},
codenote: [], codenote: [],
validate: false, validate: false,
merchantData: { merchantData: {
@ -502,7 +508,7 @@
}, },
onLoad() { onLoad() {
this.getUserInfo()
this.list1() this.list1()
this.Fheight = uni.getSystemInfoSync().windowHeight + 'px'; this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
}, },
@ -519,14 +525,10 @@
}, },
mounted() {
this.list1()
},
onShow() { onShow() {
this.getUserInfo() this.getUserInfo()
this.codelist()
}, },
beforeDestroy() { beforeDestroy() {
@ -541,7 +543,8 @@
}, },
// //
codelist() { codelist() {
intention(this.where).then(res => {
intention(this.where2).then(res => {
this.codenote = res.data.list this.codenote = res.data.list
}) })
}, },
@ -781,40 +784,15 @@
// //
byset() { byset() {
if (this.userid) { if (this.userid) {
uni.navigateTo({
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { url: '/pages/product/basicSet?mer_id=' + this.userInfoData
if (this.codenote.length == 0) { .service
this.isFshow = true .mer_id
this.countDown() })
} else {
if (this.codenote[0].status == 0) {
uni.showModal({
title: '申请正在审核中,请勿重复提交'
})
} else {
this.isFshow = true
this.countDown()
}
}
} else {
uni.navigateTo({
url: '/pages/product/basicSet?mer_id=' + this.userInfoData
.service
.mer_id
})
}
} else { } else {
this.isAuto = true; this.isAuto = true;
this.isShowAuth = true this.isShowAuth = true
} }
}, },
// //
logout() { logout() {
@ -969,12 +947,10 @@
}, },
// //
navation(item) { navation(item) {
if (item.type == 8) {
uni.navigateTo({
url: '/pages/moreProject/moreProject'
})
}
if (this.userid) { if (this.userid) {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
if (this.codenote.length == 0) { if (this.codenote.length == 0) {
this.isFshow = true this.isFshow = true
@ -989,6 +965,11 @@
this.countDown() this.countDown()
} }
} }
if (item.type == 8) {
uni.navigateTo({
url: '/pages/moreProject/moreProject'
})
}
} else { } else {
switch (item.type) { switch (item.type) {
@ -1037,12 +1018,17 @@
}) })
break; break;
case 8:
uni.navigateTo({
url: '/pages/moreProject/moreProject'
})
break;
} }
} }

View File

@ -57,7 +57,7 @@
<text class="text">入库管理</text> <text class="text">入库管理</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')"> @click="buyserset">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
@ -189,7 +189,7 @@
<text class="text">商品管理</text> <text class="text">商品管理</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> @click="buyserset">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
@ -307,7 +307,7 @@
</image> </image>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> @click="buyserset">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
@ -401,16 +401,13 @@
<view class="special_work com"> <view class="special_work com">
<view class="title">我的店铺</view> <view class="title">我的店铺</view>
<view class="content "> <view class="content ">
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> @click="buyserset">
<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -875,6 +872,7 @@
} }
}, },
// //
buyserset() { buyserset() {
uni.navigateTo({ uni.navigateTo({
@ -882,10 +880,8 @@
}) })
}, },
navigator(url, t) { navigator(url, t) {
console.log(this.codenote)
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
if (this.codenote.length == 0) { if (this.codenote.length == 0) {
this.isFshow = true this.isFshow = true
this.countDown() this.countDown()