From d08c3c375fe1d6836e41cd684ddb400f8cad3431 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 10 Nov 2023 16:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=A7=AF=E5=88=86?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=20-=20=E5=86=BB=E7=BB=93?=
=?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B9=B3=E5=8F=B0?=
=?UTF-8?q?=E7=A7=AF=E5=88=86=E3=80=82=E7=A7=AF=E5=88=86=E8=8E=B7=E5=BE=97?=
=?UTF-8?q?=E6=A0=8F=E7=9B=AE=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=95=86=E6=88=B7?=
=?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/user.js | 12 +-
pages/users/user_integral/index.vue | 1071 +++++++++++++++++----------
2 files changed, 702 insertions(+), 381 deletions(-)
diff --git a/api/user.js b/api/user.js
index 1fb1b88..f8f41a8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -168,7 +168,6 @@ export function extractLst(data) {
export function getIntegralList(data) {
return request.get("user/integral/lst", data);
}
-
/**
* 获取分销海报图片
*
@@ -696,9 +695,14 @@ export function getCustomList(merId, data) {
export function customIntegralChange(merId, data) {
return request.post("custom/integral_change/"+merId, data);
}
-
-
-
+// 积分中心 - 获取商户积分记录
+export function getMerchantIntegral(data) {
+ return request.post("user/integral/mer_list", data);
+}
+// 积分中心 - 转换积分
+export function convertMerchantIntegral(merId,data) {
+ return request.post("user/integral/integral_convert/"+merId, data);
+}
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index 2ab2be7..086b184 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -15,21 +15,22 @@
累计消费
- {{userInfo.lockIntegral || 0}}
- 冻结积分
+ {{userInfo.platform_integral || 0}}
+ 平台积分
- {{item.name}}
+
+ {{item.name}}
+
-
+
{{item.mark}}
@@ -46,7 +47,8 @@
-
+
+
+ <!–#ifndef APP-PLUS–>
@@ -69,8 +71,34 @@
邀请好友可获得积分奖励
赚积分
-
-
+ <!–#endif–>
+ -->
+
+
+
+
+
+
+
+
+
+ {{ item.mer_name }}
+ {{ item.mer_id}}
+
+ 积分：{{ item.number }}
+
+
+ 转换积分
+ 转换积分
+
+
+
+
+
+
+
+
+
@@ -83,394 +111,683 @@
+
+
+
+
+ 转换积分
+
+
+ 商户名称：
+ {{ current_mer_info.mer_name }}
+
+
+ 当前持有该积分：
+ {{ current_mer_info.number }}
+
+
+ 转换比例：
+ 1 : {{ current_mer_info.mer_integral_platform_rate }}
+
+
+ 转换数量：
+
+
+
+
+
+ 预计获得：
+ {{ expected_acquisition }} 平台积分
+
+
+
+ 提交
+
+
+
+
+
+