优化

ghsPad/src/pages/home/components/settlePop.vue

@@ -35,7 +35,7 @@
                             </view>
                         </view>
                     </view>
-                    
+
                     <!-- 跑腿平台报价列表 -->
                     <view class="select-item_box" v-if="deliveryQuotes.length > 0">
                         <!-- <view class="title">选择跑腿</view> -->
@@ -63,20 +63,6 @@
                       <text style="font-size:12upx;">正在获取运费...</text>
                     </view>
 
-                    <view class="select-item_box" style="margin-top:8upx;">
-                        <view class="title">
-                             <text>运费：</text>
-                        </view>
-                        <view class="item-list_box">
-                            <view v-if="form.reductionRule == 1 && isHcMapRule()">
-                                <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" />
-                             </view>
-                             <view v-else>
-                                <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" />
-                             </view>
-                        </view>
-                    </view>
-
                     <view class="select-item_box">
                         <view class="title">距离：</view>
                         <view class="item-list_box">
@@ -93,6 +79,20 @@
                         </view>
                     </view>
 
+                    <view class="select-item_box" style="margin-top:8upx;">
+                        <view class="title">
+                             <text>运费：</text>
+                        </view>
+                        <view class="item-list_box">
+                            <view v-if="form.reductionRule == 1 && isHcMapRule()">
+                                <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" />
+                             </view>
+                             <view v-else>
+                                <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" />
+                             </view>
+                        </view>
+                    </view>
+
                     <view class="select-item_box">
                         <view class="title">呼叫跑腿</view>
                         <view class="item-list_box">
@@ -674,6 +674,11 @@ export default {
                 }
             }
 
+            if(this.form.sendType == 2 && this.form.hasPay == 0 && this.form.callErrand == 1){
+                this.$msg('扫码付款，暂不支持马上发跑腿')
+                return false
+            }
+
             this.$emit('settleCommit',this.form)
         },
         checkMapRule(type) {
@@ -815,7 +820,7 @@ export default {
     width:92vw;
     height: 99vh;
     .select-left {
-        flex: 1;
+        flex: 5.5;
         padding: 10upx;
         overflow-y: auto;
         & .select-item_box {
@@ -895,7 +900,7 @@ export default {
         background-color: #eee;
     }
     .select-right {
-        flex: 1;
+        flex: 4;
         padding: 5upx 10upx 10upx 10upx;
         display: flex;
         flex-direction: column;
@@ -942,9 +947,9 @@ export default {
 .delivery-quotes-grid {
   display: flex;
   flex-wrap: wrap;
-  gap: 4upx;
   padding: 0;
   width: 100%;
+  margin: -2upx;
 }
 .delivery-quote-item {
   display: flex;
@@ -955,7 +960,7 @@ export default {
   width: calc(33% - 4upx);
   min-height: 50upx;
   padding: 4upx;
-  margin-bottom: 2upx;
+  margin: 2upx;
   background: #FFFFFF;
   border: 1px solid #DDDDDD;
   border-radius: 4upx;
@@ -968,7 +973,7 @@ export default {
   }
   
   .platform-name {
-    font-size: 11upx;
+    font-size: 10upx;
     color: #333;
     font-weight: bold;
     margin-bottom: 2upx;
@@ -985,14 +990,14 @@ export default {
   }
   
   .platform-price {
-    font-size: 13upx;
+    font-size: 12upx;
     color: #333;
     font-weight: bold;
     margin-bottom: 1upx;
   }
   
   .platform-type {
-    font-size: 9upx;
+    font-size: 8upx;
     color: #868686;
     margin-top: 1upx;
     text-align: center;

hdPad/src/pages/home/components/settlePop.vue

@@ -81,20 +81,6 @@
                       <text style="font-size:12upx;">正在获取运费...</text>
                     </view>
 
-                    <view class="select-item_box" style="margin-top:8upx;">
-                        <view class="title">
-                             <text>运费：</text>
-                        </view>
-                        <view class="item-list_box">
-                            <view v-if="form.reductionRule != 0 && (isHcMapRule() || isHsMapRule())">
-                                <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" />
-                             </view>
-                             <view v-else>
-                                <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" />
-                             </view>
-                        </view>
-                    </view>
-
                     <view class="select-item_box">
                         <view class="title">距离：</view>
                         <view class="item-list_box">
@@ -112,6 +98,20 @@
                         </view>
                     </view>
 
+                    <view class="select-item_box" style="margin-top:8upx;">
+                        <view class="title">
+                             <text>运费：</text>
+                        </view>
+                        <view class="item-list_box">
+                            <view v-if="form.reductionRule != 0 && (isHcMapRule() || isHsMapRule())">
+                                <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" />
+                             </view>
+                             <view v-else>
+                                <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" />
+                             </view>
+                        </view>
+                    </view>
+
                     <view class="select-item_box">
                         <view class="title">呼叫跑腿</view>
                         <view class="item-list_box">
@@ -854,6 +854,11 @@ export default {
                 }
             }
 
+            if(this.form.sendType == 2 && this.form.hasPay == 0 && this.form.callErrand == 1){
+                this.$msg('扫码付款，暂不支持马上发跑腿')
+                return false
+            }
+
             this.$emit('settleCommit',this.form)
         },
         cancel(){
@@ -869,7 +874,7 @@ export default {
     width:92vw;
     height: 99vh;
     .select-left {
-        flex: 4;
+        flex: 5.5;
         padding: 10upx;
         overflow-y: auto;
         & .select-item_box {
@@ -950,7 +955,7 @@ export default {
         background-color: #eee;
     }
     .select-right {
-        flex: 3;
+        flex: 4;
         padding: 5upx 10upx 10upx 10upx;
         display: flex;
         flex-direction: column;
@@ -997,9 +1002,9 @@ export default {
 .delivery-quotes-grid {
   display: flex;
   flex-wrap: wrap;
-  gap: 4upx;
   padding: 0;
   width: 100%;
+  margin: -2upx;
 }
 .delivery-quote-item {
   display: flex;
@@ -1010,7 +1015,7 @@ export default {
   width: calc(33% - 4upx);
   min-height: 50upx;
   padding: 4upx;
-  margin-bottom: 2upx;
+  margin: 2upx;
   background: #FFFFFF;
   border: 1px solid #DDDDDD;
   border-radius: 4upx;
@@ -1023,7 +1028,7 @@ export default {
   }
   
   .platform-name {
-    font-size: 11upx;
+    font-size: 10upx;
     color: #333;
     font-weight: bold;
     margin-bottom: 2upx;
@@ -1040,14 +1045,14 @@ export default {
   }
   
   .platform-price {
-    font-size: 13upx;
+    font-size: 12upx;
     color: #333;
     font-weight: bold;
     margin-bottom: 1upx;
   }
   
   .platform-type {
-    font-size: 9upx;
+    font-size: 8upx;
     color: #868686;
     margin-top: 1upx;
     text-align: center;