配送方式

hdApp/src/admin/billing/affirmGhs.vue

@@ -56,10 +56,11 @@
 				<view class="module-com input-line-wrap">
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
-						<button v-if="ghsInfo.shopId != 4608" class="admin-button-com middle" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:170upx;"  @click="changeSendType(0)">免费送货</button>
-						<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:170upx;"  @click="changeSendType(1)">到店自取</button>
-						<button class="admin-button-com middle" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:170upx;" @click="changeSendType(2)">代叫跑腿</button>
-						<button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:150upx;" @click="changeSendType(3)">物流</button>
+						<button v-if="ghsInfo.shopId != 4608" class="admin-button-com middle" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:30upx;"  @click="changeSendType(0)">送货上门</button>
+						<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;"  @click="changeSendType(1)">自取</button>
+						<button class="admin-button-com middle" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeSendType(2)">跑腿</button>
+						<button class="admin-button-com middle" :class="[form.sendType == 4 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeSendType(4)">快递</button>
+						<button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeSendType(3)">物流</button>
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -87,6 +88,9 @@
 						<view v-if="form.sendType == 3">
 							<text style="color: #3385FF;width:100%;">发物流，默认到付</text>
 						</view>
+						<view v-if="form.sendType == 4">
+							<text style="color: #3385FF;width:100%;">到付或运费另付</text>
+						</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="needAddPackCost == true">
 						<view>
@@ -280,7 +284,7 @@ export default {
 				price = price + this.form.sendCost
 			}
 			this.needAddPackCost = false
-			if(this.form.sendType == 2 || this.form.sendType == 0 || this.form.sendType == 3){
+			if(this.form.sendType == 4){
 				//设置了订单金额低200需要付包装费，当前只付一次
 				if(Number(this.lackExpend) > 0 && allPrice < Number(this.lackExpend)){
 					price = price + this.form.packCost

hdApp/src/pagesPurchase/purDetails.vue

@@ -21,7 +21,7 @@
           <view>发货状态：</view>
           <view style="color:green;font-weight:bold;font-size:30upx;">商家已发货</view>
         </view>
-        <view class="order-info_box">
+        <view class="order-info_box" v-if="detailInfo.fhType == 1">
           <view>物流单号：</view>
 					<view>{{ detailInfo.fhWl }} {{detailInfo.fhWlNo}}</view>
 					<view class="price">
@@ -65,7 +65,7 @@
         <view class="order-info_box">
           <view>配送方式：</view>
           <view>
-{{ detailInfo.sendType==0?'出车':detailInfo.sendType==1?'自取':detailInfo.sendType==2?'发快递':detailInfo.sendType==3?'物流':'' }}
+{{ 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">