运费计算优化

hdApp/src/admin/order/detail.vue

@@ -90,6 +90,11 @@
               <view class="value remark-box">{{orderInfo.remark}}</view>
             </view>
 
+            <view class="msg-list">
+              <view class="label">取货号码：</view>
+              <view class="value">{{ orderInfo.sendNum }}</view>
+            </view>
+
             <!-- 收花人信息 -->
             <view class="msg-list">
               <view class="label">收花姓名：</view>
@@ -157,11 +162,6 @@
               </view>
             </view>
 
-            <view class="msg-list">
-              <view class="label">取货号码：</view>
-              <view class="value"><text class="tag tag--primary">{{ orderInfo.sendNum }}</text></view>
-            </view>
-
           </view>
         </view>
       </view>
@@ -329,11 +329,6 @@
               </view>
             </view>
 
-            <view class="msg-list">
-              <view class="label">配送编号：</view>
-              <view class="value">{{ orderInfo.sendNum || '' }}</view>
-            </view>
-
             <view class="msg-list">
               <view class="label">订单编号：</view>
               <view class="value">{{ orderInfo.orderSn || '' }}</view>

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

@@ -4,18 +4,7 @@
 
       <div class="module-com">
 
-
-        <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="openIntraCity == 2">
-          <view class="delivery-unavailable-notice">
-          <view class="notice-icon">
-            <text class="icon-text">!</text>
-          </view>
-          <view class="notice-content">
-            <view class="notice-title">跑腿配送暂不可用</view>
-            <view class="notice-desc">请选择其他配送方式下单</view>
-          </view>
-          </view>
-        </tui-list-cell>
+        <view v-if="openIntraCity == 2" style="color:red;font-size:38upx;font-weight:bold;padding:30upx 0 10upx 0;margin:0 0 0 30upx;">跑腿配暂不可用，请选其它配送方式</view>
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">收花人姓名</div>
@@ -43,6 +32,50 @@
           <div class="tui-title">门牌号</div>
           <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" @input="modifyShow" />
         </tui-list-cell>
+
+        <block v-if="openIntraCity == 1">
+
+          <!-- 跑腿平台报价列表 -->
+          <tui-list-cell v-if="deliveryQuotes.length > 0" class="line-cell" :hover="false" :arrow="false">
+            <view 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>
+          </tui-list-cell>
+          <tui-list-cell  v-else-if="deliveryQuotesLoading" class="line-cell" :hover="false" :arrow="false">
+            <view style="text-align: center; padding: 20rpx 0; color: #999;">正在获取报价...</view>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">距离</view>
+            <view class="tui-input" v-if="showDistance > 0">{{ showDistance }}公里</view>
+            <view class="tui-input" v-else>0公里</view>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">跑腿费</view>
+              <view class="tui-input">
+                <text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ form.sendCost }}</text>
+                <text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
+              </view>
+          </tui-list-cell>
+          
+        </block>
+
       </div>
       
       <div class="module-com">
@@ -83,47 +116,6 @@
               <view class="uni-input" style="width:450upx;">{{form.reachPeriod}}<text style="margin-left:10upx;">前</text></view>
             </picker>
         </tui-list-cell>
-
-        <block v-if="openIntraCity == 1">
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">距离</view>
-            <view class="tui-input" v-if="showDistance > 0">{{ showDistance }}公里</view>
-            <view class="tui-input" v-else>0公里</view>
-          </tui-list-cell>
-          <tui-list-cell class="line-cell" :hover="false">
-              <view class="tui-title">跑腿费</view>
-              <view class="tui-input">
-                <text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ form.sendCost }}</text>
-                <text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
-              </view>
-          </tui-list-cell>
-          
-          <!-- 跑腿平台报价列表 -->
-          <tui-list-cell v-if="deliveryQuotes.length > 0" class="line-cell" :hover="false" :arrow="false">
-            <view 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>
-          </tui-list-cell>
-          <tui-list-cell  v-else-if="deliveryQuotesLoading" class="line-cell" :hover="false" :arrow="false">
-            <view style="text-align: center; padding: 20rpx 0; color: #999;">正在获取报价...</view>
-          </tui-list-cell>
-        </block>
         
       </div>
 

mallApp/src/pages/order/detail.vue

@@ -26,6 +26,7 @@
           </block>
 
         </view>
+        <view style="text-align: right;border-top:1upx solid #EEEEEE;padding:10upx 10upx 10upx 0;font-size:28upx;color:#403e3e;">合计 ￥{{ data.goodsPrice ? parseFloat(data.goodsPrice) : 0 }}</view>
       </view>
       <view class="module-com order-msg">
         <view class="module-tit">订单信息</view>

mallApp/src/pages/user/address.vue

@@ -39,6 +39,7 @@ import SimpleAddress from '@/components/plugin/simple-address'
 import AppAreaSel from '@/components/app-area-sel'
 const form = require('@/utils/formValidation.js')
 import {currentInfo,updateInfo} from "@/api/user"
+import { getHasMap } from "@/api/express";
 export default {
 	name: 'address',
 	components: {
@@ -79,7 +80,9 @@ export default {
 	},
 	methods: {
 		init() {
-
+			getHasMap().then(res=>{
+				this.hasMap = res.data.hasMap
+			})
 		},
 		getUserInfo() {
             currentInfo().then(res=>{