地址

mallApp/src/pages/billing/affirmGhs.vue

@@ -69,38 +69,52 @@
 							</text>
 							<text v-else style="color: #3385FF;width:100%;">到店取货，没有配送费</text>
 						</view>
-						<view v-if="form.sendType == 2">
-							<view v-if="form.openIntraCity == 0">
-								<text style="color: #3385FF;width:100%;font-size:32upx;font-weight:bold;">运费自理或到付（请联系客服）</text>
-							</view>
-							<view v-if="form.openIntraCity == 2">
-								<text style="color: red;width:100%;font-size:32upx;font-weight:bold;">跑腿配送暂不可用，请选其它方式</text>
-							</view>
-							<!-- 跑腿平台报价列表 -->
-							<view v-if="form.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>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 2 || form.sendType == 0" @click="modifyAddress">
+						<view class="tui-title">收花地址</view>
+						<view v-if="!$util.isEmpty(userInfo.lat) && !$util.isEmpty(userInfo.long)">
+							<view><text>{{userInfo.address}}</text></view>
+							<view v-if="userInfo.showAddress!=userInfo.fullAddress" style="color:#848181;"><text>{{userInfo.showAddress}}</text></view>
+						</view>
+						<view v-else>
+							<view><text style="color:#CCCCCC;">请填写地址</text></view>
+						</view>
+					</tui-list-cell>
+					<block v-if="form.sendType == 2">
+						<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+							<view>
+								<view v-if="form.openIntraCity == 0">
+									<text style="color: #3385FF;width:100%;font-size:32upx;font-weight:bold;">运费自理或到付（请联系客服）</text>
+								</view>
+								<view v-if="form.openIntraCity == 2">
+									<text style="color: red;width:100%;font-size:32upx;font-weight:bold;">跑腿配送暂不可用，请选其它方式</text>
+								</view>
+								<!-- 跑腿平台报价列表 -->
+								<view v-if="form.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>
+								<view v-else-if="form.openIntraCity == 1 && deliveryQuotesLoading" style="text-align: center; padding: 20upx 0; color: #999;">
+									正在获取报价...
+								</view>
 							</view>
-							<view v-else-if="form.openIntraCity == 1 && deliveryQuotesLoading" style="text-align: center; padding: 20upx 0; color: #999;">
-								正在获取报价...
-							</view>
-						</view>
-					</tui-list-cell>
+						</tui-list-cell>
+					</block>
 					<block v-if="form.openIntraCity == 1">
 						<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true && Number(showDistance)>0">
 							<view class="tui-title">距离</view>
@@ -118,16 +132,6 @@
 							</view>
 						</tui-list-cell>
 					</block>
-					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 2 || form.sendType == 0" @click="modifyAddress">
-						<view class="tui-title">收花地址</view>
-						<view v-if="!$util.isEmpty(userInfo.lat) && !$util.isEmpty(userInfo.long)">
-							<view><text>{{userInfo.address}}</text></view>
-							<view v-if="userInfo.showAddress!=userInfo.fullAddress" style="color:#848181;"><text>{{userInfo.showAddress}}</text></view>
-						</view>
-						<view v-else>
-							<view><text style="color:#CCCCCC;">请填写地址</text></view>
-						</view>
-					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" v-if="(form.sendType == 2 || form.sendType == 0)&& Number(form.packCost)>0">
 					<view class="tui-title">打包费</view>
@@ -1212,8 +1216,9 @@ export default {
 
 .delivery-policy-link {
 	color: rgb(201, 52, 52);
-	font-size: 28upx;
-	margin-left: 26upx;
+	font-size: 32upx;
+	margin-left: 10upx;
+	font-weight:bold;
 	text-decoration: underline;
 }
 

mallApp/src/pages/order/components/app-delivery.vue

@@ -1055,8 +1055,9 @@ export default {
 
 .delivery-policy-link {
 	color: rgb(201, 52, 52);
-	font-size: 28upx;
-	margin-left: 26upx;
+	font-size: 32upx;
+	margin-left:10upx;
+  font-weight:bold;
 	text-decoration: underline;
 }
 

mallApp/src/pages/user/address.vue

@@ -2,22 +2,29 @@
 	<view class="app-content">
 		<form @submit="formSubmit">
 			<view class="module-com input-line-wrap">
+
+				<tui-list-cell class="line-cell" :hover="false" v-if="hasMap == 1">
+					<view class="tui-title">地址类型</view>
+					<button :class="[couldNavigation==1?'blue':'default']" class="admin-button-com middle" @click.stop="setStyle(1)" style="width:180upx;">支持导航</button>
+					<button :class="[couldNavigation==0?'blue':'default']" class="admin-button-com middle" style="width:180upx;margin-left:70upx;" @click.stop="setStyle(0)">不用导航</button>
+				</tui-list-cell>
+
 				<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres">
 					<view class="tui-title">城市</view>
 					<view class="tui-input" v-if="form.province || form.city">{{ form.province + '-' + form.city }}</view>
 					<view class="tui-placeholder" v-else>请选择</view>
 					<input v-model="form.province" name="province" hidden />
 				</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="modifyShow" placeholder="请填写地址" />
-				</tui-list-cell>
-				<tui-list-cell v-else class="line-cell" :hover="false" :arrow="true" @click="selectRegion">
+				<tui-list-cell v-if="couldNavigation == 1" class="line-cell" :hover="false" :arrow="true" @click="selectRegion">
 					<view class="tui-title">地址</view>
 					<view v-if="form.address" class="tui-input">{{ form.address }}</view>
 					<view v-else class="tui-placeholder">请填写地址</view>
 					<input v-model="form.address" name="address" hidden />
 				</tui-list-cell>
+				<tui-list-cell v-else class="line-cell" :hover="false">
+					<view class="tui-title">地址</view>
+					<input v-model="form.address" placeholder-class="phcolor" class="tui-input" name="address" @input="modifyShow" placeholder="请填写地址" />
+				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title ">门牌</view>
 					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" @input="modifyShow" />
@@ -63,7 +70,8 @@ export default {
 			},
 			regionData: [],
 			cityPickerValueDefault: [0, 0],
-			hasMap:0 // 是否具备定位功能 0不具备 1具备
+			hasMap:0,// 是否具备定位功能 0不具备 1具备
+			couldNavigation:1
 		}
 	},
 	onLoad() {
@@ -76,9 +84,12 @@ export default {
 		if(this.option.hdId){
 			uni.setStorageSync('hdId',this.option.hdId)
 		}
-
 	},
 	methods: {
+		setStyle(flag){
+			this.couldNavigation = flag
+			this.form.address = ''
+		},
 		init() {
 			getHasMap().then(res=>{
 				this.hasMap = res.data.hasMap