开单流程优化

hdApp/src/admin/billing/affirm.vue

@@ -149,17 +149,17 @@
             </picker>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 2">
+            <view class="tui-title">运费</view>
+            <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">打印小票</view>
             <button @tap="form.needPrint = 2" class="admin-button-com middle" style="width:140upx;" :class="form.needPrint == 2? 'blue' : 'default'">不打印</button>
             <button @click="form.needPrint = 1" class="admin-button-com middle" style="width:140upx;" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 2">
-            <view class="tui-title">运费</view>
-            <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
-          </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view class="tui-title">
               <text>合计金额</text>  
@@ -179,7 +179,8 @@
           </tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title">配送日期</view>
+            <view class="tui-title" v-if="form.sendType == 1">取花日期</view>
+						<view class="tui-title" v-else>配送日期</view>
 						<picker mode="date" :value="form.reachDate" @change="bindDateChange" style="width:400upx;">
 							<view class="uni-input" v-if="form.reachDate==''" style="color:#CCCCCC;">请选择，默认当天</view>
 							<view class="uni-input">{{form.reachDate}}</view>
@@ -187,7 +188,8 @@
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title">配送时间</view>
+            <view class="tui-title" v-if="form.sendType == 1">取花时间</view>
+						<view class="tui-title" v-else>配送时间</view>
 						<picker mode="multiSelector" :range="timeOptions" @change="bindTimeChange">
 							<view class="uni-input" style="width:450upx;">{{form.reachPeriod}}<text style="margin-left:10upx;">前</text></view>
 						</picker>

hdApp/src/admin/goods/result.vue

@@ -16,12 +16,12 @@
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :hover="false">
-							<view class="tui-title required">数量</view>
+							<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 required">单价</view>
+							<view class="tui-title">单价</view>
 							<input type="digit" @focus="goodsPrice=''" style="width:260upx;" v-model="goodsPrice" placeholder-class="tui-placeholder" placeholder="填写金额" />
 							<text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
 						</tui-list-cell>
@@ -51,8 +51,8 @@
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-							<view class="tui-title required" v-if="form.sendType == 1">取花日期</view>
-							<view class="tui-title required" v-else>配送日期</view>
+							<view class="tui-title" v-if="form.sendType == 1">取花日期</view>
+							<view class="tui-title" v-else>配送日期</view>
 							<picker mode="date" :value="form.reachDate" @change="selTimeFn" class="tui-input">
 								<view v-if="form.reachDate">{{ form.reachDate }}</view>
 								<view v-else>今天</view>
@@ -60,8 +60,8 @@
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-							<view class="tui-title required" v-if="form.sendType == 1">取花时间</view>
-							<view class="tui-title required" v-else>配送时间</view>
+							<view class="tui-title" v-if="form.sendType == 1">取花时间</view>
+							<view class="tui-title" v-else>配送时间</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>