Merge branch 'master' of git.huaml.com:zhh/front-end

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

@@ -146,7 +146,7 @@
 
     <uni-popup ref="morePopup" background-color="#fff" type="center" :animation="true" class="class-popup-style">
       <view class="more-popup-body">
-        <block v-if="item.sendStatus == -1">
+        <block v-if="item.sendStatus == -2">
           <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">呼叫跑腿</button></view>
         </block>
         <block v-else-if="item.sendStatus == 0 || item.sendStatus == 1 || item.sendStatus == 4 || item.sendStatus == 5">
@@ -158,7 +158,6 @@
         <view class="text-center"><button class="admin-button-com" @click="addExpress(item)">顺丰下单</button></view>
         <view class="text-center"><button class="admin-button-com" @click="cancelExpress(item)">取消顺丰订单</button></view>
         <view class="text-center"><button class="admin-button-com" @click="fillNoFh(item)">填单发货</button></view>
-        <!-- <view class="text-center"><button class="admin-button-com" @click="sim(item)">模拟</button></view> -->
         <view class="text-center"><button class="admin-button-com default" @click="closeMore">取消</button></view>
       </view>
     </uni-popup>
@@ -330,9 +329,6 @@ export default {
     closeMore() {
       this.$refs.morePopup.close();
     },
-    sim(item) {
-      //testUpdate({id:item.id}).then(res=>{ })
-    },
     callIntraCity(item) {
       this.closeMore();
       this.callExpressData = {

ghsApp/src/admin/shop/print.vue

@@ -56,7 +56,8 @@
           <view style="margin-top:50upx;">
             <view style="font-weight:bold;">标签机暂时只支持：</view>
             <view style="margin-top:10upx;">飞鹅标签打印机 4G</view>
-            <view style="margin-top:10upx;">热敏标签纸 50x40，物流用的标签纸是 100x60</view>
+            <view style="margin-top:10upx;">热敏标签纸 50x40，物流用的标签纸是 60x100</view>
+            <view style="margin-top:10upx;">纸张大小，购买前跟客服确认</view>
           </view>
 
           <view style="margin-top:50upx;">

ghsApp/src/pagesOrder/detail.vue

@@ -20,16 +20,18 @@
 				</view>
 			</view>
 
-			<view class="flex-space title" v-if="Number(detailInfo.sendStatus)>-1">配送进度</view>
-			<view class="content-box" v-if="Number(detailInfo.sendStatus)>-1">
+			<view class="flex-space title" v-if="Number(detailInfo.sendStatus)>-2">配送进度</view>
+			<view class="content-box" v-if="Number(detailInfo.sendStatus)>-2">
 				<view class="order-msg-blo" style="padding: 20upx;">
 					<view class="msg-list">
-						<view class="label"><text @click="showMySimPop">配</text>送平台：</view>
+						<view class="label"><text @click="showMySimPop">配送平台：</text></view>
 						<view class="value">{{getExpressPlatformText(detailInfo.deliveryId)}}</view>
 					</view>
 					<view class="msg-list express-progress-row">
 						<view class="label">配送进度：</view>
-						<view class="value" :style="detailInfo.sendStatus == '3' ? 'color:#ff2842;font-weight:bold;' : detailInfo.sendStatus == '2' ? 'color:#07c160;font-weight:bold;' : ''">{{getProgressText(detailInfo.sendStatus)}}</view>
+						<view class="value" :style="detailInfo.sendStatus == '3' ? 'color:#ff2842;font-weight:bold;' : detailInfo.sendStatus == '2' ? 'color:#07c160;font-weight:bold;' : ''">
+							{{ detailInfo.sendStatus==-1?'等平台确认': detailInfo.sendStatus==0?'等跑腿接单':detailInfo.sendStatus==1?'跑腿已接单':detailInfo.sendStatus==2?'已送达':detailInfo.sendStatus==3?'已取消':detailInfo.sendStatus==4?'跑腿已到店':detailInfo.sendStatus==5?'跑腿配送中':'未知'}}
+						</view>
 						<view class="express-actions">
 							<button class="admin-button-com mini-btn btn-danger" v-if="detailInfo.sendStatus == '0' || detailInfo.sendStatus == '1'" @click.stop="cancelMyExpress(detailInfo.id)">取消跑腿</button>
 							<button class="admin-button-com mini-btn" v-if="detailInfo.sendStatus == '3'" @click.stop="openExpressPage()">重叫跑腿</button>
@@ -414,7 +416,7 @@
 			<button class="admin-button-com middle blue" @click="shareOrder()">分享</button>
 			<!-- #endif -->
 
-			<button class="admin-button-com middle blue" v-if="detailInfo.sendStatus == '-1' && detailInfo.payStatus == 1" @click.stop="openExpressPage()">呼叫跑腿</button>
+			<button class="admin-button-com middle blue" v-if="detailInfo.sendStatus == '-2' && detailInfo.payStatus == 1" @click.stop="openExpressPage()">呼叫跑腿</button>
 
 			<button class="admin-button-com middle blue" style="background-color: green;border-color: green;" v-if="detailInfo.status != 1 && detailInfo.status != 5" @click="printOrder(detailInfo)">打印(无价格)</button>
 
@@ -667,18 +669,6 @@ export default {
 			}
 			return platformMap[platform] || platform
 		},
-		//转换配送状态为中文显示
-		getProgressText(status) {
-			const statusMap = {
-				0: '已叫跑腿，等跑腿接单',
-				1: '跑腿已接单',
-				2:'已送达',
-				3:'已取消',
-				4:'跑腿已到店',
-				5:'跑腿配送中'
-			}
-			return statusMap[status] || status
-		},
 		cancelChange(){
 			this.$refs.staffRef.close()
 		},

hdApp/src/admin/home/order.vue

@@ -88,7 +88,7 @@
                 <view class="admin-button-com middle default" @click.stop="">呼叫跑腿</view>
               </block>
               <block v-else>
-                <view class="admin-button-com middle" v-if="item.sendStatus == '-1'" @click.stop="openExpressPage(item.id)">呼叫跑腿</view>
+                <view class="admin-button-com middle" v-if="item.sendStatus == '-2'" @click.stop="openExpressPage(item.id)">呼叫跑腿</view>
                 <view class="admin-button-com middle" v-else-if="item.sendStatus == '3'" @click.stop="openExpressPage(item.id)">重叫跑腿</view>
                 <view class="admin-button-com default" v-else-if="item.sendStatus == '2'">跑腿完成</view>
                 <view class="admin-button-com default" v-else-if="item.sendStatus == '1' && item.payStatus == 1">已发跑腿</view>

hdApp/src/admin/order/detail.vue

@@ -9,7 +9,7 @@
         </view>
       </view>
 
-      <view class="module-com order-msg" v-if="Number(orderInfo.sendStatus)>-1">
+      <view class="module-com order-msg" v-if="Number(orderInfo.sendStatus)>-2">
         <view class="module-tit">
           <text class="module-tit__text">配送进度</text>
         </view>
@@ -21,7 +21,9 @@
             </view>
             <view class="msg-list express-progress-row">
               <view class="label">配送进度：</view>
-              <view class="value">{{getProgressText(orderInfo.sendStatus)}}</view>
+              <view class="value">
+							  {{ orderInfo.sendStatus==-1?'等平台确认': orderInfo.sendStatus==0?'等跑腿接单':orderInfo.sendStatus==1?'跑腿已接单':orderInfo.sendStatus==2?'已送达':orderInfo.sendStatus==3?'已取消':orderInfo.sendStatus==4?'跑腿已到店':orderInfo.sendStatus==5?'跑腿配送中':'未知'}}
+              </view>
               <view class="express-actions">
                 <button class="admin-button-com mini-btn btn-danger" v-if="orderInfo.sendStatus == '0' || orderInfo.sendStatus == '1'" @click.stop="cancelMyExpress(orderInfo.id)">取消跑腿</button>
                 <button class="admin-button-com mini-btn" v-if="orderInfo.sendStatus == '3'" @click.stop="openExpressPage(orderInfo.id)">重叫跑腿</button>
@@ -373,7 +375,7 @@
           v-if="orderInfo.status == 1">
           扫码收款
         </button>
-        <button class="admin-button-com middle" v-if="orderInfo.sendStatus == '-1' && orderInfo.payStatus == 1" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
+        <button class="admin-button-com middle" v-if="orderInfo.sendStatus == '-2' && orderInfo.payStatus == 1" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
         <button 
           class="admin-button-com middle" 
           @click.stop="printOrder(orderInfo)"