diff --git a/pages/admin/business/shareholder/confirm_join.vue b/pages/admin/business/shareholder/confirm_join.vue
index 12d1f42..fa0c098 100644
--- a/pages/admin/business/shareholder/confirm_join.vue
+++ b/pages/admin/business/shareholder/confirm_join.vue
@@ -22,22 +22,22 @@
-
- 封坛酒额度
+
+ 菜卡额度
{{ level_info.vegetable_quota || 0 }}
-
- 菜卡额度
+
+ 油卡额度
{{ level_info.oil_quota || 0 }}
-
- 油卡额度
+
+ 封坛酒额度
{{ level_info.wine_quota || 0 }}
@@ -52,6 +52,13 @@
+
+
+
+ 餐费积分
+
+ {{ integralNum || '0.00' }}
+
@@ -108,7 +115,16 @@ export default {
authorize
},
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() {
return {
@@ -122,6 +138,7 @@ export default {
vegetable_quota_icon: '',
oil_quota_icon: '',
coupon_icon: '',
+ integral_icon: '',
// 邀请相关参数
level_id: '',
mer_id: '',
@@ -181,6 +198,7 @@ export default {
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.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) {
let _this = this;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index ae55baa..c72ec12 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -87,7 +87,7 @@
{{userInfo.wine_available || 0}}
- 坛封酒积分
+ 封坛酒积分
{{ integral_surplus || 0}}
diff --git a/pages/users/online_payment/payment/index.vue b/pages/users/online_payment/payment/index.vue
index 4673977..9970696 100644
--- a/pages/users/online_payment/payment/index.vue
+++ b/pages/users/online_payment/payment/index.vue
@@ -185,7 +185,7 @@ export default {
let mer_id = options.mer_id || 0;
// 二维码参数接收
if(options.scene){
- // console.log("接收参数 - 未转义",options.scene)
+ console.log("接收参数 - 未转义",options.scene)
var scene = this.$util.getUrlParams(decodeURIComponent(options.scene));
// console.log("接收参数 - 转义后",scene)
mer_id = scene.mer_id || 0;
@@ -740,11 +740,11 @@ export default {
.title{
font-size: 28rpx;
font-weight: bold;
- width: 150rpx;
+ width: 180rpx;
text-align: center;
}
.use-input{
- width: calc(100% - 40rpx - 150rpx);
+ width: calc(100% - 40rpx - 180rpx);
height: 45rpx;
line-height: 45rpx;
}