文字优化

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

@@ -14,7 +14,7 @@
           <text class="other-book" v-if="item.book == 1" >预订单</text>
           <text class="other-presell" v-if="item.presell == 1" >预售单</text>
           <view :class="['status',currentStatus == 4 ? 'buleColor' : currentStatus == 3 ? 'buleColor' : currentStatus == 1 ? 'defColor' : '']">
-            {{currentStatus==1?'待付款':currentStatus==2?'待发货':currentStatus==3?'待收货':currentStatus==4?'已完成':'已取消'}}
+            {{currentStatus==1?'待付款':currentStatus==2?'待发货':currentStatus==3?'配送中':currentStatus==4?'已完成':'已取消'}}
           </view>
         </view>
         <view class="order-list_info">

ghsApp/src/admin/home/order.vue

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

ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
+export const APIHOST = 'http://api.shop.hzghd.com'
+export const IMGHOST = 'http://img.hzghd.com'
 export const CURRENT_ENV = 'dev'

ghsApp/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
+    "apiHost": "http://api.shop.hzghd.com",
     "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
+    "imgHost": "http://img.hzghd.com",
     "name":"花掌柜"
   }
 }

ghsApp/src/filters/constant.js

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

ghsApp/src/pagesOrder/detail.vue

@@ -149,7 +149,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" v-if="detailInfo.fhType == 1">

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/pagesPurchase/wcOrder.vue

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

ghsApp/src/pagesStorehouse/allot/allotPut.vue

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

ghsApp/src/pagesStorehouse/allot/inSelectItem.vue

@@ -13,7 +13,7 @@
 				<view class="orderSn">编号：{{info.orderSn}}</view>
 			</view>
 			<view class="item-row">
-				<view class="mark">状态：{{ info.status == 1 ?'待收货': info.status == 2 ?'已入库':'已取消'}}</view>
+				<view class="mark">状态：{{ info.status == 1 ?'配送中': info.status == 2 ?'已入库':'已取消'}}</view>
 			</view>
 			<view class="item-row">
 				<view class="mark">

ghsApp/src/pagesStorehouse/allot/modifyDetails.vue

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

ghsApp/src/pagesStorehouse/allot/putDetails.vue

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

ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

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

hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const FORMALHOST = 'https://shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
+export const APIHOST = 'http://api.shop.huaml.com'
+export const FORMALHOST = 'http://shop.huaml.com'
+export const IMGHOST = 'http://img.huaml.com'
 export const CURRENT_ENV = 'dev'

hdApp/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
+    "apiHost": "http://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
+    "imgHost": "http://img.huaml.com",
     "name":"花美玲"
   }
 }

hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {