From bd1805d853f11a399aace3c851335a9b4d2fe623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 11 Jul 2023 13:20:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 7 ++++---
pages/empower/order.vue | 34 ++++++++++++++++++++++++++++++++-
pages/synthesize/enableWork.vue | 6 +++---
3 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/manifest.json b/manifest.json
index 0648c26..a2d3dc0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "抖火法律",
"appid" : "__UNI__C305C03",
"description" : "纵有疾风起，人生不言弃",
- "versionName" : "1.4.9",
- "versionCode" : 104,
+ "versionName" : "1.5.0",
+ "versionCode" : 105,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -133,5 +133,6 @@
"uniStatistics" : {
"enable" : false
},
- "vueVersion" : "2"
+ "vueVersion" : "2",
+ "fallbackLocale" : "zh-Hans"
}
diff --git a/pages/empower/order.vue b/pages/empower/order.vue
index 084e94c..df8f50a 100644
--- a/pages/empower/order.vue
+++ b/pages/empower/order.vue
@@ -56,13 +56,17 @@
+ {{item.created_at}}
+
+
+
{{item.paid_at}}
取消
- 支付
+ 支付
报名信息
@@ -136,6 +140,17 @@
})
})
},
+ onShow(){
+ // 是否处理当前列表状态
+ let isOrderId = this.$store.getters.getOrderId
+ if(isOrderId != null){
+ if(this.getSignState){
+ this.onGetSign(isOrderId)
+ return
+ }
+ this.getList()
+ }
+ },
methods: {
// 报名信息
onShowUsers(obj){
@@ -158,6 +173,10 @@
title: '加载中...',
mask : true
})
+ if(this.$store.getters.getOrderId != null){
+ this.page = { current: 1, has_more: false }
+ this.$store.commit('setOrderId', null)
+ }
orderList({
status : this.statusArr[this.statusIndex].id,
empower : this.empowerArr[this.empowerIndex].id,
@@ -225,6 +244,19 @@
if(ListIndex >= 0){
this.orders.splice(ListIndex, 1)
}
+ },
+ // 订单支付
+ onPay(obj){
+ let { order_id, order_type } = obj
+ this.$store.commit('setOrderId', order_id)
+ this.$Router.push({
+ name : 'Pay',
+ params : {
+ paytype : 'synthesize',
+ orderId : order_id,
+ orderType : order_type.replace(/\\/g, '-')
+ },
+ })
}
},
onReachBottom() {
diff --git a/pages/synthesize/enableWork.vue b/pages/synthesize/enableWork.vue
index 82ab06c..74eaa77 100644
--- a/pages/synthesize/enableWork.vue
+++ b/pages/synthesize/enableWork.vue
@@ -3,17 +3,17 @@
统计数据
-
+
待支付
{{orderAll.init}}单
-
+
已支付
{{orderAll.paid}}单
-
+
已完成
{{orderAll.over}}单