支付宝兼容,排队预约修改,订单逻辑修改

This commit is contained in:
GaoHao
2024-09-24 15:22:34 +08:00
parent 861e97b775
commit 5f03e44701
31 changed files with 823 additions and 737 deletions

View File

@@ -236,7 +236,7 @@
</view>
<indexs v-if="showindex == 'shopIndex'" :shopExtend="shopExtend" :usershopUserinfo='usershopUserinfo' :userInfo='userInfo'></indexs>
<indexs v-if="showindex == 'shopIndex'" :shopExtend="shopExtend" :shopUserInfo='shopUserInfo' ></indexs>
<popupad id="popupad" :forceUpdate='forceUpdate' :showPosition="'home'"></popupad>
</view>
</view>
@@ -265,7 +265,6 @@
data() {
return {
showindex: "",
userInfo: {},//个人信息
NAME: uni.cache.get('NAME'),
timersetInterval: '0', //定时器
isFixedTop: false, //吸顶是否显示
@@ -305,7 +304,7 @@
categoryList: [],
subCategoryList: [], //二级菜单数据
// 登录后店铺信息
usershopUserinfo:{},
shopUserInfo:{},
popupadList: [], //广告数据
forceUpdate: false,
shopExtend: null,
@@ -368,10 +367,9 @@
"userId": uni.cache.get('userInfo').id,
})
if (res.code == 0) {
this.usershopUserinfo = res.data
uni.cache.set('shopUserInfo',this.usershopUserinfo)
this.shopUserInfo = res.data
uni.cache.set('shopUserInfo',this.shopUserInfo)
}
this.loginwxuserInfo() //个人信息接口
if ( uni.cache.get('forceUpdate') == 1) {
this.forceUpdate = !this.forceUpdate;
}
@@ -442,17 +440,7 @@
this.shopExtend = res.data;
}
},
// 个人信息
async loginwxuserInfo() {
let res = await this.api.loginwxuserInfo({
userId: uni.cache.get('userInfo').id
})
if (res.code == 0) {
uni.cache.set('userInfo', res.data);
this.userInfo = uni.cache.get('userInfo')
}
},
closeproductlist() {
this.showproductlist = false
// console.log('close');