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

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

@@ -9,7 +9,7 @@
<view class="card_head">
<view class="card_head_left">
<image class="card_head_left_head" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/member_head.png" mode="aspectFill"></image>
<text class="card_head_left_name">{{shopUserInfo.shopName}}会员卡</text>
<text class="card_head_left_name">{{shopUserInfo.shopName||''}}会员卡</text>
<view class="card_head_left_icon_box" v-if="shopUserInfo.isVip != 0">
<image class="card_head_left_icon1" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/member_icon1.png" mode="aspectFill"></image>
<text class="card_head_left_iconText">VL1</text>
@@ -73,7 +73,7 @@
</view>
</view>
<registermember :show="memberOpen" :shopUserInfo="shopUserInfo" :shopId="shopId_id" @getRegisterMember="getRegisterMember"></registermember>
<registermember :show="memberOpen" :shopId="shopId" @getRegisterMember="getRegisterMember"></registermember>
</view>
</template>
@@ -86,7 +86,7 @@
},
data() {
return {
shopId_id: null,
shopId: null,
memberOpen: false,
amount: '',
shopUserInfo: null,
@@ -99,11 +99,12 @@
}
},
onLoad(e) {
this.shopId_id = e.shopId_id;
this.shopId = e.shopId;
this.shopUserInfo = uni.cache.get('shopUserInfo')
uni.cache.set('forceUpdate',1)
this.init();
},
onShow() {
this.init();
this.getShopExtend();
},
methods: {
@@ -111,16 +112,7 @@
* 获取店铺信息
*/
async init() {
let res = await this.api.shopUserInfo({
"shopId": this.shopId_id,
"userId": uni.cache.get('userInfo').id,
})
if (res.code == 0) {
this.shopUserInfo = res.data
uni.cache.set('shopUserInfo',res.data)
}
if ( this.shopUserInfo.isVip == 0 ) {
if ( this.shopUserInfo.isVip == 0) {
this.memberOpen = true;
}
},
@@ -129,7 +121,7 @@
*/
async getShopExtend () {
let res = await this.api.getShopExtend({
shopId: this.shopId_id,
shopId: this.shopId,
autokey: "member_bg" //index_bg my_bg member_bg shopInfo_bg
})
if ( res.code == 0) {
@@ -139,7 +131,7 @@
itemClick ( type ) {
if ( type == 1) {
uni.pro.navigateTo('member/index', {
shopId: this.shopUserInfo.shopId,
shopId: this.shopUserInfo.id,
type: 'index',
})
} else if ( type == 3 ) {