diff --git a/api/exchange.js b/api/exchange.js
index cbe4cde..f8a95d3 100644
--- a/api/exchange.js
+++ b/api/exchange.js
@@ -7,6 +7,10 @@ export function searchMer(data) {
export function onlinePayment(data) {
return request.get("onlinePayment/createOrder",data);
}
+// 提货处理 - 提货记录
+export function onlinePaymentRecord(data) {
+ return request.get("onlinePayment/record",data);
+}
// 提货处理 - 获取用户信息
export function pointUserInfo() {
return request.get("exchange/userHold");
diff --git a/config/app.js b/config/app.js
index e20f830..e76d97b 100644
--- a/config/app.js
+++ b/config/app.js
@@ -7,9 +7,13 @@ let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https
let httpApi = 'https://bt.test.cdlfjy.com/' // 开发
+// let httpApi = 'https://mp.scwmbh.cn/' // 生产
+
// 聊天接口修改此字符 小程序聊天要求wss 例如:
let wsApi = 'wss://bt.test.cdlfjy.com'
+// let wsApi = 'wss://mp.scwmbh.cn'
+
module.exports = {
// 请求域名 格式: https://您的域名
diff --git a/pages.json b/pages.json
index 4e31a82..56deca8 100644
--- a/pages.json
+++ b/pages.json
@@ -528,6 +528,12 @@
"navigationBarTitleText": "在线买单"
}
},
+ {
+ "path": "online_payment/payment/record",
+ "style": {
+ "navigationBarTitleText": "消费记录"
+ }
+ },
{
"path": "online_payment/exchange/index",
"style": {
@@ -541,8 +547,6 @@
}
}
-
-
]
},
{
diff --git a/pages/users/online_payment/exchange/index.vue b/pages/users/online_payment/exchange/index.vue
index a0ff41d..d930515 100644
--- a/pages/users/online_payment/exchange/index.vue
+++ b/pages/users/online_payment/exchange/index.vue
@@ -50,8 +50,8 @@
- 确认支付
- 确认支付
+ 确认兑换
+ 确认兑换
diff --git a/pages/users/online_payment/exchange/record.vue b/pages/users/online_payment/exchange/record.vue
index a7d1244..4998551 100644
--- a/pages/users/online_payment/exchange/record.vue
+++ b/pages/users/online_payment/exchange/record.vue
@@ -3,8 +3,19 @@
- {{ item.total_money }}
- {{ item.create_time }}
+
+
+ {{ item.point_title }}
+ {{ item.create_time }}
+
+ {{ item.total_money }}
+
+
+ 操作员:{{ item.staff_nickname || item.staff_uid }}
+ 使用积分:{{ item.use_integral }}
+ 差价:{{ item.diff_money }}
+ 差价实付金额:{{ item.diff_money_pay }}
+
@@ -37,7 +48,7 @@ export default {
this.getPointList();
},
onReachBottom: function () {
- this.exchangeRecord();
+ this.getPointList();
},
methods: {
// 提货记录
@@ -67,21 +78,57 @@ export default {
diff --git a/pages/users/online_payment/payment/index.vue b/pages/users/online_payment/payment/index.vue
index 34dd829..69554e7 100644
--- a/pages/users/online_payment/payment/index.vue
+++ b/pages/users/online_payment/payment/index.vue
@@ -9,7 +9,7 @@
{{ mer_info.mer_name || '请选择门店' }}
切换
-
+ 消费记录
@@ -459,7 +459,18 @@ export default {
title: err
});
});
- }
+ },
+ // 跳转
+ goMenuPage(url) {
+ console.log(url)
+ if (this.isLogin) {
+ uni.navigateTo({
+ url
+ })
+ } else {
+ this.openAuto()
+ }
+ },
},
// #ifdef MP
diff --git a/pages/users/online_payment/payment/record.vue b/pages/users/online_payment/payment/record.vue
new file mode 100644
index 0000000..ffc1a40
--- /dev/null
+++ b/pages/users/online_payment/payment/record.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+ {{ item.mer_name }}
+
+ {{ item.status == 3 ? '已完成' : '已失效' }}
+
+
+ {{ item.create_time }}
+
+ -{{ item.pay_price }}
+
+
+
+
+
+
+
+
+
+