sjx

pages/order/shopOrder.vue

@@ -7,9 +7,6 @@
 			<view class="tabitem flex1" @tap="taggletab" v-for="(item,index) in order_status_list" :key="index" data-current="1" :data-statusTab="item.status_id"  :data-status="item.status" :data-is_dianping="item.is_dianping" :data-sale_status="item.sale_status"  >
 				<view class="title" :class="{active:tabactive==item.status_id}" >{{item.status_name}}</view>
 			</view>
-			<!-- <view class="tabitem flex1" @tap="taggletab(2)" >
-				<view class="title" :class="{active:tabactive==2}">退款售后</view>
-			</view> -->
 		</view>
 		
 		<!-- v-if="tabactive==1" -->
@@ -30,7 +27,7 @@
 				<view>
 					<!-- 列表 -->
 					<view class="order_body    " v-for="(productList,index1) in item.products" :key="index1" >
-						<view class="flex mb-20"  v-for="(product,index) in productList" :key="index">
+						<view class="flex mb-20"  v-for="(product,index) in productList.orderGoods" :key="index">
 							<!-- <image class="imgs" src="" mode=""></image> -->
 							<image class="imgs" :src="staticUrl+product.photo" v-if="product.photo" mode=""></image>
 							<image class="imgs" :src="staticUrl+item.photo" mode="" v-else ></image>
@@ -48,15 +45,14 @@
 							</view>
 						
 						</view>
+						
 						<view  class="order_foot bodbod flex jus-e mb-20 mt-10">
-							<block v-if="item.products[index1][0].logisticCode" v-for="(action,index) in item.order_operation.slice(-1)"  :key="index">
-								  <view class='btnss ' :data-vendor="item.products[index1][0].vendor_id" :data-orderid='item.order_id' @tap.stop="operation" :data-action="'checkLogistics'" :data-is_ld='item.buytype'>查看物流</view>
-							</block>
-							<block v-else v-for="(action,index) in item.order_operation.slice(-1)"  :key="index">
-								  <view class='btnss ' :data-vendor="item.products[index1][0].vendor_id" :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
+								<block  v-for="(action,index) in productList.operation"   :key="index">
+									  <view class='btnss '  :data-orderid='item.order_id' :data-vendor='index1' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
 								</block>
 							
 							
+									
 						</view>
 						
 					</view>
@@ -70,17 +66,11 @@
 				<view class="order_foot flex jus-e">
 					
 					<!-- 已发货 -->
-					<!-- <view class="btnitem">查看订单</view>
-					<view class="btnitem bg">查看物流</view> -->
 					
-					<block  v-for="(action,index) in item.order_operation.slice(0,-1)"  :key="index">
+					<block  v-for="(action,index) in item.order_operation"  :key="index">
 						  <view class='btnss '  :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
 					</block>
 			
-					<!-- <block v-if="item.products.length<=1" v-for="(action,index) in item.order_operation"  :key="index">
-						  <view class='btnitem ' :data-vendor="item.products[index1][0].vendor_id" :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
-					</block> -->
-			
 				</view>
 			</view>
 			
@@ -318,7 +308,7 @@
 			},
 			  // 跳转发快递订单 ok 发货
 			express (order_id, action,vendor) {
-			    uni.redirectTo({
+			    uni.navigateTo({
 			      url: '/pages/order/delivery/delivery?order_id=' + order_id + '&action=' + action + '&vendor=' + vendor
 			    })
 			},

utils/debug.js

@@ -3,8 +3,8 @@
 module.exports = {
 	//是否为开发调试环境 true为本地环境 false 为正式环境
 
-	 // isdebug:true,//测试
-	isdebug:false,//正式
+	 isdebug:true,//测试
+	// isdebug:false,//正式