sh

ghsApp/src/pagesClient/member/detail.vue

@@ -205,7 +205,7 @@
                 <view class="tui-title">送货上门规则</view>
                 <view style="margin-left: auto; display: flex; align-items: center;">
                   <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)" style="margin-left:20upx;">单独设置</button>
                 </view>
               </tui-list-cell>
               <block v-if="form.homeRule == 1">

hdApp/src/admin/billing/components/affirm-sh-method-panel.vue

@@ -313,7 +313,7 @@ export default {
       if (minNum > 0) {
         tips.push("不满" + minNum + "扎")
       }
-      const conditionText = tips.length > 0 ? tips.join("且") : "未达最低消费"
+      const conditionText = tips.length > 0 ? tips.join("或") : "未达最低消费"
       return "当天订单" + conditionText + "，加" + this.shMethodExtraFeeLabel + this.shMethodExtraFeeAmount + "元"
     },
     currentMethodExplains() {