修改订单详情

pages/groupbuying_details/order_details_confirm/index.vue

@@ -62,7 +62,7 @@
 						</view>
 						<view class="a-b">
 							<view class="a-b1">
-								对接团长:
+								对接团长：
 								<text class="red">
 									{{grouponOrderData.username}}
 								</text>

pages/groupbuying_details/order_details_list/index.vue

@@ -5,11 +5,12 @@
 				<view class="imageView">
 					<image v-if="orderDetail.orderState == 5" src="http://www.gzzzyd.com/groupon/home_slices/取消订单小@2x.png" mode="scaleToFill" />
 					<image v-else-if="orderDetail.orderState == 4" src="http://www.gzzzyd.com/groupon/home_slices/已完成@2x.png" mode="scaleToFill" />
-					<image v-else-if="orderDetail.orderState == 6 || orderDetail.orderState == 7" src="http://www.gzzzyd.com/groupon/home_slices/退款中@2x.png" mode="scaleToFill" />
+					<image v-else-if="orderDetail.orderState == 8" src="http://www.gzzzyd.com/groupon/home_slices/退款中@2x.png" mode="scaleToFill" />
 					<image v-else src="http://www.gzzzyd.com/groupon/order_details/时间.png" mode="scaleToFill" />
 				</view>
 
 				<text v-if="orderDetail.orderState == 4" class="success_status">{{orderDetail.orderStateDesc}}</text>
+        <text v-else-if="orderDetail.orderState == 8" class="refund_status">{{orderDetail.afterSalesDesc}}</text>
 				<text v-else-if="orderDetail.orderState > 4" class="refund_status">{{orderDetail.orderStateDesc}}</text>
 				<text v-else class="status">{{orderDetail.orderStateDesc}}</text>
 			</view>
@@ -165,7 +166,7 @@
               <view class="item-value2">{{orderDetail.refundApplyTime}}</view>
             </view>
             <view class="p-b-item">
-              <view class="item-lable">退款编号</view>
+              <view class="item-lable">售后编号</view>
               <view class="item-value2">{{orderDetail.refundNo}}</view>
             </view>
             <view class="p-b-item">
@@ -184,9 +185,8 @@
 
 			<view :style="{height:'100rpx'}"></view>
 			<view class='footer op-area'>
-				<button class="info-btn" v-if="orderDetail.orderState == 2" @click="RefundShow = true">申请售后</button>
+<!--				<button class="info-btn" v-if="orderDetail.orderState == 4" @click="RefundShow = true">申请售后</button>-->
 				<button class="info-btn" v-if="orderDetail.orderState == 1" @click="cancelOrder()">取消订单</button>
-				<!-- <button class="action-btn" v-if="orderDetail.orderState == 1" @click="goPay()">去支付</button> -->
 			</view>
 		</view>
 
@@ -321,7 +321,7 @@ export default {
 		this.from = 'routine'
 		console.log(options);
 		this.orderId = options.orderId;
-		this.getOrderDetail(this.orderId )
+		this.getOrderDetail(this.orderId, options.afterSalesId)
 	},
 	/**
 	 * 生命周期函数--监听页面显示
@@ -418,15 +418,18 @@ export default {
 		afterSales () {
 
 		},
-		getOrderDetail(orderId) {
-			console.log("getOrderDetail");
+		getOrderDetail(orderId, afterSalesId) {
 			let longitude = uni.getStorageSync('user_longitude');
 			let latitude = uni.getStorageSync('user_latitude');
-			getUserOrderDetail({
-				orderId: orderId,
-				longitude: longitude,
-				latitude: latitude
-			}).then(res => {
+			let param = {
+        orderId: orderId,
+        longitude: longitude,
+        latitude: latitude
+      };
+			if (afterSalesId != null && afterSalesId != 'null') {
+			  param.afterSalesId = afterSalesId;
+      }
+			getUserOrderDetail(param).then(res => {
 				this.orderDetail = res.data
 			}).catch(err => {
 				return that.$util.Tips({

pages/order/index.vue

@@ -20,7 +20,7 @@
 			</view>
 			<view v-for="(item, index) in orderList" :key="index">
 				<view class="list" >
-					<view class="myclient_list" @click="goOrderDetails(item.orderId)">
+					<view class="myclient_list" @click="goOrderDetails(item)">
 						<view class="myclient_list_name">
 							<view class="nl ">
 								{{item.mainTitle}}
@@ -308,6 +308,9 @@ export default {
 		} else if (ContentIndex == '全部') {
       this.current = 0;
       this.orderStatus = 0;
+    } else if (ContentIndex == '售后') {
+      this.current = 4;
+      this.orderStatus = 8;
     }
 
 
@@ -523,21 +526,34 @@ export default {
 		/**
 		 * 去订单详情
 		 */
-		goOrderDetails (orderId) {
+		goOrderDetails (item) {
 			uni.navigateTo({
-				url: '/pages/groupbuying_details/order_details_list/index?orderId=' + orderId
+				url: '/pages/groupbuying_details/order_details_list/index?orderId=' + item.orderId + '&afterSalesId=' + item.afterSalesId
 			});
 		},
 		/**
 		 * 切换类型
 		 */
 		statusClick: function (status) {
-			if (status.orderStatus == this.orderStatus) return;
-			this.orderStatus = status.orderStatus;
-			this.loadend = false;
-			this.page = 1;
-			this.$set(this, 'orderList', []);
-			this.getOrderList();
+
+			// if (status.orderStatus == 8) {
+      //   this.orderStatus = 0;
+      //   console.log("wojinlail aaaa")
+      //   uni.navigateTo({url: '/pages/users/user_return_list/index'});
+      //   // uni.({
+      //   //   url: '/pages/users/user_return_list/index',
+      //   //   fail (err) {
+      //   //     console.log(err)
+      //   //   }
+      //   // })
+      // } else {
+        if (status.orderStatus == this.orderStatus) return;
+        this.orderStatus = status.orderStatus;
+        this.loadend = false;
+        this.page = 1;
+        this.$set(this, 'orderList', []);
+        this.getOrderList();
+      // }
 		},
 		/**
 		 * 获取订单列表

pages/user/index.vue

@@ -511,7 +511,7 @@ export default {
 			{
 				img: 'http://www.gzzzyd.com/groupon/order/售后@2x.png',
 				title: '售后',
-				url: '/pages/users/user_return_list/index'
+				url: '/pages/order/index?status=8'
 			},
 			],
 			imgUrls: [],