diff --git a/api/user.js b/api/user.js
index f7bd28c..30b2225 100644
--- a/api/user.js
+++ b/api/user.js
@@ -736,6 +736,10 @@ export function brokerageApplyFormalPost(data) {
export function brokerageApplyFormalGet() {
return request.get("user/brokerage_formal_info");
}
+// 分销商上级信息
+export function spreadParent() {
+ return request.get(`user/spread_parent`);
+}
// 邀请码 - 信息获取
export function inviteCodeInfo(data) {
@@ -762,6 +766,7 @@ export function withdrawalAccountEdit(data) {
export function withdrawalAccountDel(id) {
return request.post(`withdrawalAccount/del/${id}`);
}
+
// 资源股东 - 关联商户列表
export function shareholdersMerList(data) {
return request.get(`user/shareholders/mer_list`, data);
@@ -774,9 +779,19 @@ export function shareholdersStatistics() {
export function shareholdersOrderList() {
return request.get(`user/shareholders/order_list`);
}
-// 分销商上级信息
-export function spreadParent() {
- return request.get(`user/spread_parent`);
+
+
+// 共创股东 - 用户餐费积分列表
+export function merShareholdersIntegralMerList(data) {
+ return request.get(`mer/shareholder/integral_record`, data);
+}
+// 共创股东 - 用户餐费积分统计信息
+export function merShareholdersIntegralStatistics(data) {
+ return request.get(`mer/shareholder/integral_statistic`, data);
+}
+// 共创股东 - 绑定商户信息
+export function merShareholdersMerList(data) {
+ return request.get(`mer/shareholder/mer_list`, data);
}
@@ -784,4 +799,3 @@ export function spreadParent() {
-
diff --git a/pages.json b/pages.json
index a69e731..32c748c 100644
--- a/pages.json
+++ b/pages.json
@@ -628,6 +628,18 @@
"style": {
"navigationBarTitleText": "资源股东"
}
+ },
+ {
+ "path": "shareholders/mer_center",
+ "style": {
+ "navigationBarTitleText": "共创股东中心"
+ }
+ },
+ {
+ "path": "shareholders/mer_integral",
+ "style": {
+ "navigationBarTitleText": "餐费积分"
+ }
}
diff --git a/pages/users/shareholders/mer_center.vue b/pages/users/shareholders/mer_center.vue
new file mode 100644
index 0000000..3ff555f
--- /dev/null
+++ b/pages/users/shareholders/mer_center.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+ {{ statistics.sum_integral_total || '0.00' }}
+ 全部积分
+
+
+
+ {{ statistics.sum_used_surplus || '0.00' }}
+ 可用积分
+
+
+ {{ statistics.sum_integral_use || '0.00' }}
+ 已使用积分
+
+
+ {{ statistics.sum_used_overdue || '0.00' }}
+ 已过期积分
+
+
+
+
+
+
+ 商户列表
+
+
+
+
+ {{ item.merchant.mer_name || '' }}
+ 可用积分：{{ item.statistics.sum_used_surplus || '0.00' }}
+
+ 积分详情
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/users/shareholders/mer_integral.vue b/pages/users/shareholders/mer_integral.vue
new file mode 100644
index 0000000..263d606
--- /dev/null
+++ b/pages/users/shareholders/mer_integral.vue
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
+
+
+ 全部积分
+ {{ statistics.sum_integral_total || '0.00' }}
+
+
+ 去使用
+
+
+
+
+ 剩余可用积分
+ {{ statistics.sum_used_surplus || '0.00' }}
+
+
+ 已使用积分
+ {{ statistics.sum_integral_use || '0.00' }}
+
+
+ 已过期积分
+ {{ statistics.sum_used_overdue || '0.00' }}
+
+
+
+
+
+
+
+
+
+ 预计解冻时间：{{ item.expect_thaw_time }}
+ 预计过期时间：{{ item.expect_overdue_time }}
+ 过期时间：{{ item.real_overdue_time }}
+
+
+ 冻结中
+ 可使用
+ 已过期
+
+
+
+
+ 总积分
+ {{ Number(item.integral_total).toFixed(2) || '0.00' }}
+
+
+ 已使用积分
+ {{ Number(item.integral_use).toFixed(2) || '0.00' }}
+
+
+ 可用积分
+ {{ item.status == 1 ? (Number(item.integral_total - item.integral_use).toFixed(2)) : '0.00' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+