1

src/views/app/shop/addEdit.vue

@@ -79,6 +79,16 @@
 						</FormItem>
 						</Col>
 					</Row>
+					<Row :gutter="32">
+						<Col span="12">
+						<FormItem label="只做到店消费" prop="storeConsumeOnly">
+							<RadioGroup v-model="form.storeConsumeOnly">
+								<Radio :label="1">是</Radio>
+								<Radio :label="0">否</Radio>
+							</RadioGroup>
+						</FormItem>
+						</Col>
+					</Row>
 					<Row :gutter="32">
 						<Col span="24">
 						<FormItem label="店铺详细地址" prop="shopAddress">
@@ -362,6 +372,7 @@
 					startingPrice: 0,
 					openKitchenVideoUrl: "",
 					supportDineIn: 0,
+					storeConsumeOnly: 0,
 					qita: [],
 					supportShopDelivery: 0,
 					orderBkge: 0,
@@ -690,9 +701,13 @@
 				if (this.form.supportDineIn == null || this.form.supportDineIn === "") {
 					this.$set(this.form, "supportDineIn", 0);
 				}
+				if (this.form.storeConsumeOnly == null || this.form.storeConsumeOnly === "") {
+					this.$set(this.form, "storeConsumeOnly", 0);
+				}
 				this.form.merchantType = Number(this.form.merchantType);
 				this.form.isStudent = Number(this.form.isStudent);
 				this.form.supportDineIn = Number(this.form.supportDineIn);
+				this.form.storeConsumeOnly = Number(this.form.storeConsumeOnly);
 				this.form.startingPrice = this.form.merchantType == 1 ? Number(this.form.startingPrice || 0) : 0;
 				this.form.openKitchenVideoUrl = this.form.openKitchenVideoUrl || "";
 				if (!this.form.contactPhone && this.form.mobile) {
@@ -846,6 +861,7 @@
 						startingPrice: registerData.startingPrice == null ? 0 : Number(registerData.startingPrice),
 						openKitchenVideoUrl: registerData.openKitchenVideoUrl || "",
 						supportDineIn: registerData.supportDineIn == null ? 0 : Number(registerData.supportDineIn),
+						storeConsumeOnly: registerData.storeConsumeOnly == null ? 0 : Number(registerData.storeConsumeOnly),
 						contactPhone: registerData.contactPhone || registerData.mobile || "",
 						mobile: registerData.mobile || registerData.contactPhone || "",
 						zhengzhao: registerData.zhengzhao || "",
@@ -888,6 +904,7 @@
 						startingPrice: 0,
 						openKitchenVideoUrl: "",
 						supportDineIn: 0,
+						storeConsumeOnly: 0,
 						qita: [],
 						supportShopDelivery: 0,
 						orderBkge: 0,

src/views/app/shopArea/shopArea.vue

@@ -170,7 +170,19 @@
                 <Radio :label="1">校园区域</Radio>
                 <Radio :label="2">社会区域</Radio>
               </RadioGroup>
-              <div class="geo-tip">社会区域首页展示待成团，并隐藏配送入口</div>
+              <div class="geo-tip">社会区域首页展示待成团，可单独配置快递/跑腿入口</div>
+            </FormItem>
+            <FormItem v-if="showEditParentAgent && Number(form.areaKind) === 2" label="快递/跑腿">
+              <i-switch
+                size="large"
+                v-model="form.expressErrandEnabled"
+                :true-value="1"
+                :false-value="0"
+              >
+                <span slot="open">开启</span>
+                <span slot="close">关闭</span>
+              </i-switch>
+              <div class="geo-tip">关闭后社会区域首页和底部栏不展示快递/跑腿入口</div>
             </FormItem>
             <FormItem v-if="showEditParentAgent" label="匹配范围">
               <Map
@@ -310,7 +322,19 @@
             <Radio :label="1">校园区域</Radio>
             <Radio :label="2">社会区域</Radio>
           </RadioGroup>
-          <div class="geo-tip">社会区域首页展示待成团，并隐藏配送入口</div>
+          <div class="geo-tip">社会区域首页展示待成团，可单独配置快递/跑腿入口</div>
+        </FormItem>
+        <FormItem v-if="showAddParentAgent && Number(formAdd.areaKind) === 2" label="快递/跑腿">
+          <i-switch
+            size="large"
+            v-model="formAdd.expressErrandEnabled"
+            :true-value="1"
+            :false-value="0"
+          >
+            <span slot="open">开启</span>
+            <span slot="close">关闭</span>
+          </i-switch>
+          <div class="geo-tip">关闭后社会区域首页和底部栏不展示快递/跑腿入口</div>
         </FormItem>
         <FormItem v-if="showAddParentAgent" label="匹配范围">
           <Map
@@ -482,6 +506,7 @@ export default {
         parentAgentName: "",
         commissionRatio: 0,
         areaKind: 1,
+        expressErrandEnabled: 1,
         centerLng: null,
         centerLat: null,
         radiusMeters: "",
@@ -763,6 +788,7 @@ export default {
         this.$delete(target, "commissionRatio");
         this.clearGeoValue(target);
         this.$set(target, "areaKind", 1);
+        this.$set(target, "expressErrandEnabled", 1);
       } else {
         if (
           target.commissionRatio === "" ||
@@ -775,6 +801,11 @@ export default {
         }
         const areaKind = Number(target.areaKind);
         this.$set(target, "areaKind", areaKind === 2 ? 2 : 1);
+        this.$set(
+          target,
+          "expressErrandEnabled",
+          areaKind === 2 && Number(target.expressErrandEnabled) === 0 ? 0 : 1
+        );
       }
     },
     syncGeoFromEntity(target) {
@@ -910,6 +941,11 @@ export default {
         }
         const areaKind = Number(this.form.areaKind);
         this.$set(this.form, "areaKind", areaKind === 2 ? 2 : 1);
+        this.$set(
+          this.form,
+          "expressErrandEnabled",
+          areaKind === 2 && Number(this.form.expressErrandEnabled) === 0 ? 0 : 1
+        );
         this.syncGeoFromEntity(this.form);
       } else {
         this.cancelEdit();
@@ -933,6 +969,7 @@ export default {
         parentAgentName: "",
         commissionRatio: 0,
         areaKind: 1,
+        expressErrandEnabled: 1,
         centerLng: null,
         centerLat: null,
         radiusMeters: "",
@@ -1041,6 +1078,7 @@ export default {
             status: 0,
             parentAgentId: "",
             parentAgentName: "",
+            expressErrandEnabled: 1,
           };
           this.modalVisible = true;
           return;
@@ -1061,6 +1099,7 @@ export default {
         status: 0,
         parentAgentId: "",
         parentAgentName: "",
+        expressErrandEnabled: 1,
       };
       this.modalVisible = true;
     },
@@ -1080,6 +1119,7 @@ export default {
         parentAgentName: "",
         commissionRatio: 0,
         areaKind: 1,
+        expressErrandEnabled: 1,
         centerLng: null,
         centerLat: null,
         radiusMeters: "",

src/views/sys/order-manage/logisticsAddress.vue

@@ -628,4 +628,5 @@
 		color: #056dae;
 	}
 </style>
-</style>
+</style>
+