订单

hdApp/src/admin/order/workOrder.vue

@@ -20,27 +20,16 @@
           </picker>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">数量</view>
-          <input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="请填写数量" maxlength="50" type="number" />
-        </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view class="tui-title">单价</view>
-            <input type="digit" @focus="goodsPrice=''" style="width:210upx;" :focus="true" v-model="goodsPrice" placeholder-class="tui-placeholder"/>
-            <text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">来源</view>
-            <button @tap="form.fromType = 3" class="admin-button-com mini-btn" :class="form.fromType == 3 ? 'blue' : 'default'">客服微信</button>
-            <button @tap="form.fromType = 4" class="admin-button-com mini-btn" :class="form.fromType == 4 ? 'blue' : 'default'">美团</button>
+            <input type="digit" @focus="goodsPrice=''" :focus="true" v-model="goodsPrice" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 4">
-            <view class="tui-title">美团编号</view>
-            <input v-model="form.thirdSn" placeholder-class="phcolor" class="tui-input" name="thirdSn" @focus="form.thirdSn=''" placeholder="请填写编号" type="number" />
-          </tui-list-cell>
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">数量</view>
+          <input v-model="form.num" placeholder-class="phcolor" style="width:210upx;" class="tui-input" name="num" @focus="form.num=''" placeholder="请填写数量" maxlength="50" type="number" />
+          <text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
+        </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
             <view class="tui-title">付款方式</view>
@@ -115,8 +104,7 @@ export default {
         name:"花束",
         cover:[],
         num:1,
-        flowerNum:'',
-        thirdSn:''
+        flowerNum:''
       },
       goodsPrice:'',
 			payWayindex:0,

hdApp/src/components/app-delivery.vue

@@ -10,6 +10,28 @@
         <button @tap="form.sendType = 1" class="admin-button-com mini-btn" style="margin-left:30upx;" :class="form.sendType == 1 ? 'blue' : 'default'">到店自取</button>
       </tui-list-cell>
 
+      <template v-if="form.sendType != 1">
+          <tui-list-cell class="line-cell" :hover="false" :arrow="true">
+            <view class="tui-title">配送日期</view>
+            <picker mode="date" :value="form.reachDate" @change="selTimeFn" class="tui-input">
+              <view v-if="form.reachDate">{{ form.reachDate }}</view>
+              <view v-else>今天</view>
+            </picker>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+            <view class="tui-title">配送时间</view>
+            <picker mode="multiSelector" :value="form.reachPeriod" :range="timeOptions" @change="bindTimeChange">
+              <view class="uni-input" style="width:450upx;">{{form.reachPeriod}}<text style="margin-left:10upx;">前</text></view>
+            </picker>
+          </tui-list-cell>
+      </template>
+
+      <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="选填项" />
+      </tui-list-cell>
+
       <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" class="tui-input" name="bookName" placeholder="请填写" />
@@ -22,20 +44,6 @@
 
       <template v-if="form.sendType != 1">
 
-        <tui-list-cell class="line-cell" :hover="false" :arrow="true">
-          <view class="tui-title">配送日期</view>
-          <picker mode="date" :value="form.reachDate" @change="selTimeFn" class="tui-input">
-            <view v-if="form.reachDate">{{ form.reachDate }}</view>
-            <view v-else>今天</view>
-          </picker>
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-          <view class="tui-title">配送时间</view>
-					<picker mode="multiSelector" :value="form.reachPeriod" :range="timeOptions" @change="bindTimeChange">
-						<view class="uni-input" style="width:450upx;">{{form.reachPeriod}}<text style="margin-left:10upx;">前</text></view>
-					</picker>
-        </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">收花人姓名</view>
@@ -65,11 +73,6 @@
 
       </template>
 
-      <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="选填项" />
-      </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;">