diff --git a/apis/interfaces/empower.js b/apis/interfaces/empower.js
index 15b2ce4..927c2e5 100644
--- a/apis/interfaces/empower.js
+++ b/apis/interfaces/empower.js
@@ -61,6 +61,25 @@ const orderCancel = order => {
})
}
+// 核验列表
+const codes = code => {
+ return request({
+ url : "empower/code",
+ data : { code },
+ method : "POST",
+ })
+}
+
+// 确认核验
+const sign = item_id => {
+ return request({
+ url : "empower/code/sign",
+ data : { item_id },
+ method : "POST",
+ })
+}
+
+
export {
lists,
info,
@@ -68,6 +87,8 @@ export {
buy,
orderInit,
orderList,
- orderCancel
+ orderCancel,
+ codes,
+ sign
}
diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js
index 9fa8edf..9cc2a9e 100644
--- a/apis/interfaces/pay.js
+++ b/apis/interfaces/pay.js
@@ -154,6 +154,28 @@ const synDiffDg = (diff_price_id, data) =>{
})
}
+// 公共收银台支付
+const payWechat = data => {
+ return request({
+ url: "pay/cashier_desk/wechat",
+ method: 'POST',
+ data
+ })
+}
+const payUms = data => {
+ return request({
+ url: "pay/cashier_desk/ums",
+ method: 'POST',
+ data
+ })
+}
+const payDg = data => {
+ return request({
+ url: "pay/cashier_desk/dg",
+ method: 'POST',
+ data
+ })
+}
export {
ums,
@@ -176,6 +198,11 @@ export {
entrustDg,
synDiffPay,
synDiffUms,
- synDiffDg
+ synDiffDg,
+
+ // 综合收银台
+ payWechat,
+ payUms,
+ payDg
}
diff --git a/pages.json b/pages.json
index c798295..f56d27a 100644
--- a/pages.json
+++ b/pages.json
@@ -642,7 +642,7 @@
"style" :{
"navigationBarTitleText": "赋能订单",
"enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#FFF"
+ "navigationBarBackgroundColor": "#FFFFFF"
}
}
],
diff --git a/pages/empower/order.vue b/pages/empower/order.vue
index 9be301a..2d35f94 100644
--- a/pages/empower/order.vue
+++ b/pages/empower/order.vue
@@ -53,20 +53,20 @@
￥{{item.price}}
-
-
-
- {{item.created_at}}
-
-
-
- {{item.paid_at}}
+
+
+
+ {{item.created_at}}
+
+
+
+ {{item.paid_at}}
取消
- 支付
+ 支付
报名信息
@@ -228,6 +228,22 @@
if(ListIndex >= 0){
this.orders.splice(ListIndex, 1)
}
+ },
+ // 订单支付
+ onPay(obj){
+ let { order_id, order_type, price } = obj
+
+ console.log(obj)
+
+ this.$Router.replace({
+ name: 'FeePay',
+ params: {
+ orderId : order_id,
+ orderType : order_type,
+ price : price,
+ payForm : 'entrust',
+ }
+ })
}
},
onReachBottom() {
diff --git a/pages/empower/verification.vue b/pages/empower/verification.vue
index 70e67c2..b5844a0 100644
--- a/pages/empower/verification.vue
+++ b/pages/empower/verification.vue
@@ -88,6 +88,9 @@
};
},
onShow(){
+
+ console.log(codes)
+
codes(this.$Route.query.code).then(res => {
this.vouchers = res;
})
diff --git a/pages/synthesis/feePay.vue b/pages/synthesis/feePay.vue
index 1fe516f..37c55b1 100644
--- a/pages/synthesis/feePay.vue
+++ b/pages/synthesis/feePay.vue
@@ -1,551 +1,548 @@
-
-
-
-
- 需支付金额（元）
-
-
- ￥{{payPrice}}
-
-
- 与人方便,与己方便,珍惜时间,请先付款
-
-
-
-
-
- 微信支付
-
-
-
-
-
-
-
-
- 支付宝（银联商务）
-
-
-
-
-
-
-
- 微信（银联商务）
-
-
-
-
-
-
-
-
- 支付宝（汇付）
-
-
-
-
-
-
-
- 微信（汇付）
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 支付成功
-
-
- ￥{{payPrice}}
-
-
- 微信支付
-
-
- 完成
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 支付成功
+
+
+ ￥{{payPrice}}
+
+
+ 微信支付
+
+
+ 完成
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 08b4380..81d05ca 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -218,7 +218,10 @@
// 综法订单数据数量
synthesisInfo() {
- synthesisCount({channel: 'self'}).then(res => {
+ synthesisCount({channel: 'self'}).then(res => {
+
+ console.log(res)
+
this.synthesisAll = res
}).catch(err => {
uni.showToast({
diff --git a/router/index.js b/router/index.js
index a7986b2..714ff38 100644
--- a/router/index.js
+++ b/router/index.js
@@ -43,7 +43,7 @@ router.beforeEach((to, from, next) => {
})
})
return
- }
+ }
// 检查是否需要登录
if(to.auth && token === ''){