1、修改密码手机号未拿到处理

2、首页/商品列表增加了广告弹窗
3、会员充值新增赠送菜品,
4、会员菜品增加最大添加数量限制
5、首页/我的/会员卡/菜品页面的图片设置
6、小程序余额支付,会员卡充值成功后增加 会员余额变动订阅(后端还未做处理,目前可以订阅不会推送)
7、多规格商品部分规格售罄/下架增加角标提示
This commit is contained in:
GaoHao
2024-08-27 14:43:15 +08:00
parent d75da8ac9f
commit 22b9726de6
19 changed files with 933 additions and 252 deletions

View File

@@ -3,28 +3,29 @@
<view class="content">
<!-- <card :userInfo="userInfo"></card> -->
<view class="card_info">
<image class="card_info_bg" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/member_bg.png" mode="aspectFill"></image>
<image class="card_info_bg" :src="shopExtend?shopExtend.value:'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/member_bg.png'" mode="aspectFill"></image>
<view class="card_info_bg_box"></view>
<view class="card_content">
<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">{{userInfo.shopName}}会员卡</text>
<view class="card_head_left_icon_box" v-if="userInfo.isVip != 0">
<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>
</view>
</view>
<view class="card_head_right" @click="clickEvent" v-if="userInfo.isVip != 0">
<view class="card_head_right" @click="clickEvent" v-if="shopUserInfo.isVip != 0">
<image class="card_head_left_qrCode" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/member_qrCode.png" mode="aspectFill"></image>
</view>
</view>
<view class="card_cen">
<view class="card_cen_left">{{ userInfo.isVip == 0 ? '尚未开通会员暂无法享受会员权益' : '欢迎加入本店会员~'}}</view>
<view class="card_cen_right" v-if="userInfo.isVip != 0">查看特权</view>
<view class="card_cen_left">{{ shopUserInfo.isVip == 0 ? '尚未开通会员暂无法享受会员权益' : '欢迎加入本店会员~'}}</view>
<view class="card_cen_right" v-if="shopUserInfo.isVip != 0">查看特权</view>
</view>
<view class="card_bom" v-if="userInfo.isVip != 0">
<view class="card_bom" v-if="shopUserInfo.isVip != 0">
<view class="card_bom_item" @click="itemClick(1)">
<text>{{userInfo.amount || '0.00'}}</text><text>储值</text>
<text>{{shopUserInfo.amount || '0.00'}}</text><text>储值</text>
</view>
<view class="card_bom_item">
<text>0</text><text>积分</text>
@@ -40,8 +41,8 @@
</view>
<view class="card_bottom" :class="userInfo.isVip == 0 ? 'n' : ''">
<view class="card_bottom_Box" v-if="userInfo.isVip != 0">
<view class="card_bottom" :class="shopUserInfo.isVip == 0 ? 'n' : ''">
<view class="card_bottom_Box" v-if="shopUserInfo.isVip != 0">
<view class="card_bottom_left flex-start">
<image class="card_bottom_head" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/member_head2.png" mode="aspectFill"></image>
<view class="">
@@ -72,7 +73,7 @@
</view>
</view>
<registermember :show="memberOpen" :shopId="shopId_id" :userInfo="userInfo" @getRegisterMember="getRegisterMember"></registermember>
<registermember :show="memberOpen" :shopUserInfo="shopUserInfo" :shopId="shopId_id" @getRegisterMember="getRegisterMember"></registermember>
</view>
</template>
@@ -88,13 +89,13 @@
shopId_id: null,
memberOpen: false,
amount: '',
userInfo: {},
shopUserInfo: null,
lucky: {
list: ['鸿运当头',"财运亨通","时来运转","否极泰来","花逢时发"],
index: 0,
text: ""
},
usershopUserinfo:{},
shopExtend: null,
}
},
onLoad(e) {
@@ -102,30 +103,42 @@
},
onShow() {
this.init();
this.getShopExtend();
},
methods: {
/**
* 获取店铺信息
*/
async init() {
let res = await this.api.shopUserInfo({
"shopId": this.shopId_id,
"userId": uni.cache.get('userInfo').id,
})
if (res.code == 0) {
this.userInfo = res.data
this.shopUserInfo = res.data
uni.cache.set('shopUserInfo',res.data)
}
if ( this.userInfo.isVip == 0 ) {
if ( this.shopUserInfo.isVip == 0 ) {
this.memberOpen = true;
return;
}
},
/**
* 获取背景图
*/
async getShopExtend () {
let res = await this.api.getShopExtend({
shopId: this.shopId_id,
autokey: "member_bg" //index_bg my_bg member_bg shopInfo_bg
})
if ( res.code == 0) {
this.shopExtend = res.data;
}
},
itemClick ( type ) {
if ( type == 1) {
uni.pro.navigateTo('member/index', {
shopId: this.userInfo.shopId,
shopId: this.shopUserInfo.shopId,
type: 'index',
})
} else if ( type == 3 ) {
@@ -144,7 +157,7 @@
clickEvent() {
uni.navigateTo({
url: '/pages/pay_code/pay_code?shopInfo=' + JSON.stringify(this.userInfo)
url: '/pages/pay_code/pay_code?shopInfo=' + JSON.stringify(this.shopUserInfo)
})
},
}
@@ -166,12 +179,21 @@
margin: auto;
position: relative;
z-index: 2;
padding-top: 20rpx;
.card_info_bg{
width: 630rpx;
height: 304rpx;
position: absolute;
z-index: 1;
}
.card_info_bg_box{
width: 630rpx;
height: 304rpx;
position: absolute;
z-index: 1;
border-radius: 24rpx;
background-color: rgba(51,51,51,0.5);
}
.card_content{
position: relative;
left: 0;