xiaoxin 1 год назад
Родитель
Сommit
264b7e1f62
2 измененных файлов с 19 добавлено и 15 удалено
  1. 14 14
      pages/order/index.vue
  2. 5 1
      pages/order/takefood.vue

+ 14 - 14
pages/order/index.vue

@@ -34,7 +34,7 @@
 						<view class="order_name" v-if="item.status == 4">已完成</view>
 						<view class="order_name" v-if="item.status == 5">已取消</view>
 						<view class="order_name" v-if="item.status == 7">待接单</view>
-						<view class="order_name" v-if="item.status == 8">已取消</view>
+						<view class="order_name" v-if="item.status == 8">已退款</view>
 						<view class="order_name" v-if="item.status == 0">待结算</view>
 						<view class="order_data" v-if="item.payTime">{{ item.payTime }}</view>
 					</view>
@@ -90,7 +90,7 @@
 						<view class="order_name" v-if="item.status == 5">已取消</view>
 						<view class="order_name" v-if="item.status == 6">制作中</view>
 						<view class="order_name" v-if="item.status == 7">待接单</view>
-						<view class="order_name" v-if="item.status == 8">已取消</view>
+						<view class="order_name" v-if="item.status == 8">已退款</view>
 						<view class="order_name" v-if="item.status == 13">待骑手接单</view>
 						<view class="order_name" v-if="item.status == 0">待结算</view>
 						<view class="order_data" v-if="item.payTime">{{ item.payTime }}</view>
@@ -282,6 +282,9 @@ export default {
 				},
 				{
 					name: '已取消'
+				},
+				{
+					name: '已退款'
 				}
 			],
 			waimaiList: [
@@ -305,6 +308,9 @@ export default {
 				},
 				{
 					name: '已取消'
+				},
+				{
+					name: '已退款'
 				}
 			],
 			paotuiList: [
@@ -737,12 +743,9 @@ export default {
 				case 6:
 					this.status = 5 //已取消
 					break
-				// case 4:
-				// 	this.status = 4 //已完成
-				// 	break
-				// case 5:
-				// 	this.status = 5 //已取消
-				// 	break
+				case 7:
+					this.status = 8 //已退款
+					break
 			}
 			this.getOrderList()
 		},
@@ -789,12 +792,9 @@ export default {
 				case 6:
 					this.status = 5 //已取消
 					break
-				// case 4:
-				// 	this.status = 4 //已完成
-				// 	break
-				// case 5:
-				// 	this.status = 5 //已取消
-				// 	break
+				case 7:
+					this.status = 8 //已退款
+					break
 			}
 			this.getOrderList()
 		},

+ 5 - 1
pages/order/takefood.vue

@@ -8,7 +8,7 @@
 			<view class="tosend_text" v-if="dataDet.status == 5">已取消</view>
 			<view class="tosend_text" v-if="dataDet.status == 6">制作中</view>
 			<view class="tosend_text" v-if="dataDet.status == 7">待接单</view>
-			<view class="tosend_text" v-if="dataDet.status == 8">已取消</view>
+			<view class="tosend_text" v-if="dataDet.status == 8">已退款</view>
 			<view class="tosend_text" v-if="dataDet.status == 13">待骑手接单</view>
 			<view class="tosend_text" v-if="dataDet.status == 0">待结算</view>
 
@@ -331,7 +331,11 @@ export default {
 			let data = {
 				orderId: this.orderId
 			}
+
+			console.log(data)
+
 			this.$Request.get('/app/order/selectOrderById', data).then((res) => {
+				console.log(res)
 				uni.hideLoading()
 				if (res.code == 0) {
 					this.dataDet = res.data