优化

ghsApp/src/pagesClient/member/detail.vue

@@ -200,54 +200,65 @@
               </tui-list-cell>
             </view>
 
-            <view style="border:2upx solid #CCCCCC;margin-top:20upx;">
+            <!-- 送货上门规则设置卡片 -->
+            <view class="home-rule-box">
               <tui-list-cell class="line-cell" :hover="false">
                 <view class="tui-title">送货上门规则</view>
-                <view style="margin-left: auto; display: flex; align-items: center;">
+                <view class="home-btn-group">
                   <button class="admin-button-com middle" :class="[form.homeRule == 0 ? 'blue' : 'default']" @click="changeHomeRuleBtn(0)">遵循总设置</button>
-                  <button class="admin-button-com middle" :class="[form.homeRule == 1 ? 'blue' : 'default']" @click="changeHomeRuleBtn(1)" style="margin-left:20upx;">单独设置</button>
+                  <button class="admin-button-com middle" :class="[form.homeRule == 1 ? 'blue' : 'default']" @click="changeHomeRuleBtn(1)">单独设置</button>
                 </view>
               </tui-list-cell>
+
               <block v-if="form.homeRule == 1">
                 <tui-list-cell class="line-cell" :hover="false">
                   <view class="tui-title">送货上门</view>
-                  <view style="margin-left: auto; display: flex; align-items: center;">
+                  <view class="home-btn-group">
                     <button class="admin-button-com middle" :class="[form.home == 1 ? 'blue' : 'default']" @click="changeHomeBtn(1)">启用</button>
-                    <button class="admin-button-com middle" :class="[form.home == 0 ? 'blue' : 'default']" @click="changeHomeBtn(0)" style="margin-left:20upx;">禁用</button>
-                  </view>
-                </tui-list-cell>
-                <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
-                  <view class="tui-title">最低消费金额</view>
-                  <view style="display:flex;align-items:center;">
-                    <input v-model="userInfo.homeAmount" @click="userInfo.homeAmount=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="digit" style="width:245upx;border:1upx solid #ddd;margin-right:10upx;height:70upx;text-align:center;" />
-                    <text style="margin-right:30upx;">元</text>
+                    <button class="admin-button-com middle" :class="[form.home == 0 ? 'blue' : 'default']" @click="changeHomeBtn(0)">禁用</button>
                   </view>
-                  <button class="admin-button-com blue middle" @tap="changeHomeParams">确定</button>
                 </tui-list-cell>
-                <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
-                  <view class="tui-title">最低消费扎数</view>
-                  <view style="display:flex;align-items:center;">
-                    <input v-model="userInfo.homeNum" @click="userInfo.homeNum=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限制填0" type="number" style="width:245upx;border:1upx solid #ddd;margin-right:10upx;height:70upx;text-align:center;" />
-                    <text style="margin-right:30upx;">扎</text>
-                  </view>
-                  <button class="admin-button-com blue middle" @tap="changeHomeParams">确定</button>
-                </tui-list-cell>
-                <!-- 不满最低消费要求时的处理方式：收运费 / 收包装费 / 不能下单 -->
-                <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
-                  <view class="tui-title">不满最低要求</view>
-                  <button class="admin-button-com middle" :class="[form.homeUnMeet == 0 ? 'blue' : 'default']" @click="homeUnMeetBtn(0)">收运费</button>
-                  <button class="admin-button-com middle" :class="[form.homeUnMeet == 1 ? 'blue' : 'default']" @click="homeUnMeetBtn(1)" style="margin-left:4upx;">收包装费</button>
-                  <button class="admin-button-com middle" :class="[form.homeUnMeet == 2 ? 'blue' : 'default']" @click="homeUnMeetBtn(2)" style="margin-left:4upx;">不能买</button>
-                </tui-list-cell>
-                <!-- homeUnMeet 为 0/1 时填写对应费用；为 2（不能下单）时不展示 -->
-                <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1 && form.homeUnMeet != 2">
-                  <view class="tui-title">{{ homeUnFeeLabel }}</view>
-                  <view style="display:flex;align-items:center;">
-                    <input v-model="userInfo.homeUnFee" @click="userInfo.homeUnFee=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="digit" style="width:245upx;border:1upx solid #ddd;margin-right:10upx;height:70upx;text-align:center;" />
-                    <text style="margin-right:30upx;">元</text>
+
+                <block v-if="form.home == 1">
+                  <tui-list-cell class="line-cell" :hover="false">
+                    <view class="tui-title">最低消费金额</view>
+                    <view class="home-input-wrap">
+                      <input v-model="userInfo.homeAmount" placeholder-class="phcolor" class="tui-input home-input" placeholder="不限制填0" type="digit" />
+                      <text class="home-unit">元</text>
+                    </view>
+                  </tui-list-cell>
+
+                  <tui-list-cell class="line-cell" :hover="false">
+                    <view class="tui-title">最低消费扎数</view>
+                    <view class="home-input-wrap">
+                      <input v-model="userInfo.homeNum" placeholder-class="phcolor" class="tui-input home-input" placeholder="不限制填0" type="number" />
+                      <text class="home-unit">扎</text>
+                    </view>
+                  </tui-list-cell>
+
+                  <!-- 不满最低消费要求时的处理方式：0 收运费 / 1 收包装费 / 2 不能买 -->
+                  <tui-list-cell class="line-cell" :hover="false">
+                    <view class="tui-title">不满最低要求</view>
+                    <view class="home-btn-group">
+                      <button class="admin-button-com middle" :class="[form.homeUnMeet == 0 ? 'blue' : 'default']" @click="homeUnMeetBtn(0)">收运费</button>
+                      <button class="admin-button-com middle" :class="[form.homeUnMeet == 1 ? 'blue' : 'default']" @click="homeUnMeetBtn(1)">收包装费</button>
+                      <button class="admin-button-com middle" :class="[form.homeUnMeet == 2 ? 'blue' : 'default']" @click="homeUnMeetBtn(2)">不能买</button>
+                    </view>
+                  </tui-list-cell>
+
+                  <!-- homeUnMeet 为 0（收运费）或 1（收包装费）时显示对应费用输入框，为 2（不能买）时不显示 -->
+                  <tui-list-cell class="line-cell" :hover="false" v-if="form.homeUnMeet != 2">
+                    <view class="tui-title">{{ homeUnFeeLabel }}</view>
+                    <view class="home-input-wrap">
+                      <input v-model="userInfo.homeUnFee" placeholder-class="phcolor" class="tui-input home-input" placeholder="请填写" type="digit" />
+                      <text class="home-unit">元</text>
+                    </view>
+                  </tui-list-cell>
+
+                  <view class="home-save-wrap">
+                    <button class="admin-button-com blue big" @click="saveHomeParamsManual">保存送货上门设置</button>
                   </view>
