Przeglądaj źródła

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei 4 lat temu
rodzic
commit
e3e190cbeb
2 zmienionych plików z 6 dodań i 5 usunięć
  1. 4 3
      pages/order/order.vue
  2. 2 2
      pages/order/orderDetail.vue

+ 4 - 3
pages/order/order.vue

@@ -111,7 +111,7 @@
 		listLookUp
 	} from '@/api/data'
 	import {
-		getOrderList, signPay
+		getOrderList, signPay, existPayPwd
 	} from '@/api/order.js'
 	export default {
 		components: {},
@@ -278,11 +278,11 @@
 			},
 			// 支付剩余时间
 			filterTime (time) {
-				// console.log(time,'tttttt')
+				console.log(time,'tttttt')
 				let nowT = new Date().valueOf() // 现在时间戳
 				let orderT = new Date(time).valueOf() // 下单时间戳
 				let tt = (1800 * 1000) - (nowT - orderT)   // 距离30分钟支付 相差时间戳  
-				// console.log(tt,'tttttt')
+				console.log(tt,'tttttt')
 				return  tt
 			},
 			
@@ -339,6 +339,7 @@
 				signPay(params).then(res=>{
 					this.btnLoading = false
 					if(res.status == 200) {
+						this.showLeavePsw = false
 						// 跳转到支付完成界面
 						uni.navigateTo({
 							url:"/pages/toOrder/payFinish?id=" + this.orderId

+ 2 - 2
pages/order/orderDetail.vue

@@ -5,7 +5,7 @@
 			<view class="order-status">
 				<view class="status-title">{{orderInfo.orderState}}</view>
 				<view v-if="orderInfo.orderState=='WAIT_PAY'" class="status-care">
-					请在 <text>2020-10-30</text>前付款,过期系统将自动取消订单
+					请在 <text>29</text>分钟内付款,过期系统将自动取消订单
 				</view>
 				<view v-if="orderInfo.orderState=='CANCEL'" class="status-care">
 					超时未支付,系统已自动取消订单
@@ -107,7 +107,7 @@
 <script>
 	import {
 		orderDetail,
-		cancleOrder,
+		signPay,
 		existPayPwd
 	} from '@/api/order.js'
 	import {