Merge branch 'master' into feat/appointment-goods

manager/src/views/distribution/distributionRecruit.vue

@@ -103,6 +103,9 @@
             <el-radio value="MANUAL">手动申请</el-radio>
             <el-radio value="AUTO">满足条件自动申请</el-radio>
           </el-radio-group>
+          <div v-if="planForm.applyMode === 'AUTO'" class="form-desc">
+            达标后系统自动提交申请。若配置了分销推广服务协议，系统将视为已同意。
+          </div>
           <div v-if="planForm.applyMode === 'MANUAL'" class="manual-apply-extra">
             <el-checkbox v-model="planForm.requireApplyInfo">需要填写申请信息</el-checkbox>
             <div class="form-desc">申请人需填写对应字段，方便审核分销员信息。</div>
@@ -166,6 +169,9 @@
       </el-form-item>
       <el-form-item label="分销推广服务协议">
         <editor v-if="editorReady" ref="agreementEditor" open-xss v-model="planForm.agreementContent" />
+        <div v-if="planForm.applyMode === 'AUTO'" class="form-desc">
+          自动申请模式下，达标后系统自动提交并视为已同意协议。
+        </div>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" :loading="planSaveLoading" @click="savePlan">保存</el-button>

manager/src/views/page-decoration/floorList.vue

@@ -32,7 +32,7 @@
               inline-prompt
               active-text="开"
               inactive-text="关"
-              @change="releaseTemplate(row.id)"
+              :before-change="() => beforeRelease(row)"
             />
           </template>
         </el-table-column>
@@ -200,12 +200,27 @@ export default {
       });
     },
 
-    releaseTemplate(id) {
+    beforeRelease(row) {
-      API_floor.releasePageHome(id).then((res) => {
+      if (row.pageShow) {
-        if (res.success) {
+        this.$Message.warning(
-          this.$Message.success("发布模板成功");
+          this.total === 1
-          this.getTemplateList();
+            ? "当前为唯一页面，无法关闭"
-        }
+            : "请直接开启其他页面，当前页面会自动关闭"
+        );
+        return false;
+      }
+      return new Promise((resolve, reject) => {
+        API_floor.releasePageHome(row.id).then((res) => {
+          if (res && res.success) {
+            this.$Message.success("发布模板成功");
+            resolve(true);
+            this.getTemplateList();
+          } else {
+            reject(new Error("release failed"));
+          }
+        }).catch(() => {
+          reject(new Error("release failed"));
+        });
       });
     },
     confirmDel(id) {

manager/src/views/page-decoration/wap/wapList.vue

@@ -27,7 +27,7 @@
               inline-prompt
               active-text="开"
               inactive-text="关"
-              @change="changeSwitch(row)"
+              :before-change="() => beforeRelease(row)"
             />
           </template>
         </el-table-column>
@@ -107,14 +107,27 @@ export default {
       this.params.pageNumber = val;
       this.init();
     },
-    changeSwitch(item) {
+    beforeRelease(row) {
-      this.loading = true;
+      if (row.pageShow) {
-      API_Other.releasePageHome(item.id).then((res) => {
+        this.$Message.warning(
-        this.loading = false;
+          this.total === 1
-        if (res.result) {
+            ? "当前为唯一页面，无法关闭"
-          this.$Message.success("发布成功");
+            : "请直接开启其他页面，当前页面会自动关闭"
-          this.init();
+        );
-        }
+        return false;
+      }
+      return new Promise((resolve, reject) => {
+        API_Other.releasePageHome(row.id).then((res) => {
+          if (res && res.success) {
+            this.$Message.success("发布成功");
+            resolve(true);
+            this.init();
+          } else {
+            reject(new Error("release failed"));
+          }
+        }).catch(() => {
+          reject(new Error("release failed"));
+        });
       });
     },
     init() {

seller/src/api/common.js

@@ -1,4 +1,4 @@
-import { sellerUrl, getRequest, uploadFileRequest, uploadFile, request} from "@/libs/axios";
+import { sellerUrl, getRequest, uploadFileRequest, uploadFile } from "@/libs/axios";
 
 // 通过id获取子地区
 export const getChildRegion = (id) => {

seller/src/views/shop/floorList.vue

@@ -31,7 +31,7 @@
               inline-prompt
               active-text="开"
               inactive-text="关"
-              @change="releaseTemplate(row.id)"
+              :before-change="() => beforeRelease(row)"
             />
           </template>
         </el-table-column>
@@ -195,12 +195,27 @@ export default {
       });
     },
 
-    releaseTemplate(id) {
+    beforeRelease(row) {
-      API_floor.releasePageHome(id).then((res) => {
+      if (row.pageShow) {
-        if (res.success) {
+        this.$Message.warning(
-          this.$Message.success("发布模板成功");
+          this.total === 1
-          this.getTemplateList();
+            ? "当前为唯一页面，无法关闭"
-        }
+            : "请直接开启其他页面，当前页面会自动关闭"
+        );
+        return false;
+      }
+      return new Promise((resolve, reject) => {
+        API_floor.releasePageHome(row.id).then((res) => {
+          if (res && res.success) {
+            this.$Message.success("发布模板成功");
+            resolve(true);
+            this.getTemplateList();
+          } else {
+            reject(new Error("release failed"));
+          }
+        }).catch(() => {
+          reject(new Error("release failed"));
+        });
       });
     },
     confirmDel(id) {

seller/src/views/shop/wap/wapList.vue

@@ -26,7 +26,7 @@
               inline-prompt
               active-text="开"
               inactive-text="关"
-              @change="changeSwitch(row)"
+              :before-change="() => beforeRelease(row)"
             />
           </template>
         </el-table-column>
@@ -106,14 +106,27 @@ export default {
       this.params.pageNumber = val;
       this.init();
     },
-    changeSwitch(item) {
+    beforeRelease(row) {
-      this.loading = true;
+      if (row.pageShow) {
-      API_Other.releasePageHome(item.id).then((res) => {
+        this.$Message.warning(
-        this.loading = false;
+          this.total === 1
-        if (res.result) {
+            ? "当前为唯一页面，无法关闭"
-          this.$Message.success("发布成功");
+            : "请直接开启其他页面，当前页面会自动关闭"
-          this.init();
+        );
-        }
+        return false;
+      }
+      return new Promise((resolve, reject) => {
+        API_Other.releasePageHome(row.id).then((res) => {
+          if (res && res.success) {
+            this.$Message.success("发布成功");
+            resolve(true);
+            this.init();
+          } else {
+            reject(new Error("release failed"));
+          }
+        }).catch(() => {
+          reject(new Error("release failed"));
+        });
       });
     },
     init() {