Merge branch 'zhongqi-deliveryDistrict' of git.huaml.com:zhh/front-end into zhongqi-deliveryDistrict

ghsApp/src/admin/custom/selectCustom.vue

@@ -27,7 +27,7 @@
                 </span>
 
                 <span v-if="Number(item.remainDebtAmount) < 0" class="debt-amount">
-                  余额<span class="amount_num" style="color:#3385FF;">{{Math.abs(item.remainDebtAmount)}}</span>
+                  <span class="amount_num" style="color:#3385FF;">{{Math.abs(item.remainDebtAmount)}}</span>
                 </span>
 
                 <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:15upx;color:green;font-weight:bold;">没有下过</text>

ghsApp/src/admin/home/apply.vue

@@ -99,7 +99,7 @@ export default {
                         {name: "预订汇总",img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs.png`,url: "/admin/order/statBook"},
                         {name: "预订客户",img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs.png`,url: "/admin/book/custom"},
                         {name: "预订明细",img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs.png`,url: "/admin/book/itemCustom"},
-                        {name: "片区订单",img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs.png`,url: "/admin/order/orderListByDist"}
+                        {name: "配送片区",img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs.png`,url: "/admin/order/orderListByDist"}
                     ]
                 },
                 {

ghsApp/src/api/order/index.js

@@ -69,7 +69,7 @@ export const getNewOrderList = data => {
 }
 
 /**
- * 片区订单列表
+ * 配送片区列表
  */
 export const getOrderListByDist = data => {
 	return https.get("/order/list-by-dist", data)

ghsApp/src/components/module/dateSelect.vue

@@ -188,7 +188,7 @@ export default {
             }
 
             this.dropdownShow = false
-            this.defaultDateName = this.startDate == this.endDate ?  this.startDate.substring(5) : this.startDate.substring(5) + ' ~ ' + this.endDate.substring(5) 
+            this.defaultDateName = this.startDate == this.endDate ?  this.startDate.substring(5) : this.startDate.substring(5) + '/' + this.endDate.substring(5) 
             this.$emit('selectDateFn',{searchTime:'custom',startTime:this.startDate,endTime:this.endDate})
         },
         cancelPicker(){

ghsApp/src/pages.json

@@ -508,7 +508,7 @@
 				{"path": "statKhBook","style": {"navigationBarTitleText": "详情"}},
 				{"path": "freight","style": {"navigationBarTitleText": "运费设置"}},
 				{"path": "callExpress","style": {"navigationBarTitleText": "呼叫跑腿"}},
-				{"path": "orderListByDist","style": {"navigationBarTitleText": "片区订单"}}
+				{"path": "orderListByDist","style": {"navigationBarTitleText": "配送片区"}}
 			]
 		},
 		{