shish 10 ay önce
ebeveyn
işleme
9d17bca5b2

+ 15 - 5
hdApp/src/admin/billing/affirmGhs.vue

@@ -223,8 +223,13 @@
 						</view>
 					</tui-list-cell>
 
+					<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true && Number(showDistance)>0">
+					<view class="tui-title">距离</view>
+					<text style="color: #3385FF">{{ showDistance }}公里</text>
+					</tui-list-cell>
+
 					<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true">
-					<view class="tui-title">运费</view>
+					<view class="tui-title">跑腿费</view>
 					<text style="color: #3385FF">¥{{ form.sendCost }}</text>
 					</tui-list-cell>
 
@@ -367,7 +372,8 @@ export default {
 			wlSelData: {id:0,name:''},
 			needAddPackCost:false,
 			transCost:[],
-			lackList:[]
+			lackList:[],
+			showDistance:0
 		};
 	},
 	onLoad() {
@@ -399,8 +405,12 @@ export default {
 			return false
 		},
 		displaySendCost(){
-			if(this.form.sendType == 2 && this.ghsInfo.openIntraCity==0){
-				return false
+			if(this.form.sendType == 2){
+				if(this.ghsInfo.openIntraCity==0){
+					return false
+				}else{
+					return true
+				}
 			}
 			if(this.ghsInfo.pfLevel && this.ghsInfo.pfLevel == 1){
 				return true
@@ -639,6 +649,7 @@ export default {
 			freight(params).then(res => {
 				if(res.code == 1){
 					this.form.sendCost = res.data.fee?parseFloat(res.data.fee):0
+					this.showDistance = res.data.showDistance?parseFloat(res.data.showDistance):0
 				}
 			});
 		},
@@ -769,7 +780,6 @@ export default {
 			let params = {
 				getType:getType,
 				sendTimeWant:this.sendTimeWant,
-				sendCost:this.form.sendCost,
 				sendType:this.form.sendType,
 				transType:this.form.transType,
 				remark:this.remark,

+ 1 - 1
hdApp/src/pagesPurchase/purDetails.vue

@@ -76,7 +76,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">