调整订单字段

manifest.json

@@ -2,8 +2,8 @@
     "name" : "抖火法律",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.4.9",
+    "versionName" : "1.5.0",
-    "versionCode" : 104,
+    "versionCode" : 105,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -133,5 +133,6 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "fallbackLocale" : "zh-Hans"
 }

pages/empower/order.vue

@@ -56,13 +56,17 @@
 					</view>
 					<view class="orders-content-item">
 						<label>下单时间</label>
+						<view class="nowrap">{{item.created_at}}</view>
+					</view>
+					<view class="orders-content-item" v-if="item.paid_at != ''">
+						<label>支付时间</label>
 						<view class="nowrap">{{item.paid_at}}</view>
 					</view>
 				</view>
 				<view class="orders-flex">
 					<view class="btns">
 						<view class="btns-item btns-border" v-if="item.status == 0" @click="onCancel(item.order_id)">取消</view>
-						<view class="btns-item btns-border" v-if="item.status == 0">支付</view>
+						<view class="btns-item btns-border" v-if="item.status == 0" @click="onPay(item)">支付</view>
 						<view class="btns-item" @click="onShowUsers(item.items)">报名信息</view>
 					</view>
 				</view>
@@ -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() {

pages/synthesize/enableWork.vue

@@ -3,17 +3,17 @@
 		<view class="block">
 			<view class="block-title">统计数据</view>
 			<view class="total-flex">
-				<view class="total-item">
+				<view class="total-item" @click="onNav('EmpowerOrder', { status: 0 })">
 					<image class="icon" src="@/static/icons/work_icon_00.png"></image>
 					<view class="title">待支付</view>
 					<view class="number">{{orderAll.init}}<text>单</text></view>
 				</view>
-				<view class="total-item">
+				<view class="total-item" @click="onNav('EmpowerOrder', { status: 1 })">
 					<image class="icon" src="@/static/icons/work_icon_01.png"></image>
 					<view class="title">已支付</view>
 					<view class="number">{{orderAll.paid}}<text>单</text></view>
 				</view>
-				<view class="total-item">
+				<view class="total-item"@click="onNav('EmpowerOrder', { status: 2 })">
 					<image class="icon" src="@/static/icons/work_icon_02.png"></image>
 					<view class="title">已完成</view>
 					<view class="number">{{orderAll.over}}<text>单</text></view>