wanma-benteng
/
new-mshop-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：共创股东支付页面 - 赠送额度内容显示错误，增加赠送餐费积分总额 

修复：个人中心封坛酒额度文字显示错误
修复：在线买单页面 - 使用餐费积分样式错误
This commit is contained in:
wuhui_zzw 2024-06-24 10:25:14 +08:00
parent 3f1976ac62
commit 6c2ff63405
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pages/admin/business/shareholder/confirm_join.vue
View File

@ -22,22 +22,22 @@
</view> </view>
<view class="give-item" v-if="level_info.vegetable_quota > 0"> <view class="give-item" v-if="level_info.vegetable_quota > 0">
<view class="left"> <view class="left">
<image class="give-icon" :src="wine_quota_icon" /> <image class="give-icon" :src="vegetable_quota_icon" />
<view class="give-title">封坛酒额度</view> <view class="give-title">菜卡额度</view>
</view> </view>
<view class="give-num">{{ level_info.vegetable_quota || 0 }}</view> <view class="give-num">{{ level_info.vegetable_quota || 0 }}</view>
</view> </view>
<view class="give-item" v-if="level_info.oil_quota > 0"> <view class="give-item" v-if="level_info.oil_quota > 0">
<view class="left"> <view class="left">
<image class="give-icon" :src="vegetable_quota_icon" /> <image class="give-icon" :src="oil_quota_icon" />
<view class="give-title">菜卡额度</view> <view class="give-title">油卡额度</view>
</view> </view>
<view class="give-num">{{ level_info.oil_quota || 0 }}</view> <view class="give-num">{{ level_info.oil_quota || 0 }}</view>
</view> </view>
<view class="give-item" v-if="level_info.wine_quota > 0"> <view class="give-item" v-if="level_info.wine_quota > 0">
<view class="left"> <view class="left">
<image class="give-icon" :src="oil_quota_icon" /> <image class="give-icon" :src="wine_quota_icon" />
<view class="give-title">油卡额度</view> <view class="give-title">封坛酒额度</view>
</view> </view>
<view class="give-num">{{ level_info.wine_quota || 0 }}</view> <view class="give-num">{{ level_info.wine_quota || 0 }}</view>
</view> </view>
@ -52,6 +52,13 @@
</view> </view>
</view> </view>
</view> </view>
<view class="give-item" v-if="Number(level_info.integral_switch) == 1">
<view class="left">
<image class="give-icon" :src="integral_icon" />
<view class="give-title">餐费积分</view>
</view>
<view class="give-num">{{ integralNum || '0.00' }}</view>
</view>
</view> </view>
<!--选择支付方式--> <!--选择支付方式-->
<view class="pay-type" v-if="Number(level_info.price) > 0"> <view class="pay-type" v-if="Number(level_info.price) > 0">
@ -108,7 +115,16 @@ export default {
authorize authorize
}, },
computed: { computed: {
...mapGetters(['isLogin', 'uid', 'userInfo', 'viewColor']) ...mapGetters(['isLogin', 'uid', 'userInfo', 'viewColor']),
// 餐费积分数量
integralNum(){
let info = Object.assign({}, this.level_info);
let type = Number(info.integral_give_type) || 0;
let num = Number(info.integral_give_num) || 0;
if(type === 1) num = Number(info.integral_give_num) * Number(info.integral_cycle_num)
return Number(num).toFixed(2);
},
}, },
data() { data() {
return { return {
@ -122,6 +138,7 @@ export default {
vegetable_quota_icon: '', vegetable_quota_icon: '',
oil_quota_icon: '', oil_quota_icon: '',
coupon_icon: '', coupon_icon: '',
integral_icon: '',
// 邀请相关参数 // 邀请相关参数
level_id: '', level_id: '',
mer_id: '', mer_id: '',
@ -181,6 +198,7 @@ export default {
this.vegetable_quota_icon = `${HTTP_REQUEST_URL}/static/images/mer/shareholder/4.png`; this.vegetable_quota_icon = `${HTTP_REQUEST_URL}/static/images/mer/shareholder/4.png`;
this.oil_quota_icon = `${HTTP_REQUEST_URL}/static/images/mer/shareholder/5.png`; this.oil_quota_icon = `${HTTP_REQUEST_URL}/static/images/mer/shareholder/5.png`;
this.coupon_icon = `${HTTP_REQUEST_URL}/static/images/mer/shareholder/6.png`; this.coupon_icon = `${HTTP_REQUEST_URL}/static/images/mer/shareholder/6.png`;
this.integral_icon = `${HTTP_REQUEST_URL}/static/images/mer/shareholder/7.png`;
}, },
onLoad(options) { onLoad(options) {
let _this = this; let _this = this;

2
pages/user/index.vue
View File

@ -87,7 +87,7 @@
</view> </view>
<view class="num-item" @click="goMenuPage('/pages/users/online_payment/record/quota?quota_type=3')"> <view class="num-item" @click="goMenuPage('/pages/users/online_payment/record/quota?quota_type=3')">
<text class="num">{{userInfo.wine_available || 0}}</text> <text class="num">{{userInfo.wine_available || 0}}</text>
<view class="txt">坛封酒积分</view> <view class="txt">封坛酒积分</view>
</view> </view>
<view class="num-item" @click="goMenuPage('/pages/users/shareholders/mer_center')"> <view class="num-item" @click="goMenuPage('/pages/users/shareholders/mer_center')">
<text class="num">{{ integral_surplus || 0}}</text> <text class="num">{{ integral_surplus || 0}}</text>

6
pages/users/online_payment/payment/index.vue
View File

@ -185,7 +185,7 @@ export default {
let mer_id = options.mer_id || 0; let mer_id = options.mer_id || 0;
// 二维码参数接收 // 二维码参数接收
if(options.scene){ if(options.scene){
// console.log("接收参数 - 未转义",options.scene) console.log("接收参数 - 未转义",options.scene)
var scene = this.$util.getUrlParams(decodeURIComponent(options.scene)); var scene = this.$util.getUrlParams(decodeURIComponent(options.scene));
// console.log("接收参数 - 转义后",scene) // console.log("接收参数 - 转义后",scene)
mer_id = scene.mer_id || 0; mer_id = scene.mer_id || 0;
@ -740,11 +740,11 @@ export default {
.title{ .title{
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
width: 150rpx; width: 180rpx;
text-align: center; text-align: center;
} }
.use-input{ .use-input{
width: calc(100% - 40rpx - 150rpx); width: calc(100% - 40rpx - 180rpx);
height: 45rpx; height: 45rpx;
line-height: 45rpx; line-height: 45rpx;
} }