Merge branch 'master' into after-sale

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

@@ -44,11 +44,11 @@
                 : item.sendType == 1
                 ? '到店自取'
                 : item.sendType == 2
-                ? '跑腿送货'
+                ? '跑腿'
                 : item.sendType == 3
                 ? item.wlName
                 : item.sendType == 4
-                ? '发快递'
+                ? '快递'
                 : ''
             }}</text>
             <text v-else>{{

ghsApp/src/pagesOrder/detail.vue

@@ -123,7 +123,7 @@
 				<view class="order-info_box">
 					<view>配送方式：</view>
 					<view>
-{{ detailInfo.sendType==0?'送货上门':detailInfo.sendType==1?'自取':detailInfo.sendType==2?'快递':detailInfo.sendType==3?'物流':detailInfo.sendType==4?'发快递':'' }}
+{{ detailInfo.sendType==0?'送货上门':detailInfo.sendType==1?'自取':detailInfo.sendType==2?'跑腿':detailInfo.sendType==3?'物流':detailInfo.sendType==4?'快递':'' }}
 					</view>
 				</view>
 				<view class="order-info_box" v-if="detailInfo.sendType==3">