优化

hdApp/src/admin/billing/affirmGhs.vue

@@ -64,6 +64,7 @@
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+
 						<view v-if="form.sendType == 0">
 							<block v-if="ghsInfo.shopId == 4804">
 								<text style="color:red;width:100%;font-weight:bold;">市区满500元免费送货上门，其它情况请选自取、跑腿或物流</text>
@@ -117,21 +118,22 @@
 					<text style="color: #3385FF">¥{{ form.sendCost }}</text>
 					</tui-list-cell>
 
-<block v-if="$util.isEmpty(wlList)">
-<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 3">
-	<view class="tui-title">配送物流</view>
-	<input type="text" placeholder="请填选物流" v-model="form.wlName" @focus="form.wlName=''" placeholder-class="tui-placeholder"/>
-</tui-list-cell>
-</block>
-<block v-else>
-<tui-list-cell class="line-cell" :arrow="true" v-if="form.sendType == 3">
-	<div class="tui-title">配送物流</div>
-	<picker mode="selector" :value="form.wlId" :range="wlList" range-key="name" @change="changeWlFn" class="tui-input" >
-		<div v-if="form.wlId">{{ wlSelData.name }}</div>
-		<div class="tui-placeholder" v-else>请选择</div>
-	</picker>
-</tui-list-cell>
-</block>
+					<block v-if="$util.isEmpty(wlList)">
+						<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 3">
+							<view class="tui-title">配送物流</view>
+							<input type="text" placeholder="请填选物流" v-model="form.wlName" @focus="form.wlName=''" placeholder-class="tui-placeholder"/>
+						</tui-list-cell>
+						</block>
+						<block v-else>
+						<tui-list-cell class="line-cell" :arrow="true" v-if="form.sendType == 3">
+							<div class="tui-title">配送物流</div>
+							<picker mode="selector" :value="form.wlId" :range="wlList" range-key="name" @change="changeWlFn" class="tui-input" >
+								<div v-if="form.wlId">{{ wlSelData.name }}</div>
+								<div class="tui-placeholder" v-else>请选择</div>
+							</picker>
+						</tui-list-cell>
+					</block>
+
 					<tui-list-cell class="line-cell" :hover="false" v-if="needAddPackCost == true">
 					<view class="tui-title">包装费</view>
 					<text style="color: #3385FF">¥{{ form.packCost }}</text>

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -26,7 +26,7 @@
 				<app-search-module v-model="py" placeholder="拼音首字母也可以搜索" @input="searchFn" />
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" v-if="ghsInfo.presell && ghsInfo.presell == 1" style="background-color:green;border:1upx solid green;" @click="aheadCg(ghsInfo)">提前订花</button>
+				<button class="admin-button-com middle blue" v-if="ghsInfo.presell && ghsInfo.presell == 1" style="background-color:green;border:1upx solid green;" @click="aheadCg(ghsInfo)">预订花材</button>
 				<button class="admin-button-com middle blue" @click="delMemory()" v-else>清空已选</button>
 			</view>
 		</view>