lilei 7 months ago
parent
commit
8896e3c299
2 changed files with 14 additions and 5 deletions
  1. 13 5
      pagesB/procureOrder/orderDetail.vue
  2. 1 0
      pagesB/procureOrder/orderList.vue

+ 13 - 5
pagesB/procureOrder/orderDetail.vue

@@ -170,7 +170,7 @@
 					</view>
 					<view class="infoList" v-if="info&&(info.billStatus == 'CANCEL'||info.billStatus == 'AUDIT_REJECT')&&isPayOk">
 						<text>退款状态</text>
-						<text>{{info.payInfo.refundState=='FINISH'?'已退款':'退款失败'}}</text>
+						<text>{{info.payInfo.refundState=='FINISH'?'已退款':(info.payInfo.refundState=='WAIT'?'退款中':'退款失败')}}</text>
 					</view>
 					<view class="infoList" v-if="shelfInfo">
 						<text>配送汽配商</text>
@@ -316,7 +316,8 @@
 		 message(title){
 		 	uni.showToast({
 		 		icon:'none',
-		 		title: title
+		 		title: title,
+				duration: 3000
 		 	})
 		 },
 		 // 取消订单
@@ -332,7 +333,9 @@
 		 						_this.message('取消成功')
 								item.payInfo = null
 								uni.$emit('refreshPurcaOrder',item,'CANCEL')
-								uni.navigateBack()
+								setTimeout(()=>{
+									uni.navigateBack()
+								},3000)
 		 					} else {
 		 						_this.message(res.message)
 		 					}
@@ -387,8 +390,11 @@
 		 payComplete(item,isOk){
 		 	this.showPopu = false
 		 	if(isOk){
+				this.message('支付成功')
 		 		uni.$emit('refreshPurcaOrder',item,'WAIT_AUDIT')
-				uni.navigateBack()
+				setTimeout(()=>{
+					uni.navigateBack()
+				},3000)
 		 	}
 		 },
 		 // 再次购买
@@ -406,7 +412,9 @@
 		 					if (res.status == 200) {
 		 						_this.message('收货成功')
 								uni.$emit('refreshPurcaOrder',item,'FINISH')
-		 						uni.navigateBack()
+		 						setTimeout(()=>{
+									uni.navigateBack()
+								},3000)
 		 					} else {
 		 						_this.message(res.message)
 		 					}

+ 1 - 0
pagesB/procureOrder/orderList.vue

@@ -74,6 +74,7 @@
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_RECEIVE'" size="mini" shape="round" type="error" plain @click="receiveOrder(item)">确认收货</u-button>
 										 <view v-if="(item.billStatus == 'CANCEL'||item.billStatus == 'AUDIT_REJECT')&&item.payInfo">
 											<u-tag type="success" size="mini" v-if="item.payInfo.refundState=='FINISH'" mode="plain" text="已退款" shape="square"/>
+											<u-tag type="primary" size="mini" v-else-if="item.payInfo.refundState=='WAIT'" text="退款中" shape="square" mode="plain"/>
 											<u-tag type="error" size="mini" v-else text="退款失败" shape="square" mode="plain"/>
 										 </view>
 									 </view>