提交

pages/index/list.vue

@@ -18,6 +18,7 @@
 					@tap.stop="jump('/pages/order/detail', { id: order.id })">
 					<view class="order-head u-flex u-row-between">
 						<text class="no">订单编号：{{ order.order_sn }}</text>
+						<!-- <text class="state">{{ order.status_name }}</text> -->
 						<text class="state">{{ order.status_name }}</text>
 					</view>
 					<view class="goods-order" v-for="goods in order.item" :key="goods.id">
@@ -107,17 +108,17 @@
 					},
 					{
 						id: 1,
-						title: '待支付',
+						title: '待分拣',
 						type: 'nopay'
 					},
-					// {
-					// 	id: 2,
-					// 	title: '待发货',
-					// 	type: 'nosend'
-					// },
+					{
+						id: 2,
+						title: '待配送',
+						type: 'nosend'
+					},
 					{
 						id: 3,
-						title: '待收货',
+						title: '配送中',
 						type: 'noget'
 					},
 					{

pages/index/user/userinfo-card.vue

@@ -9,10 +9,10 @@
 					fontSize: '36rpx',
 					fontWeight: '500'
 				}" :background="navBackground">
-					<view slot="right" class="u-flex u-row-center u-col-center u-m-r-20" v-if="userOtherData.is_store"
+					<!-- <view slot="right" class="u-flex u-row-center u-col-center u-m-r-20" v-if="userOtherData.is_store"
 						@tap="goStore">
 						<button class="u-reset-button merchant-btn">切换商家版</button>
-					</view>
+					</view> -->
 				</shopro-navbar>
 
 				<view class="user-head u-flex u-row-between"  @tap="$Router.push('/pages/user/info')">

pages/order/confirm.vue

@@ -34,6 +34,26 @@
         </view>
       </view>
     </view>
+	<view
+			class="remark-box item-list u-flex u-row-between"
+			v-if="msgText=='当前收货地址不在配送范围'"
+	>
+			<view class="item-title" style="color:red;">{{msgText}}</view>
+			<!-- <view
+			  class="box-content u-flex"
+			  @tap="checkExpressTime('store')"
+			>
+			  <text class="detail"
+				>{{ checkTime[checkDayCur].title
+				}}{{ checkTime[checkDayCur].timeRange[checkTimeCur] }}</text
+			  >
+			  <text
+				class="u-iconfont uicon-arrow-right"
+				style="color: #999"
+			  ></text>
+			</view> -->
+	</view>
+	
 	  <view
 		class="remark-box item-list u-flex u-row-between"
 		
@@ -112,7 +132,7 @@
       <block v-if="perGoodsList.length">
 		  <!-- 配送方式 -->
 		  <!-- @tap="onSelExpressType(perGoodsList[0])" -->
-		  <view
+		<!--  <view
 		    class="remark-box item-list u-flex u-row-between"
 		    
 		  >
@@ -124,7 +144,7 @@
 		        style="color: #bfbfbf"
 		      ></text>
 		    </view>
-		  </view>
+		  </view> -->
 	
         <!-- 备注 -->
         <view class="remark-box u-flex item-list u-p-30">
@@ -857,6 +877,7 @@ export default {
   },
   data() {
     return {
+		msgText:'',
 	  isGroup: true, //默认是否有团点
       platform: this.$platform.get(),
       totalNum: 0,
@@ -1297,10 +1318,13 @@ export default {
           groupon_id: that.grouponId,
         })
         .then((res) => {
+			console.log(res,"999")
+		  that.msgText = res.msg
           if (res.data) {
             that.orderPre = res.data;
             that.perGoodsList = res.data.new_goods_list;
             that.totalNum = 0;
+			
             that.perGoodsList.map((item) => {
 				// if(type == 1){
 				// 	item.dispatch_type ='regiment'
@@ -1330,7 +1354,7 @@ export default {
               });
             });
           }
-        });
+        })
     },
     // 提交订单
     subOrder() {
@@ -1379,6 +1403,7 @@ export default {
         )
         .then((res) => {
           that.isDisabled = false;
+		  console.log(res,"iiii")
           if (res.code === 1) {
             that.getCartList();
             that.$Router.replace({

pages/order/detail.vue

@@ -7,6 +7,9 @@
 				<!-- <image class="state-img" :src="$IMG_URL + '/imgs/order/order_state1.png'" mode=""></image> -->
 				{{ orderDetail.status_desc }}
 			</view>
+			<view style="margin-top:20rpx" v-if="orderDetail.status_code=='noget'">
+				骑手电话：{{ orderDetail.ride_phone }}
+			</view>
 		</view>
 
 		<!-- 收货地址 -->
@@ -278,6 +281,7 @@ export default {
 			that.$http('order.detail', {
 				id: that.$Route.query.id
 			}).then(res => {
+				console.log(res,"9999")
 				if (res.code === 1) {
 					that.orderDetail = res.data;
 					that.orderDetail.createtime = that.$u.timeFormat(res.data.createtime, 'yyyy-mm-dd hh:MM');

pages/order/list.vue

@@ -93,6 +93,32 @@
 				lastPage: 1,
 				orderType: 'all',
 				orderList: [],
+				// orderState: [{
+				// 		id: 0,
+				// 		title: '全部订单',
+				// 		type: 'all'
+				// 	},
+				// 	{
+				// 		id: 1,
+				// 		title: '待支付',
+				// 		type: 'nopay'
+				// 	},
+				// 	// {
+				// 	// 	id: 2,
+				// 	// 	title: '待发货',
+				// 	// 	type: 'nosend'
+				// 	// },
+				// 	{
+				// 		id: 3,
+				// 		title: '待收货',
+				// 		type: 'noget'
+				// 	},
+				// 	{
+				// 		id: 4,
+				// 		title: '已完成',
+				// 		type: 'nocomment'
+				// 	}
+				// ]
 				orderState: [{
 						id: 0,
 						title: '全部订单',
@@ -100,17 +126,17 @@
 					},
 					{
 						id: 1,
-						title: '待支付',
+						title: '待分拣',
 						type: 'nopay'
 					},
-					// {
-					// 	id: 2,
-					// 	title: '待发货',
-					// 	type: 'nosend'
-					// },
+					{
+						id: 2,
+						title: '待配送',
+						type: 'nosend'
+					},
 					{
 						id: 3,
-						title: '待收货',
+						title: '配送中',
 						type: 'noget'
 					},
 					{