-                  <button class="admin-button-com blue middle" @tap="changeHomeParams(true)">确定</button>
-                </tui-list-cell>
+                </block>
               </block>
             </view>
 

ghsApp/src/pagesOrder/shMethod.vue

@@ -107,24 +107,24 @@
               </button>
               <button
                 class="admin-button-com middle"
-                :class="[form.unMeet == 2 ? 'blue' : 'default']"
-                @click="form.unMeet = 2"
+                :class="[form.unMeet == 1 ? 'blue' : 'default']"
+                @click="form.unMeet = 1"
                 style="margin-left: 10upx;"
               >
                 收包装费
               </button>
               <button
                 class="admin-button-com middle"
-                :class="[form.unMeet == 1 ? 'blue' : 'default']"
-                @click="form.unMeet = 1"
+                :class="[form.unMeet == 2 ? 'blue' : 'default']"
+                @click="form.unMeet = 2"
                 style="margin-left: 10upx;"
               >
                 不能买
               </button>
             </view>
           </tui-list-cell>
-          <tui-list-cell class="line-cell" :hover="false" v-if="form.unMeet != 1">
-            <view class="tui-title">{{ form.unMeet == 2 ? '包装费' : '运费' }}</view>
+          <tui-list-cell class="line-cell" :hover="false" v-if="form.unMeet != 2">
+            <view class="tui-title">{{ form.unMeet == 1 ? '包装费' : '运费' }}</view>
             <input type="digit" v-model="form.unMeetFee" @focus="form.unMeetFee = ''" class="tui-input" placeholder="请填写金额" />
           </tui-list-cell>
         </block>

hdApp/src/admin/billing/affirmSh.vue

@@ -409,14 +409,14 @@ export default {
 			}
 			const unMeet = Number(method.unMeet) || 0
 			const fee = Number(method.unMeetFee) || 0
-			return (unMeet === 0 || unMeet === 2) && fee > 0
+			return (unMeet === 0 || unMeet === 1) && fee > 0
 		},
 		shMethodExtraFeeLabel() {
 			const method = this.currentShMethod
 			if (!method) {
 				return "包装费"
 			}
-			return Number(method.unMeet) === 2 ? "包装费" : "运费"
+			return Number(method.unMeet) === 1 ? "包装费" : "运费"
 		},
 		shMethodExtraFeeAmount() {
 			if (!this.showShMethodExtraFee) {
@@ -664,7 +664,7 @@ export default {
 			if (method && this.checkShMethodBelowMinimum(method)) {
 				const unMeet = Number(method.unMeet) || 0
 				const fee = parseFloat(Number(method.unMeetFee) || 0)
-				if ((unMeet === 0 || unMeet === 2) && fee > 0) {
+				if ((unMeet === 0 || unMeet === 1) && fee > 0) {
 					this.form.packCost = fee
 					return
 				}
@@ -973,7 +973,7 @@ export default {
 					return false
 				}
 				const method = this.currentShMethod
-				if (method && Number(method.unMeet) === 1 && this.checkShMethodBelowMinimum(method)) {
+				if (method && Number(method.unMeet) === 2 && this.checkShMethodBelowMinimum(method)) {
 					this.$msg("未达到最低消费，不能下单")
 					return false
 				}