From 6c2ff634055374e9ccae9e7f2a064427f1bbb197 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 24 Jun 2024 10:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=85=B1=E5=88=9B?=
=?UTF-8?q?=E8=82=A1=E4=B8=9C=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=20-=20?=
=?UTF-8?q?=E8=B5=A0=E9=80=81=E9=A2=9D=E5=BA=A6=E5=86=85=E5=AE=B9=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B5=A0?=
=?UTF-8?q?=E9=80=81=E9=A4=90=E8=B4=B9=E7=A7=AF=E5=88=86=E6=80=BB=E9=A2=9D?=
=?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=E5=B0=81=E5=9D=9B=E9=85=92=E9=A2=9D=E5=BA=A6=E6=96=87?=
=?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=20=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=EF=BC=9A=E5=9C=A8=E7=BA=BF=E4=B9=B0=E5=8D=95=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=20-=20=E4=BD=BF=E7=94=A8=E9=A4=90=E8=B4=B9=E7=A7=AF?=
=?UTF-8?q?=E5=88=86=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../business/shareholder/confirm_join.vue | 32 +++++++++++++++----
pages/user/index.vue | 2 +-
pages/users/online_payment/payment/index.vue | 6 ++--
3 files changed, 29 insertions(+), 11 deletions(-)
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;
}