shish 3 лет назад
Родитель
Сommit
bffb156e55

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -44,7 +44,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?'发快递':'' }}
 					</view>
 				</view>
 				<view class="order-info_box">

+ 17 - 12
hdApp/src/admin/billing/affirmGhs.vue

@@ -56,20 +56,24 @@
 				<view class="module-com input-line-wrap">
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
-						<button class="admin-button-com big" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:230upx;"  @click="form.sendType = 1">自取</button>
-						<button class="admin-button-com big" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:230upx;" @click="form.sendType = 3">快递</button>
+						<button class="admin-button-com big" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:180upx;"  @click="form.sendType = 0">有车到店</button>
+						<button class="admin-button-com big" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:180upx;"  @click="form.sendType = 1">上门自取</button>
+						<button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;" @click="form.sendType = 2">发快递</button>
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view v-if="form.sendType == 1">
-							<text style="color: #3385FF;width:100%;">出车有经过或到店拿货的花店,免运费,请选【自取】</text>
+						<view v-if="form.sendType == 0">
+							<text style="color: #3385FF;width:100%;">本店如有出车经过您的门店,请选此项,免配送费</text>
 						</view>				
-						<view v-else>
-							<text style="color: #3385FF;width:100%;">需要配送费</text>
+						<view v-if="form.sendType == 1">
+							<text style="color: #3385FF;width:100%;">您自己来店里取货,没有配送费</text>
+						</view>
+						<view v-if="form.sendType == 2">
+							<text style="color: #3385FF;width:100%;">请跑腿送货,有配送费</text>
 						</view>
 					</tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 3" @click="modifyAddress">
+					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 2" @click="modifyAddress">
 						<view class="tui-title">收花地址</view>
 						<view v-if="!$util.isEmpty(shopInfo.lat) && !$util.isEmpty(shopInfo.long)">
 							<view><text>{{shopInfo.fullAddress}}</text></view>
@@ -78,12 +82,12 @@
 						<input v-else v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" @focus="form.name=''" placeholder="请完善门店地址" maxlength="50" type="text" />
 					</tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 3 && Number(form.sendCost)>0">
+					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 2 && Number(form.sendCost)>0">
 					<view class="tui-title">运费</view>
 					<text style="color: #3385FF">¥{{ form.sendCost }}</text>
 					</tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 3 && Number(form.packCost)>0">
+					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 2 && Number(form.packCost)>0">
 					<view class="tui-title">打包费</view>
 					<text style="color: #3385FF">¥{{ form.packCost }}</text>
 					</tui-list-cell>
@@ -174,7 +178,7 @@ export default {
 				receiveAddress: "",
 				receiveLong: "",
 				receiveLat: "",
-				sendType: 1,
+				sendType: 0,
 				sendSide: "2",
 				sendDate: "",
 				sendTimeWant: "",
@@ -223,7 +227,7 @@ export default {
 			let allPrice = this.allPrice.toFixed(2)
 			let price = Number(allPrice)
 
-			if(this.form.sendType == 3){
+			if(this.form.sendType == 2){
 				let add = this.form.sendCost + this.form.packCost
 				price = price + add
 			}
@@ -445,8 +449,9 @@ export default {
 				}
 			})
 	
+			let getType = this.form.sendType == 2 ? 1 : 2
 			let params = {
-				getType:this.form.sendType == 1 ? 2 : 1,
+				getType:getType,
 				sendTimeWant:this.sendTimeWant,
 				sendCost:this.form.sendCost,
 				sendType:this.form.sendType,

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

@@ -47,7 +47,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?'发快递':'' }}
           </view>
         </view>
         <view class="order-info_box">