lilei 7 months ago
parent
commit
81491d89cc
2 changed files with 24 additions and 10 deletions
  1. 6 5
      pagesB/procureOrder/orderDetail.vue
  2. 18 5
      pagesB/procureOrder/orderList.vue

+ 6 - 5
pagesB/procureOrder/orderDetail.vue

@@ -238,6 +238,11 @@
 	   },
 	   },
 	   methods: {
 	   methods: {
 		 pageInit(data){
 		 pageInit(data){
+			 // 计算待付款剩余倒计时
+			 if(data.billStatus== 'WAIT_PAY'){
+			 	data.timestamp = (new Date(data.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000
+			 }
+			 data.payOk = data.payOnlineFlag==1&&data.payInfo&&data.payInfo.payState=='FINISH'
 			 this.info = data
 			 this.info = data
 			 if(this.info.payInfo){
 			 if(this.info.payInfo){
 				this.info.payInfo.payDate = moment(this.info.payInfo.payDate).format('YYYY-MM-DD hh:mm:ss')
 				this.info.payInfo.payDate = moment(this.info.payInfo.payDate).format('YYYY-MM-DD hh:mm:ss')
@@ -262,10 +267,6 @@
 				const data = res.data ? res.data.list[0] : null
 				const data = res.data ? res.data.list[0] : null
 				if(data){
 				if(data){
 					data.billStatus = data.billStatus == 'WAIT_AUDIT'&&data.payOnlineFlag==1&&data.payInfo&&data.payInfo.payState=='WAIT'?'WAIT_PAY':data.billStatus
 					data.billStatus = data.billStatus == 'WAIT_AUDIT'&&data.payOnlineFlag==1&&data.payInfo&&data.payInfo.payState=='WAIT'?'WAIT_PAY':data.billStatus
-					// 计算待付款剩余倒计时
-					if(data.billStatus== 'WAIT_PAY'){
-						data.timestamp = (new Date(data.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000
-					}
 					this.pageInit(data)
 					this.pageInit(data)
 				}
 				}
 			}) 
 			}) 
@@ -313,7 +314,7 @@
 		 	let _this = this
 		 	let _this = this
 		 	uni.showModal({
 		 	uni.showModal({
 		 		title: '提示',
 		 		title: '提示',
-		 		content: '确定取消订单吗?',
+		 		content: !item.payOk ? '确定取消订单吗?':'取消后订单金额将于1-3个工作日到账(原路返回)?',
 		 		success: function (res) {
 		 		success: function (res) {
 		 			if (res.confirm) {
 		 			if (res.confirm) {
 		 				purchaseCancel({purchaseSn:_this.purchaseSn}).then(res => {
 		 				purchaseCancel({purchaseSn:_this.purchaseSn}).then(res => {

+ 18 - 5
pagesB/procureOrder/orderList.vue

@@ -261,6 +261,7 @@
 			},
 			},
 			// 立即支付
 			// 立即支付
 			payOrder(item){
 			payOrder(item){
+				const _this = this
 				this.$store.state.vuex_tempOrderData = item
 				this.$store.state.vuex_tempOrderData = item
 				uni.showLoading({
 				uni.showLoading({
 					title: '加载中...'
 					title: '加载中...'
@@ -271,9 +272,24 @@
 					bizType:'PURCHASE',
 					bizType:'PURCHASE',
 					payUserOpenId: this.$store.state.vuex_openid || uni.getStorageSync('openid')
 					payUserOpenId: this.$store.state.vuex_openid || uni.getStorageSync('openid')
 				}).then(res=>{
 				}).then(res=>{
-					this.showPopu = true
-					this.payData = res.data?res.data.payRequestRest:null
 					uni.hideLoading()
 					uni.hideLoading()
+					if(res.status == 200){
+						this.showPopu = true
+						this.payData = res.data?res.data.payRequestRest:null
+					}else{
+						if(res.data.errorCode == 'VALIDATE_F_00001'){
+							uni.showModal({
+								showCancel:false,
+								title: '提示',
+								content: '下单人员与支付人员不一致,请在订单详情核实后再支付',
+								success: function (res) {
+									if (res.confirm) {
+										_this.viewRow(item)
+									}
+								}
+							});
+						}
+					}
 				})
 				})
 			},
 			},
 			// 付款成功,isOk: false 取消支付或支付失败,true 支付完成
 			// 付款成功,isOk: false 取消支付或支付失败,true 支付完成
@@ -387,9 +403,6 @@
 			},
 			},
 			// 详细页
 			// 详细页
 			viewRow(item){
 			viewRow(item){
-				if(item.billStatus== 'WAIT_PAY'){
-					item.timestamp = (new Date(item.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000
-				}
 				this.$store.state.vuex_tempOrderData = item
 				this.$store.state.vuex_tempOrderData = item
 				uni.navigateTo({
 				uni.navigateTo({
 					url: "/pagesB/procureOrder/orderDetail"
 					url: "/pagesB/procureOrder/orderDetail"