文字

ghsApp/src/admin/home/components/OrderItem.vue

@@ -107,7 +107,7 @@ export default {
             return "待付款";
             break;
             case "2":
-            return "待配送";
+            return "待发货";
             break;
             case "3":
             return "配送中";

ghsApp/src/admin/home/order.vue

@@ -105,7 +105,7 @@ export default {
           id: 1,
         },
         {
-          name: "待配送",
+          name: "待发货",
           value: 0,
           id: 2,
         },

ghsApp/src/filters/constant.js

@@ -60,7 +60,7 @@ const _CONST_MAP = {
 			value: 1
 		},
 		{
-			label: '待配送',
+			label: '待发货',
 			value: 2
 		},
 		{

ghsApp/src/pages.json

@@ -86,7 +86,7 @@
 				{"path": "detail","style": {"navigationBarTitleText": "订单详情", "enablePullDownRefresh": true}},
 				{"path": "showOrder","style": {"navigationBarTitleText": "订单", "enablePullDownRefresh": true}},
 				{"path": "info","style": {"navigationBarTitleText": "订单详情", "enablePullDownRefresh": true}},
-				{"path": "arrival","style": {"navigationBarTitleText": "到货处理"}},
+				{"path": "arrival","style": {"navigationBarTitleText": "确认发货"}},
 				{"path": "result","style": {"navigationBarTitleText": "结果"}},
 				{"path": "refund","style": {"navigationBarTitleText": "退款"}},
 				{"path": "refundDetail","style": {"navigationBarTitleText": "退款"}},

ghsApp/src/pagesOrder/arrival.vue

@@ -17,7 +17,7 @@
 								<view class="info-line">
 									<text class="item-type"></text>
 									<view class="item-count">
-										<input type="number" class="num" v-model="s.xhNum" placeholder="到货数量" />
+										<input type="number" class="num" v-model="s.xhNum" placeholder="发货数量" />
 										<input type="digit" class="price" v-model="s.currentHdPrice" placeholder="售价" />
 									</view>
 								</view>
@@ -151,7 +151,7 @@ export default {
 					if(res.code == 1){
 						that.pageTo({url: '/pagesOrder/result',type:2})
 					}
-				})          
+				})        
 			})
 		}
 	}

ghsApp/src/pagesOrder/detail.vue

@@ -134,7 +134,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 v-if="detailInfo.status==1" class="order-info_box">
 					<view>过期时间：</view>
@@ -182,7 +182,10 @@
 									<text class="item-price">
 										<text class="unit"></text>
 										<text class="price">
-											<text v-if="detailInfo.stockChange == 1">{{parseFloat(s.xhNum)}}{{s.xhUnitName}} * ¥{{parseFloat(s.xhUnitPrice)}}</text>
+											<text v-if="detailInfo.stockChange == 1">
+												{{parseFloat(s.xhNum)}}{{s.xhUnitName}} * ¥{{parseFloat(s.xhUnitPrice)}}
+											</text>
+											<text v-else>-</text>
 											<text></text>
 										</text>
 									</text>
@@ -190,7 +193,7 @@
 								<view class="info-line">
 									<text class="item-type"></text>
 									<text class="item-count" v-if="detailInfo.stockChange == 1">¥{{parseFloat(s.xhPrice)}}</text>
-									<text class="item-count" v-else></text>
+									<text class="item-count" v-else>-</text>
 								</view>
 							</view>
 						</view>

ghsApp/src/pagesOrder/info.vue

@@ -61,7 +61,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 v-if="detailInfo.status==1" class="order-info_box">
 					<view>过期时间：</view>

ghsApp/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",