shish 1 lună în urmă
părinte
comite
3ec7c6ba82
1 a modificat fișierele cu 35 adăugiri și 26 ștergeri
  1. 35 26
      ghsApp/src/pagesOrder/shMethod.vue

+ 35 - 26
ghsApp/src/pagesOrder/shMethod.vue

@@ -101,28 +101,30 @@
 
         <!-- 跑腿 特有字段 -->
         <block v-if="tabIndex === 2">
-          <!-- 满减规则 -->
-          <view class="section-header">
-            <text class="section-title">满减规则</text>
-            <button class="admin-button-com mini blue" @click="addReduceRule">添加</button>
-          </view>
-          <view class="rule-list" v-if="form.reduceRules && form.reduceRules.length > 0">
-            <view class="rule-card" v-for="(rule, index) in form.reduceRules" :key="index">
-              <view class="rule-row">
-                <text class="rule-label">需</text>
-                <input type="number" v-model="rule.meetNum" class="rule-input" placeholder="0" />
-                <text class="rule-label">扎,且</text>
-                <input type="digit" v-model="rule.meetAmount" class="rule-input-large" placeholder="0.00" />
-                <text class="rule-label">元,</text>
-                <input type="digit" v-model="rule.freeKm" class="rule-input-large" placeholder="0" />
-                <text class="rule-label">公里内免跑腿费</text>
+          <!-- 满减规则圈起来 -->
+          <view class="rule-section-wrapper">
+            <view class="section-header no-margin">
+              <text class="section-title">满减规则</text>
+              <button class="admin-button-com mini blue" @click="addReduceRule">添加</button>
+            </view>
+            <view class="rule-list" v-if="form.reduceRules && form.reduceRules.length > 0">
+              <view class="rule-card" v-for="(rule, index) in form.reduceRules" :key="index">
+                <view class="rule-row">
+                  <text class="rule-label">满</text>
+                  <input type="number" v-model="rule.meetNum" class="rule-input" placeholder="0" />
+                  <text class="rule-label">扎,且</text>
+                  <input type="digit" v-model="rule.meetAmount" class="rule-input-large" placeholder="0.00" />
+                  <text class="rule-label">元,</text>
+                  <input type="digit" v-model="rule.freeKm" class="rule-input-large" placeholder="0" />
+                  <text class="rule-label">公里内免跑腿费</text>
+                </view>
+                <button class="admin-button-com mini default rule-del-btn" @click="removeReduceRule(index)">
+                  删除
+                </button>
               </view>
-              <button class="admin-button-com mini default rule-del-btn" @click="removeReduceRule(index)">
-                删除
-              </button>
             </view>
+            <view class="no-data-tip" v-else>暂无满减规则</view>
           </view>
-          <view class="no-data-tip" v-else>暂无满减规则</view>
 
           <view class="notice-text">
             不符合满减规则时,将通过跑腿计算运费,跑腿无法使用时,将使用自定义计费
@@ -162,7 +164,9 @@
         <block v-if="tabIndex === 4">
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">配送物流</view>
-            <button class="admin-button-com middle blue" @click="manageWl">添加 / 管理</button>
+            <view style="margin-left: auto;">
+              <button class="admin-button-com middle blue" @click="manageWl">管理物流</button>
+            </view>
           </tui-list-cell>
         </block>
 
@@ -357,7 +361,9 @@ export default {
      * @param {number} index - 规则索引
      */
     removeReduceRule(index) {
-      this.form.reduceRules.splice(index, 1);
+      this.$util.confirmModal({ content: "确认删除该满减规则吗?" }, () => {
+        this.form.reduceRules.splice(index, 1);
+      });
     },
 
     /**
@@ -588,6 +594,8 @@ export default {
   padding: 20upx;
   margin-bottom: 20upx;
   border: 1upx solid #eef2f9;
+  display: flex;
+  flex-direction: column;
 }
 
 .rule-row {
@@ -603,7 +611,7 @@ export default {
 }
 
 .rule-input {
-  width: 70upx;
+  width: 90upx;
   height: 50upx;
   border: 1upx solid #cccccc;
   border-radius: 6upx;
@@ -613,7 +621,7 @@ export default {
 }
 
 .rule-input-large {
-  width: 110upx;
+  width: 90upx;
   height: 50upx;
   border: 1upx solid #cccccc;
   border-radius: 6upx;
@@ -624,7 +632,7 @@ export default {
 
 .rule-del-btn {
   margin-top: 15upx;
-  margin-left: auto;
+  align-self: flex-end; /* 靠右边 */
 }
 
 /* 提示文字 */
@@ -636,11 +644,12 @@ export default {
   background-color: #fffaf5;
   border-radius: 8upx;
   border: 1upx solid #ffe8d6;
-  margin: 20upx 10upx;
+  margin: 10upx 0upx;
 }
 
 /* 说明项区域圈起来 */
-.explain-section-wrapper {
+.explain-section-wrapper,
+.rule-section-wrapper {
   background-color: #ffffff;
   border-radius: 12upx;
   padding: 24upx;