shish 3 лет назад
Родитель
Сommit
1976538580
2 измененных файлов с 5 добавлено и 4 удалено
  1. 4 3
      hdApp/src/admin/billing/affirmGhs.vue
  2. 1 1
      hdApp/src/pagesPurchase/particulars.vue

+ 4 - 3
hdApp/src/admin/billing/affirmGhs.vue

@@ -57,7 +57,7 @@
 
 					<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 == 3 ? 'blue' : 'default']" style="width:230upx;" @click="form.sendType = 3">快递</button>
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -65,7 +65,7 @@
 							<text style="color: #3385FF;width:100%;">出车有经过或到店拿货的花店,免运费,请选【自取】</text>
 						</view>				
 						<view v-else>
-							<text style="width:100%;color:#CCCCCC;">需要配送费</text>
+							<text style="color: #3385FF;width:100%;">需要配送费</text>
 						</view>
 					</tui-list-cell>
 
@@ -224,7 +224,8 @@ export default {
 			let price = Number(allPrice)
 
 			if(this.form.sendType == 3){
-				price = price + this.form.sendCost
+				let add = this.form.sendCost + this.form.packCost
+				price = price + add
 			}
 
 			price = parseFloat(price)

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

@@ -11,7 +11,7 @@
         <button v-else class="admin-button-com big" style="margin-top:20upx;" @click="goBack">返回</button>
 
         <view style="margin-top:20upx;">
-          <view style="font-size:28upx;">微信下拉,最近使用小程序,找到绿色【花掌柜】,点击即可再次下单</view>
+          <view style="font-size:28upx;">微信下拉,最近使用小程序,搜索绿色【花掌柜】,即可再次买花</view>
           <view style="margin-bottom:30upx;margin-top:15upx;">
             <image class="image" :src="`${constant.imgUrl}/cg/hd_cg_route.png`" mode="widthFix"></image>
           </view>