admin/billing/affirmGhs 页面优化

hdApp/src/admin/billing/affirmGhs.vue

@@ -138,7 +138,7 @@
 							<button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(3)" v-if="ghsInfo.shopId != 14248">物流</button>
 						</tui-list-cell>
 
-						<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+						<tui-list-cell v-if="form.sendType != 2" class="line-cell" :hover="false" :arrow="false">
 
 							<view v-if="form.sendType == 0">
 								<block v-if="ghsInfo.shopId == 40312">
@@ -174,10 +174,6 @@
 							<view v-if="form.sendType == 1">
 								<text style="color: #3385FF;width:100%;">到店自取，没有配送费</text>
 							</view>
-							<view v-if="form.sendType == 2">
-								<text v-if="ghsInfo.openIntraCity == 0" style="color: #3385FF;width:100%;font-size:34upx;font-weight:bold;">运费自理或到付（请联系客服）</text>
-								<text v-if="ghsInfo.openIntraCity == 2" style="color: red;width:100%;font-size:34upx;font-weight:bold;">跑腿配送暂不可用，请选其它方式</text>
-							</view>
 							<view v-if="form.sendType == 3">
 								<text style="color: #3385FF;width:100%;">运费到付</text>
 							</view>
@@ -186,13 +182,13 @@
 							</view>
 						</tui-list-cell>
 
-							<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="needAddPackCost == true">
-								<view>
-									<text style="color: red;width:100%;">
-									当天订单不满{{lackExpend}}元，加纸箱包装费{{ form.packCost }}元
-									</text>
-								</view>
-							</tui-list-cell>
+						<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="needAddPackCost == true">
+							<view>
+								<text style="color: red;width:100%;">
+								当天订单不满{{lackExpend}}元，加纸箱包装费{{ form.packCost }}元
+								</text>
+							</view>
+						</tui-list-cell>
 
 						<block v-if="$util.isEmpty(wlList)">
 							<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 3">
@@ -211,6 +207,12 @@
 						</block>
 					</block>
 
+					<tui-list-cell v-if="form.sendType == 2 && ghsInfo.openIntraCity != 1" class="line-cell" :hover="false" :arrow="false">
+						<view>
+							<text v-if="ghsInfo.openIntraCity == 0" style="color: #3385FF;width:100%;font-size:30upx;font-weight:bold;">运费自理或到付（请联系客服）</text>
+							<text v-if="ghsInfo.openIntraCity == 2" style="color: red;width:100%;font-size:30upx;font-weight:bold;">跑腿配送暂不可用，请选其它方式</text>
+						</view>
+					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="displayAddress == true" @click="modifyAddress">
 						<view class="tui-title">收花地址</view>
 						<view v-if="!$util.isEmpty(shopInfo.address)">
@@ -222,31 +224,29 @@
 						</view>
 					</tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view v-if="form.sendType == 2">
-							<!-- 跑腿平台报价列表 -->
-							<view v-if="ghsInfo.openIntraCity == 1 && deliveryQuotes.length > 0" class="delivery-quotes-container">
-								<view class="delivery-quotes-grid">
-									<view 
-										v-for="(item, index) in deliveryQuotes" 
-										:key="index"
-										class="delivery-quote-item"
-										:class="{ 
-											'active': selectedDeliveryIndex === index, 
-											'disabled': !item.isAble,
-											'fixed-width': deliveryQuotes.length <= 2
-										}"
-										@click="selectDelivery(item, index)"
-									>
-										<view class="platform-name">{{ item.displayName || item.name }}</view>
-										<view class="platform-price">{{ item.priceText }}元</view>
-										<view v-if="item.type" class="platform-type">{{ item.type }}</view>
-									</view>
+					<tui-list-cell v-if="form.sendType == 2 && ghsInfo.openIntraCity == 1" class="line-cell" :hover="false" :arrow="false">
+						<!-- 跑腿平台报价列表 -->
+						<view v-if="ghsInfo.openIntraCity == 1 && deliveryQuotes.length > 0" class="delivery-quotes-container">
+							<view class="delivery-quotes-grid">
+								<view 
+									v-for="(item, index) in deliveryQuotes" 
+									:key="index"
+									class="delivery-quote-item"
+									:class="{ 
+										'active': selectedDeliveryIndex === index, 
+										'disabled': !item.isAble,
+										'fixed-width': deliveryQuotes.length <= 2
+									}"
+									@click="selectDelivery(item, index)"
+								>
+									<view class="platform-name">{{ item.displayName || item.name }}</view>
+									<view class="platform-price">{{ item.priceText }}元</view>
+									<view v-if="item.type" class="platform-type">{{ item.type }}</view>
 								</view>
 							</view>
-							<view v-else style="text-align: center; padding: 20upx 0;">
-								<text v-if="validAddress">正在获取运费...</text><text v-else style="color:red;font-weight:bold;font-size:32upx;">上面地址缺失或有问题，请修改</text>
-							</view>
+						</view>
+						<view v-else style="text-align: center; padding: 20upx 0;">
+							<text v-if="validAddress">正在获取运费...</text><text v-else style="color:red;font-weight:bold;font-size:32upx;">上面地址缺失或有问题，请修改</text>
 						</view>
 					</tui-list-cell>
 
@@ -314,7 +314,7 @@
 
 		<uni-popup ref="deliveryPolicyPopup" type="center" background-color="#fff">
 			<view class="policy-popup-content">
-				<view class="policy-title">包配送政策</view>
+				<view class="policy-title">免费配送条件</view>
 				<scroll-view scroll-y="true" class="policy-scroll">
 					<view class="policy-list">
 						<block v-for="(item, index) in deliveryPolicyList" :key="index">
@@ -1536,7 +1536,7 @@ export default {
 .delivery-policy-link {
 	color: rgb(201, 52, 52);
 	font-size: 28upx;
-	margin-left: 5upx;
+	margin-left: 12upx;
 	text-decoration: underline;
 }