mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet

This commit is contained in:
weipengfei 2024-03-06 13:39:58 +08:00
parent ca3f5a1114 674e5bcb66
commit bbdea6153c
1 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pages/index/index.vue
View File

@ -728,20 +728,15 @@
}) })
}, },
onReachBottom() { onReachBottom() {
if (this.productList.length > 0) { if (this.productList.length > 0) {
setTimeout(() => { setTimeout(() => {
this.getGoods(false); this.getGoods(false);
this.getindex(); this.getindex();
}, 10) }, 10)
} }
}, },
onShow() { onShow() {
if (this.loadEndFlag) { if (this.loadEndFlag) {
this.getUserInfo(); this.getUserInfo();
@ -894,10 +889,7 @@
title: res title: res
}); });
}) })
} }
}, },
changePopup(e) { changePopup(e) {
if (e.show) uni.hideTabBar(); if (e.show) uni.hideTabBar();
@ -907,7 +899,6 @@
refundModify(item) { refundModify(item) {
this.refundInfo = item; this.refundInfo = item;
this.refundMark = true; this.refundMark = true;
}, },
//同意 //同意
@ -951,7 +942,6 @@
this.countDown(); this.countDown();
}, 1000); }, 1000);
}, },
//验证 //验证
validateBtn: function() { validateBtn: function() {
@ -1032,33 +1022,20 @@
}); });
} }
}, },
//删除图片 //删除图片
DelPic(data) { DelPic(data) {
let that = this; let that = this;
if (data.type == 1) { if (data.type == 1) {
that.merchantData.cardno_front = '' that.merchantData.cardno_front = ''
} else if (data.type == 2) { } else if (data.type == 2) {
that.merchantData.cardno_back = '' that.merchantData.cardno_back = ''
} else if (data.type == 3) { } else if (data.type == 3) {
that.merchantData.bank_front = '' that.merchantData.bank_front = ''
} else { } else {
that.merchantData.bank_back = '' that.merchantData.bank_back = ''
} }
}, },
//商家设置 //商家设置
@ -1174,18 +1151,15 @@
.is_company = 0 .is_company = 0
this.userid = res.data.uid this.userid = res.data.uid
this.userInfoData = res.data; this.userInfoData = res.data;
this.list[0].value = res.data.now_money;
this.$store.commit('SET_USERINFO', res.data); this.$store.commit('SET_USERINFO', res.data);
this.merchantData.phone = res.data.phone; this.merchantData.phone = res.data.phone;
if (res.data.mer_info.is_company == 0) !this.merchantData.company_name ? this.merchantData if (res.data.mer_info.is_company == 0) !this.merchantData.company_name ? this.merchantData
.company_name = "" : null; .company_name = "" : null;
else this.merchantData.company_name = res.data.mer_info.company_name; else this.merchantData.company_name = res.data.mer_info.company_name;
if (res.data.service == null) { if (res.data.service == null) {
// console.log('123');
this.isgShow = false this.isgShow = false
} else { } else {
this.isgShow = true this.isgShow = true
} }
if (res.data.mer_info.length == 0) { if (res.data.mer_info.length == 0) {
uni.showModal({ uni.showModal({
@ -1230,7 +1204,6 @@
// 备注 // 备注
save() { save() {
let that = this; let that = this;
if (!that.refundInfo.remark) { if (!that.refundInfo.remark) {
return this.$util.Tips({ return this.$util.Tips({
@ -1256,7 +1229,6 @@
}); });
} }
); );
}, },
// 授权关闭 // 授权关闭
authColse: function(e) { authColse: function(e) {
@ -1264,10 +1236,7 @@
}, },
//路由跳转 //路由跳转
navation(item) { navation(item) {
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) {
// console.log(this.$store.state.app.userInfo.mer_info.type_code); // console.log(this.$store.state.app.userInfo.mer_info.type_code);
if (this.$store.state.app.userInfo.mer_info.type_code == "TypeSupplyChain" && this.$store.state.app if (this.$store.state.app.userInfo.mer_info.type_code == "TypeSupplyChain" && this.$store.state.app
@ -1296,7 +1265,6 @@
} }
} else { } else {
switch (item.type) { switch (item.type) {
case 1: case 1:
uni.navigateTo({ uni.navigateTo({
@ -1405,16 +1373,8 @@
url: '/pages/moreProject/moreProject' url: '/pages/moreProject/moreProject'
}) })
break; break;
} }
} }
} else { } else {
this.isAuto = true; this.isAuto = true;
this.isShowAuth = true this.isShowAuth = true
@ -1453,7 +1413,6 @@
that.loadTitle = '加载更多'; that.loadTitle = '加载更多';
}); });
}, },
} }
} }
</script> </script>