Merge branch 'master' into zhongqi-lakala-jingjian

ghsApp/src/admin/billing/affirm.vue

@@ -736,6 +736,12 @@ export default {
 
     //默认欠款是首选项
     this.form.hasPay = 2;
+
+    //我要花义乌店，快捷开单，收款方式，默认扫码
+    if(Number(option.customId) == 151776) {
+      this.form.hasPay = 0
+    }
+
     // #ifdef APP-PLUS
     if (this.$util.isScanEnv()) {
       this.isScanEnv = true;

hdApp/src/admin/billing/affirmGhs.vue

@@ -135,6 +135,12 @@
 								<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;"  @click="changeSendType(1)">自取</button>
 							</tui-list-cell>
 						</block>
+						<block v-else-if="ghsInfo.shopId == 100382">
+							<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+								<button class="admin-button-com middle" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;"  @click="changeSendType(0)">送货上门</button>
+								<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;"  @click="changeSendType(1)">自取</button>
+							</tui-list-cell>
+						</block>
 						<block v-else-if="ghsInfo.shopId == 92086">
 							<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 								<button class="admin-button-com middle" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;"  @click="changeSendType(0)">送货上门</button>