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

ghsApp/src/admin/delivery/deliveryManage.vue

@@ -108,15 +108,15 @@ export default {
 
             // TODO: 调用API获取可添加的平台列表
             const allPlatforms = [
-		    { id: 'meituan', name: '美团配送', logo: '🍱' },
+		    	//{ id: 'meituan', name: '美团配送', logo: '🍱' },
                 { id: 'fengniao', name: '蜂鸟配送', logo: '🍜'},
                 { id: 'huolala', name: '货拉拉跑腿', logo: '🚛'},
                 { id: 'shansong', name: '闪送', logo: '⚡'},
-                { id: 'didi', name: '滴滴', logo: '🚗'},
-		    { id: 'uu', name: 'UU跑腿', logo: '🛵'},
+                //{ id: 'didi', name: '滴滴', logo: '🚗'},
+		    	//{ id: 'uu', name: 'UU跑腿', logo: '🛵'},
                 { id: 'shunfeng', name: '顺丰同城', logo: '🚚'},
-			{ id: 'dada', name: '达达', logo: '📦'}
-	    ];
+				//{ id: 'dada', name: '达达', logo: '📦'}
+	    	];
 	
             // 获取已授权平台的id集合
             const authorizedIds = this.platformList.map(p => p.id);

ghsApp/src/pagesOrder/detail.vue

