Merge branch 'master' into redesign‌-260706

ghsApp/src/pagesClient/member/detail.vue

@@ -905,6 +905,7 @@ export default {
         homeAmount: this.userInfo.homeAmount,
         homeNum: this.userInfo.homeNum,
         homeUnMeet: homeUnMeet,
+        homeRule: this.form.homeRule,
         homeUnFee: homeUnMeet === 2 ? 0 : (this.userInfo.homeUnFee || 0)
       }).then(res=>{
         if(res.code == 1){
@@ -912,10 +913,7 @@ export default {
         }
       })
     },
-    /**
-     * 切换「不满最低要求时」的处理方式
-     * @param {number} value - 0 收运费，1 收包装费，2 不能下单
-     */
+    //切换「不满最低要求时」的处理方式，0 收运费，1 收包装费，2 不能下单
     homeUnMeetBtn (value) {
       if (Number(this.form.homeUnMeet) === value) {
         return true
@@ -926,6 +924,7 @@ export default {
         id: this.option.id,
         homeAmount: this.userInfo.homeAmount,
         homeNum: this.userInfo.homeNum,
+        homeRule: this.form.homeRule,
         homeUnMeet: value,
         homeUnFee: value === 2 ? 0 : (this.userInfo.homeUnFee || 0)
       }).then(res => {

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>
@@ -157,7 +157,7 @@
           </view>
 
           <view class="notice-text">
-            不符合满减规则时，将通过跑腿计算运费，跑腿无法使用时，将使用自定义计费
+            不符合满减规则时，将通过跑腿或用自定义方式计费
           </view>
 
           <!-- 自定义计费 -->
@@ -748,7 +748,7 @@ export default {
 
 /* 提示文字 */
 .notice-text {
-  font-size: 32upx;
+  font-size: 34upx;
   color: #ff6900;
   line-height: 36upx;
   padding: 15upx 20upx;

hdApp/src/admin/billing/affirmSh.vue

@@ -104,7 +104,7 @@
 						<!-- 未达标提示 -->
 						<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="showShMethodExtraFee">
 							<view>
-								<text style="color: red;width:100%;">{{ shMethodUnMeetWarningText }}</text>
+								<text style="color: red;width:100%;font-weight: bold;font-size: 30upx;">{{ shMethodUnMeetWarningText }}</text>
 							</view>
 						</tui-list-cell>
 
@@ -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,8 +973,19 @@ export default {
 					return false
 				}
 				const method = this.currentShMethod
-				if (method && Number(method.unMeet) === 1 && this.checkShMethodBelowMinimum(method)) {
-					this.$msg("未达到最低消费，不能下单")
+				if (method && Number(method.unMeet) === 2 && this.checkShMethodBelowMinimum(method)) {
+					// 不满最低消费且不可下单时，提示具体需要的最低金额与数量
+					const minAmount = Number(method.minAmount) || 0
+					const minNum = Number(method.minNum) || 0
+					const tips = []
+					if (minAmount > 0) {
+						tips.push(`满${minAmount}元`)
+					}
+					if (minNum > 0) {
+						tips.push(`满${minNum}扎`)
+					}
+					const tipStr = tips.length > 0 ? `${tips.join("并且")}才能下单` : "未达到最低消费，不能下单"
+					this.$msg(tipStr)
 					return false
 				}