shish 11 месяцев назад
Родитель
Сommit
3ae46f6278

+ 22 - 40
hdApp/src/components/app-delivery-modify.vue → hdApp/src/admin/order/components/app-delivery-modify.vue

@@ -3,19 +3,6 @@
 
     <view class="module-com">
 
-      <tui-list-cell class="line-cell" :hover="false">
-        <view class="tui-title">订花人姓名</view>
-        <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc;" style="width:285upx;" class="tui-input" name="bookName" placeholder="请填写姓名" />
-
-        <button class="admin-button-com default mini-btn" @click="changeFillMobile">填手机号</button>
-
-      </tui-list-cell>
-
-      <tui-list-cell class="line-cell" :hover="false" v-if="fillMobile==1">
-        <view class="tui-title">订花人手机号</view>
-        <input v-model="form.bookMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="bookMobile" placeholder="请填写手机号" />
-      </tui-list-cell>
-
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">配送方式</view>
         <button @tap="form.sendType = 3" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'">骑手送</button>
@@ -44,19 +31,18 @@
 
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">贺卡内容</view>
-        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="cardInfo" placeholder="选填" />
+        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="cardInfo" placeholder="选填" />
       </tui-list-cell>
 
       <template v-if="form.sendType != 1">
 
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">收花人姓名</view>
           <input v-model="form.receiveUserName" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="receiveUserName" placeholder="请填写姓名" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">收花人手机</view>
+          <view class="tui-title">收花人手机</view>
           <input v-model="form.receiveMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="receiveMobile" placeholder="请填写手机号" />
         </tui-list-cell>
 
@@ -65,10 +51,6 @@
           <view class="tui-input" v-if="form.province || form.city" >{{ form.province + '-' + form.city }}</view> <view class="tui-placeholder" v-else>请选择</view>
         </tui-list-cell>
 
-        <!-- <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">详细地址</view>
-          <input v-model="form.address" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="address" placeholder="请填写地址" @input="changeAddress()" />
-        </tui-list-cell> -->
         <tui-list-cell v-if="hasMap == 0" class="line-cell" :hover="false">
 					<view class="tui-title">详细地址</view>
 					<input v-model="form.address" placeholder-class="phcolor" class="tui-input" name="address" @input="changeAddress" placeholder="请填写详细地址" />
@@ -85,23 +67,33 @@
           <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号(选填)" @input="changeFloor()" />
         </tui-list-cell>
 
-      </template>
+        <template v-if="form.sendType != 1">
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="none-name-delivery flex-center" style="padding-left:0upx;">
+              <view class="tui-title">匿名派送</view>
+              <checkbox-group @change="anonymityChange" style="padding-left:70upx;">
+              <checkbox class="ljd-checkbox" value="1" :checked="form.anonymity == 1" style="transform:scale(0.6,0.6)" id="noneNameText" ></checkbox>
+              <label for="noneNameText" class="none-name-text">需要</label>
+              </checkbox-group>
+            </view>
+          </tui-list-cell>
+        </template>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">订花人姓名</view>
+          <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc;" style="width:285upx;" class="tui-input" name="bookName" placeholder="请填写姓名" />
+        </tui-list-cell>
 
-      <template v-if="form.sendType != 1">
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="none-name-delivery flex-center" style="padding-left:0upx;">
-            <view class="tui-title">匿名派送</view>
-            <checkbox-group @change="anonymityChange" style="padding-left:70upx;">
-            <checkbox class="ljd-checkbox" value="1" :checked="form.anonymity == 1" style="transform:scale(0.6,0.6)" id="noneNameText" ></checkbox>
-            <label for="noneNameText" class="none-name-text">需要</label>
-            </checkbox-group>
-          </view>
+          <view class="tui-title">订花人手机</view>
+          <input v-model="form.bookMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="bookMobile" placeholder="请填写手机号" />
         </tui-list-cell>
+
       </template>
 
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">备注</view>
-        <input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder-style="color:#ccc" name="remark" placeholder="选填" />
+        <input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder-style="color:#ccc" name="remark" placeholder="选填,不要贺卡这里备注" />
       </tui-list-cell>
 
     </view>
@@ -142,7 +134,6 @@ export default {
   },
   data() {
     return {
-      fillMobile:0,
       region: [],
       showRegion: false,
       form: {
@@ -196,13 +187,7 @@ export default {
 			handler: function(newVal) {
         if(!this.$util.isEmpty(newVal)){
           this.form.bookName = newVal.bookName
-          if(!this.$util.isEmpty(newVal.bookMobile)){
-            this.fillMobile = 1
-          }else{
-            this.fillMobile = 0
-          }
           this.form.bookMobile = newVal.bookMobile
-          this.form.sendType = newVal.sendType
           if(!this.$util.isEmpty(newVal.reachDate)){
             this.form.reachDate = newVal.reachDate
           }
@@ -236,9 +221,6 @@ export default {
     changeFloor(){
       this.form.showAddress = this.form.city+this.form.address+this.form.floor
     },
-    changeFillMobile(){
-      this.fillMobile = this.fillMobile == 0 ? 1 : 0
-    },
     bindTimeChange(event){
       let val = event.detail.value
       let before = Number(val[0])

+ 1 - 1
hdApp/src/admin/order/modify.vue

@@ -16,7 +16,7 @@
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
 import productMins from "@/mixins/cgPlantProduct";
-import AppDeliveryModule from "@/components/app-delivery-modify";
+import AppDeliveryModule from "./components/app-delivery-modify";
 import { updateOrder } from "@/api/order";
 import { mapGetters } from "vuex";
 import { getDetB} from "@/api/order";