mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

Browse Source
This commit is contained in:
weipengfei 2024-03-15 14:45:48 +08:00
commit d2ea472ef3
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,7 +684,7 @@
this.city_id = resData.city_id; this.city_id = resData.city_id;
this.area_id = resData.area_id this.area_id = resData.area_id
this.street_id = resData.street_id this.street_id = resData.street_id
this.mer_storeType = resData.mer_storeType // this.mer_storeType = resData.mer_storeType
this.village_id = resData.village_id; this.village_id = resData.village_id;
const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : ''; const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
@ -785,12 +785,12 @@
// 获取店铺类型 // 获取店铺类型
getStoreType: function() { getStoreType: function() {
getStoreTypeApi() getStoreTypeApi().then(res => {
.then(res => {
this.storeTypeArr = res.data this.storeTypeArr = res.data
}) // 初始化默认
.catch(res => { this.merchantData.mer_type = this.storeTypeArr[0].mer_type_id;
this.mer_storeType = this.storeTypeArr[0].type_name;
}).catch(res => {
this.$util.Tips({ this.$util.Tips({
title: res title: res
}); });

10
pages/users/invite_code/index.vue
View File

@ -99,7 +99,17 @@
// 获取二维码 // 获取二维码
getQrcode() { getQrcode() {
qrcode().then(res => { qrcode().then(res => {
if (res.status == 200) {
this.qrcodeUrl = res.data.url; this.qrcodeUrl = res.data.url;
} else {
uni.showModal({
content: '暂未开通邀请码，需开通邀请码请联系管理员',
showCancel: false,
success: (res) => {
uni.navigateBack();
}
})
}
}).catch(err => { }).catch(err => {
uni.showModal({ uni.showModal({
content: '暂未开通邀请码，需开通邀请码请联系管理员', content: '暂未开通邀请码，需开通邀请码请联系管理员',