视频

ghsApp/src/admin/home/me.vue

@@ -78,11 +78,11 @@
         <view class="module-com content_box user-open_bx">
           <view class="input-line-wrap">
 
-            <tui-list-cell @click="getCityVideo()" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1">
+            <tui-list-cell @click="getCityVideo()" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title" style="color:green;">城市版视频</view>
             </tui-list-cell>
 
-            <tui-list-cell @click="getDnVideo()" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1">
+            <tui-list-cell @click="getDnVideo()" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title" style="color:green;">斗南版视频</view>
             </tui-list-cell>
 

hdApp/src/admin/goods/plantCg.vue

@@ -40,7 +40,7 @@ export default {
           key: '2'
         },
         {
-          name: "待收货",
+          name: "配送中",
           value: 0,
           key: '3'
         },

hdApp/src/admin/goods/plantCgDetail.vue

@@ -23,7 +23,7 @@
         </view>
         <view class="order-info_box">
           <view>订单状态：</view>
-          <view>{{ detailInfo.status==0?'待付款' :detailInfo.status==1?'待发货' :detailInfo.status==2?'待收货' :detailInfo.status==3?'已完成' :detailInfo.status==4?'已取消' :'待付款' }}</view>
+          <view>{{ detailInfo.status==0?'待付款' :detailInfo.status==1?'待发货' :detailInfo.status==2?'配送中' :detailInfo.status==3?'已完成' :detailInfo.status==4?'已取消' :'待付款' }}</view>
         </view>
       </view>
       <view v-if="detailInfo.remark !=''" class="content-box price-detail">

hdApp/src/admin/goods/plantCgItem.vue

@@ -50,7 +50,7 @@ export default {
           statusName = "待发货";
           break;
         case '2':
-          statusName = "待收货";
+          statusName = "配送中";
           break;
         case '3':
           statusName = "已完成";

hdApp/src/admin/home/order.vue

@@ -112,7 +112,7 @@ export default {
   data () {
     return {
       tabIndex: 0,
-      tabs: [ { name: "全部", value: 0 }, { name: "待付款", value: 0 }, { name: "待发货", value: 0 }, { name: "待收货", value: 0 }, { name: "已完成", value: 0 } ],
+      tabs: [ { name: "全部", value: 0 }, { name: "待付款", value: 0 }, { name: "待发货", value: 0 }, { name: "配送中", value: 0 }, { name: "已完成", value: 0 } ],
       staffList:[],
       shopAdminId:0,
       searchText:'',

hdApp/src/admin/order/detail.vue

@@ -175,7 +175,7 @@
 
             <view class="msg-list">
               <view class="label">状态：</view>
-              <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待发货':orderInfo.status == 3?'待收货':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
+              <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待发货':orderInfo.status == 3?'配送中':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
             </view>
 
             <view class="msg-list">

hdApp/src/filters/constant.js

@@ -64,7 +64,7 @@ const _CONST_MAP = {
 			value: 2
 		},
 		{
-			label: '待收货',
+			label: '配送中',
 			value: 3
 		},
 		{

hdApp/src/pagesOrder/detail.vue

@@ -60,7 +60,7 @@
 				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
-					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'待收货':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
+					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
 				<!-- <view class="order-info_box">
                   <view>销售门店：</view>

hdApp/src/pagesPurchase/info.vue

@@ -55,7 +55,7 @@
 					<view>{{ 
 						detailInfo.status==1?'待付款'
 						:detailInfo.status==2?'待发货'
-						:detailInfo.status==3?'待收货'
+						:detailInfo.status==3?'配送中'
 						:detailInfo.status==4?'已签收'
 						:detailInfo.status==5?'已入库'
 						:detailInfo.status==6?'已取消'

hdApp/src/pagesPurchase/orderItem.vue

@@ -80,7 +80,7 @@ export default {
           statusName = "待发货";
           break;
         case '3':
-          statusName = "待收货";
+          statusName = "配送中";
           break;
         case '4':
           statusName = "已完成";

hdApp/src/pagesPurchase/purDetails.vue

@@ -20,7 +20,7 @@
       <view class="bills-info_box content-box" v-if="detailInfo.fhWlNo && !$util.isEmpty(detailInfo.fhWlNo)">
         <view class="order-info_box">
           <view>发货状态：</view>
-          <view style="color:green;font-weight:bold;font-size:30upx;">待收货</view>
+          <view style="color:green;font-weight:bold;font-size:30upx;">配送中</view>
         </view>
         <view class="order-info_box" v-if="detailInfo.fhType == 1">
           <view>物流名称：</view>
@@ -115,7 +115,7 @@
           <block v-if="detailInfo.status==5">
             <view style="color:red;font-size:30upx;font-weight:bold;">已取消</view>
           </block>
-          <view v-else>{{ detailInfo.status==1?'待付款' :detailInfo.status==2?'待发货' :detailInfo.status==3?'待收货' :detailInfo.status==4?'已完成' :detailInfo.status==5?'已取消' :'待付款' }}</view>
+          <view v-else>{{ detailInfo.status==1?'待付款' :detailInfo.status==2?'待发货' :detailInfo.status==3?'配送中' :detailInfo.status==4?'已完成' :detailInfo.status==5?'已取消' :'待付款' }}</view>
         </view>
 
         <view v-if="detailInfo.refundLog && detailInfo.refundLog == 1" class="order-info_box">

hdApp/src/pagesPurchase/shopping.vue

@@ -62,7 +62,7 @@ export default {
           key: '2'
         },
         {
-          name: "待收货",
+          name: "配送中",
           value: 0,
           key: '3'
         },

hdApp/src/pagesStorehouse/allot/allotPut.vue

@@ -78,7 +78,7 @@ export default {
 					key: ""
 				},
 				{
-					name: "待收货",
+					name: "配送中",
 					key: PUT_STATUS.CONFIRM
 				},
 				{
@@ -126,7 +126,7 @@ export default {
 			let name = "";
 			switch (status) {
 				case PUT_STATUS.CONFIRM:
-					name = "待收货";
+					name = "配送中";
 					break;
 				case PUT_STATUS.DONE:
 					name = "已入库";

hdApp/src/pagesStorehouse/allot/putDetails.vue

@@ -160,7 +160,7 @@ export default {
 			let name = "";
 			switch (status) {
 				case PUT_STATUS.CONFIRM:
-					name = "待收货";
+					name = "配送中";
 					break;
 				case PUT_STATUS.DONE:
 					name = "已入库";

hdApp/src/utils/declare.js

@@ -24,7 +24,7 @@ export const OUT_STATUS = {
 	CANCEL: "3"
 };
 
-//采购订单状态：1待确认，2待发货，3待收货，4已完成
+//采购订单状态：1待确认，2待发货，3配送中，4已完成
 export const PURCHASE_ORDER_STATUS = {
 	CONFIRM: "1",
 	UNDIS: "2",
@@ -38,7 +38,7 @@ export const INVENTORY_STATUS = {
 	DONE: "2"
 };
 
-//订单状态 0全部 1待付款 2待发货 3待收货 4待通知 5已取消 6已完成
+//订单状态 0全部 1待付款 2待发货 3配送中 4待通知 5已取消 6已完成
 export const ORDER_STATUS = {
 	ALL: "0",
 	NOPAY: "1",