@@ -671,7 +671,7 @@ export default {
 			tipDeliveryId: '',
 			// 配送状态映射
 			sendStatusMap: {
-				'-4': { text: '没有叫跑腿', color: '#999' },
+				'-4': { text: '未叫跑腿', color: '#999' },
 				'-2': { text: '异常', color: '#ff2842' },
 				'-1': { text: '已取消', color: '#ff2842' },
 				'0': { text: '订单生成', color: '#3385ff' },

hdApp/src/admin/delivery/deliveryManage.vue

@@ -108,14 +108,14 @@ export default {
 
             // TODO: 调用API获取可添加的平台列表
             const allPlatforms = [
-		    { id: 'meituan', name: '美团配送', logo: '🍱' },
+		    	//{ id: 'meituan', name: '美团配送', logo: '🍱' },
                 { id: 'fengniao', name: '蜂鸟配送', logo: '🍜'},
                 { id: 'huolala', name: '货拉拉跑腿', logo: '🚛'},
                 { id: 'shansong', name: '闪送', logo: '⚡'},
-                { id: 'didi', name: '滴滴', logo: '🚗'},
-		    { id: 'uu', name: 'UU跑腿', logo: '🛵'},
+                //{ id: 'didi', name: '滴滴', logo: '🚗'},
+		    	//{ id: 'uu', name: 'UU跑腿', logo: '🛵'},
                 { id: 'shunfeng', name: '顺丰同城', logo: '🚚'}
-	    ];
+	    	];
 	
             // 获取已授权平台的id集合
             const authorizedIds = this.platformList.map(p => p.id);

hdApp/src/assets/svg-icons/general/huolala.svg

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 509.95 185.58" style="enable-background:new 0 0 509.95 185.58;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FF6600;}
+	.st1{fill:#FF6600;}
+</style>
+<g id="XMLID_432_">
+	<g>
+		<path id="XMLID_00000048492103898848022470000002636802640927616152_" class="st0" d="M368.68,119.61
+			c-5.31,0-10.62-0.01-15.93,0.01c-0.53,0-1.2-0.05-1.6,0.22c-0.56,0.37-1.24,1.05-1.31,1.55c-0.07,0.5,0.44,1.01,0.88,1.35
+			c0.25,0.2,0.85,0.1,1.3,0.1c10.53,0,21.07,0,31.61,0c0.25,0,0.5,0.01,0.74,0c1.19-0.06,2.16-0.75,2.37-1.67
+			c0.19-0.88-0.39-1.52-1.52-1.54c-3.17-0.03-6.33-0.01-9.5-0.01C373.37,119.61,371.02,119.61,368.68,119.61z"/>
+		<polygon id="XMLID_00000093146156082331567190000000583284178936127107_" class="st1" points="215.57,127.11 270.56,127.11 
+			268.22,133.7 213.23,133.69 		"/>
+		<polygon id="XMLID_00000044145819168257151990000008128597161069231515_" class="st1" points="302.48,127.11 350.4,127.11 
+			348.06,133.7 300.14,133.69 		"/>
+		<path id="XMLID_00000180365512816012061660000002459407464689100947_" class="st0" d="M193.37,141.57
+			c-0.66-0.22-1.37-0.38-1.98-0.67c-3.31-1.57-4.31-5.57-2.37-9.43c1.99-3.98,6.3-6.75,10.14-6.53c4.17,0.24,6.61,3.24,6,7.36
+			c-0.63,4.31-4.68,8.33-9.16,9.12c-0.16,0.03-0.33,0.1-0.49,0.15C194.79,141.57,194.09,141.57,193.37,141.57z M197.78,129.12
+			c-2.3,0.01-4.66,1.84-5.25,4.09c-0.62,2.31,0.73,4.2,3.01,4.2c2.3,0,4.68-1.88,5.27-4.18
+			C201.39,130.91,200.07,129.11,197.78,129.12z"/>
+		<path id="XMLID_00000140716724942046175930000000900059156748826041_" class="st0" d="M281.5,141.57
+			c-0.67-0.22-1.36-0.38-1.97-0.67c-3.31-1.57-4.31-5.57-2.37-9.43c2-3.98,6.3-6.75,10.14-6.53c4.16,0.24,6.61,3.24,6,7.36
+			c-0.64,4.31-4.69,8.33-9.16,9.12c-0.16,0.03-0.33,0.1-0.49,0.15C282.92,141.57,282.21,141.57,281.5,141.57z M285.9,129.12
+			c-2.3,0.01-4.65,1.84-5.25,4.09c-0.62,2.31,0.73,4.2,3.01,4.2c2.3,0,4.67-1.88,5.27-4.18
+			C289.52,130.91,288.19,129.11,285.9,129.12z"/>
+		<path id="XMLID_00000037651357784468350430000012874001864553225095_" class="st0" d="M372.89,102.38c4.12,0,8.24,0,12.36-0.01
+			c0.32,0,0.64-0.01,0.97-0.07c0.71-0.14,1.24-0.7,1.47-1.55c0.23-0.86,0.01-1.42-0.63-1.56c-0.29-0.07-0.62-0.08-0.93-0.08
+			c-8.29,0-16.59,0-24.88,0c-0.12,0-0.23,0-0.35,0c-1.08,0.05-1.8,0.63-2.06,1.69c-0.24,1,0.14,1.58,1.18,1.58
+			C364.31,102.38,368.6,102.38,372.89,102.38z"/>
+		<path id="XMLID_00000091013039996830199620000008275939798746763455_" class="st0" d="M387.77,68.2c3.82,0,7.64,0.01,11.46-0.01
+			c0.34,0,0.76,0.07,1.06-0.19c0.43-0.38,0.99-1.04,1.1-1.55c0.11-0.5-0.2-1.04-0.45-1.39c-0.15-0.21-0.54-0.12-0.83-0.12
+			c-7.61,0-15.23,0-22.85,0c-1.28,0-1.95,0.51-2.24,1.67c-0.27,1.11,0.14,1.58,1.37,1.58C380.18,68.2,383.98,68.2,387.77,68.2z"/>
+		<path id="XMLID_00000054224960888330107960000006299945070404939196_" class="st0" d="M387.13,80.8c-5.32,0-10.64,0-15.96,0
+			c-0.38,0.01-0.76,0.01-1.14,0.04c-0.95,0.08-1.66,0.62-1.94,1.52c-0.3,0.97,0.14,1.53,1.05,1.68c0.31,0.05,0.67,0.03,1.01,0.03
+			c10.75,0,21.51,0,32.27,0c0.19,0,0.38,0.01,0.57,0c1.22-0.06,2.1-0.66,2.37-1.63c0.27-0.97-0.25-1.62-1.46-1.63
+			c-3.13-0.03-6.27-0.01-9.4-0.01C392.04,80.8,389.59,80.8,387.13,80.8z"/>
+		<path id="XMLID_00000160900928355896556190000017681905224845258884_" class="st1" d="M116.76,88.44l4.96-13.96h-8.61l17.29-22.72
+			h19.57l-8.44,11.01h3.48l-9.12,25.67H116.76z M102.78,117.74h14.26l-17.86,9.62H94.4l-2.19,6.15l25.4,0l19.39-10.49l11.84,10.49
+			h31.58l2.19-6.16h-10.97l-11.01-9.62h14.35l9.62-27.05H112.4L102.78,117.74z M135.14,99.62l-3.7,10.4l-8.06,4.34l6.1-17.17l33.4,0
+			l-6.11,17.17l-4.98-4.34l3.7-10.4L135.14,99.62z M164.33,51.75l-6.07,17.08l-13.48,2.69l-2.34,6.59l13.48-2.68l-4.62,13.01h39.14
+			l2.34-6.59h-18.61l3.89-10.93l20.15-4.07l2.34-6.59l-20.15,4.08l4.47-12.58H164.33z"/>
+		<polygon id="XMLID_00000020368313016471440660000006079182077116345754_" class="st1" points="238.69,62.07 252,62.07 
+			255.45,52.36 276.85,52.36 273.39,62.07 286.61,62.07 284.27,68.66 236.35,68.66 		"/>
+		<polygon id="XMLID_00000032640222204412491080000010081856263758519936_" class="st1" points="252.66,74.39 238.21,122.85 
+			221.43,122.85 235.79,74.39 		"/>
+		<polygon id="XMLID_00000088826360638897065270000006817045567586200979_" class="st1" points="280.76,74.39 260.66,122.85 
+			243.87,122.85 263.89,74.39 		"/>
+		<polygon id="XMLID_00000181787296566684400510000010895106936971445695_" class="st1" points="325.6,62.07 338.91,62.07 
+			342.36,52.36 363.76,52.36 360.3,62.07 373.52,62.07 371.18,68.66 323.26,68.66 		"/>
+		<polygon id="XMLID_00000117651975536130126820000003932797446573212289_" class="st1" points="339.57,74.39 325.13,122.85 
+			308.34,122.85 322.7,74.39 		"/>
+		<polyline id="XMLID_00000052803916734376323210000003597828216140554626_" class="st1" points="347.56,122.85 330.78,122.85 
+			350.79,74.39 367.66,74.39 347.56,122.85 		"/>
+		<path id="XMLID_00000031925879865044634170000001011659252927894416_" class="st1" d="M318.19,74.04l2.38-6.67h-5.92l5.74-16.12
+			h-19.48l-5.73,16.12h-5.65l-2.38,6.67h5.66l-10.08,28.36l-6.05,1.12l-2.37,6.68l6.08-1.21l-5.55,15.61
+			c-0.49,1.39-2.37,2.52-4.11,2.52h-1.83l-2.34,6.59l8.18-0.11c0.2-0.82,0.5-1.65,0.91-2.48c2.39-4.77,7.56-8.1,12.17-7.84
+			c2.6,0.15,4.64,1.21,5.9,2.88c0.12-0.26,0.24-0.51,0.33-0.78l7.28-20.46l6.38-1.3l2.34-6.59l-6.38,1.3l8.63-24.28H318.19z"/>
+		<path id="XMLID_00000063594458554206983060000000737241602470939807_" class="st1" d="M231.37,74.04l2.38-6.67h-5.92l5.73-16.12
+			h-19.48l-5.74,16.12h-5.65l-5.81,6.67h9.09l-10.08,28.36l-6.05,1.12l-2.37,6.68l6.09-1.21L188,124.59
+			c-0.49,1.39-2.38,2.52-4.11,2.52l-1.92,0.26l-2.19,6.16l6.83,0c0.19-0.8,0.48-1.6,0.88-2.41c2.4-4.77,7.56-8.1,12.17-7.84
+			c3.14,0.18,5.46,1.67,6.58,3.98c0.4-0.6,0.73-1.23,0.95-1.88l7.28-20.46l6.37-1.3l2.35-6.59l-6.38,1.3l8.63-24.28H231.37z"/>
+	</g>
+</g>
+</svg>

hdApp/src/pagesPurchase/purDetails.vue

@@ -117,6 +117,10 @@
           </block>
           <view v-else>{{ 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.sendType==2">
+          <view>配送进度：</view>
+          <view>{{ getSendStatusText(detailInfo.sendStatus) }}</view>
+        </view>
 
         <view v-if="detailInfo.refundLog && detailInfo.refundLog == 1" class="order-info_box">
           <view>累计退款：</view>
@@ -367,7 +371,24 @@ export default {
       //登录状态 0未登录 1登录仅用到了采购 2登录用到完整功能
       loginStyle :0,
       afterSale:1,
-      trackList:[]
+      trackList:[],
+      // 配送状态映射
+			sendStatusMap: {
+				'-4': { text: '未叫跑腿', color: '#999' },
+				'-2': { text: '异常', color: '#ff2842' },
+				'-1': { text: '已取消', color: '#ff2842' },
+				'0': { text: '订单生成', color: '#3385ff' },
+				'1': { text: '系统已接单', color: '#3385ff' },
+				'2': { text: '派单中', color: '#07c160' },
+				'3': { text: '待取货', color: '#3385ff' },
+				'4': { text: '配送中', color: '#07c160' },
+				'5': { text: '已送达', color: '#07c160' },
+				'10': { text: '改派中', color: '#ff8c42' },
+				'20': { text: '已分配骑手', color: '#3385ff' },
+				'30': { text: '骑手已到店', color: '#3385ff' },
+				'40': { text: '申请取消中', color: '#ff2842' },
+				'50': { text: '客服介入处理中', color: '#ff2842' }
+			}
     };
   },
   onShareAppMessage(res) {
@@ -583,7 +604,13 @@ export default {
       purchaseDebtPay({ orderSn: this.detailInfo.orderSn }).then(res => {
         console.log(res)
       }).catch(err => { console.log(err) })
-    }
+    },
+    //获取配送状态文本
+		getSendStatusText(status) {
+			const statusStr = String(status);
+			const statusInfo = this.sendStatusMap[statusStr];
+			return statusInfo ? statusInfo.text : '未知状态';
+		},
   }
 };
 </script>