shish 3 лет назад
Родитель
Сommit
186e1fdc3e
2 измененных файлов с 9 добавлено и 8 удалено
  1. 8 7
      ghsApp/src/admin/billing/affirm.vue
  2. 1 1
      hdApp/src/pagesPurchase/particulars.vue

+ 8 - 7
ghsApp/src/admin/billing/affirm.vue

@@ -96,13 +96,14 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">配送方式</view>
-            <button @tap="setSendType(2)" class="admin-button-com middle" :class="form.sendType == 2 ? 'blue' : 'default'">自取</button>
-            <button @click="setSendType(1)" class="admin-button-com middle" :class="form.sendType == 1 ? 'blue' : 'default'">配送</button>
+            <button @tap="setSendType(0)" class="admin-button-com middle" :class="form.sendType == 0 ? 'blue' : 'default'">出车</button>
+            <button @tap="setSendType(1)" class="admin-button-com middle" :class="form.sendType == 1 ? 'blue' : 'default'">客户自取</button>
+            <button @click="setSendType(2)" class="admin-button-com middle" :class="form.sendType == 2 ? 'blue' : 'default'">发快递</button>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1" >
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 2" >
             <view class="tui-title">运费</view>
-            <input type="number" placeholder="请填写,留空免运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
+            <input type="number" placeholder="请填写运费,留空免运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -229,7 +230,7 @@ export default {
         receiveAddress: "",
         receiveLong: "",
         receiveLat: "",
-        sendType: 2,
+        sendType: 0,
         sendSide: "2",
         sendDate: "",
         sendTimeWant: "",
@@ -266,8 +267,8 @@ export default {
       uni.setNavigationBarTitle({ title: this.getMerchantInfo.name, })
     }
 
-    //默认自取
-    this.setSendType(2);
+    //默认出车
+    this.setSendType(0)
 
     if(Number(option.customId) > 0){
       this.form.customId = option.customId

+ 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>