From f3b80e173cff33571e04305bb639b4bdae0c18a8 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 19 Jan 2024 11:29:31 +0800
Subject: [PATCH] fix

---
 src/pages/activity/add/index.vue     | 14 +++++++++++++-
 src/pages/activity/list/index.vue    | 15 +++++++++------
 src/pages/preschool/manage/basic.vue | 27 ++++++++++++++++++++++-----
 src/pages/supplier/manage/basic.vue  | 26 +++++++++++++++++++++-----
 src/pages/user/detail/index.vue      |  2 +-
 5 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/src/pages/activity/add/index.vue b/src/pages/activity/add/index.vue
index 8390f95..4775d3a 100644
--- a/src/pages/activity/add/index.vue
+++ b/src/pages/activity/add/index.vue
@@ -1,10 +1,15 @@
 <template>
   <div class="page"
        style="padding-bottom: 70px">
+    <el-button v-if="!editing && id"
+               class="edit"
+               type="primary"
+               @click="editing = 1">编辑</el-button>
     <el-form label-width="170px"
              label-suffix=":"
              class="input-form model"
-             size="small">
+             size="small"
+             :disabled="!editing">
       <el-form-item label="活动封面（选填）">
         <el-upload class="avatar-uploader"
                    accept=".jpg,.png,.jpeg,.gif"
@@ -272,6 +277,7 @@ export default {
       headers: {
         token: Util.local.get(Setting.tokenKey)
       },
+      editing: this.$route.query.id ? 0 : 1,
       editorConfig,
       scope: 0,
       form: {
@@ -732,6 +738,12 @@ $upload-lg-height: 150px;
 .input-form.model {
     height: calc(100vh - 300px);
 }
+.edit {
+    z-index: 1000;
+    position: absolute;
+    top: -40px;
+    right: 30px;
+}
 /deep/ .d-inline-block {
     width: 216px;
 
diff --git a/src/pages/activity/list/index.vue b/src/pages/activity/list/index.vue
index 7bde939..a1f6ec4 100644
--- a/src/pages/activity/list/index.vue
+++ b/src/pages/activity/list/index.vue
@@ -34,7 +34,7 @@
           <el-select v-model="form.competitionScope"
                      clearable
                      multiple
-                     @change="initData">
+                     @change="scopeChange">
             <el-option v-for="(item, i) in rangeList"
                        :key="i"
                        :label="item.name"
@@ -283,11 +283,14 @@ export default {
     add () {
       this.$router.push("add");
     },
-    // 修改结束时间
-    editEndTime (row) {
-      this.modifyVisible = true
-      row.newEndTime = ''
-      this.curRow = row
+    // 发布范围回调
+    scopeChange (e) {
+      if (e.includes(1)) {
+        this.form.competitionScope = [5, 6]
+      } else if (e.includes(5) && e.includes(6)) {
+        this.form.competitionScope = [1]
+      }
+      this.initData()
     },
     // 管理
     manage (row) {
diff --git a/src/pages/preschool/manage/basic.vue b/src/pages/preschool/manage/basic.vue
index 2781327..e0df2ad 100644
--- a/src/pages/preschool/manage/basic.vue
+++ b/src/pages/preschool/manage/basic.vue
@@ -11,7 +11,7 @@
              size="small"
              :disabled="!editing">
       <el-form-item label="LOGO">
-        <el-upload class="avatar-uploader"
+        <el-upload :class="['avatar-uploader', {disabled: !editing}]"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
@@ -74,7 +74,7 @@
         <el-input type="textarea"
                   rows="4"
                   v-model="form.briefIntroduction" />
-        <el-upload class="m-t-10"
+        <el-upload :class="['m-t-10', {disabled: !editing}]"
                    action="#"
                    list-type="picture-card"
                    :on-remove="handlePicRemove"
@@ -89,7 +89,7 @@
         <el-input v-model="form.qrCodeOneName"
                   placeholder="请输入二维码描述" />
 
-        <el-upload class="avatar-uploader m-t-10"
+        <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
@@ -111,7 +111,7 @@
       <el-form-item label="二维码二">
         <el-input v-model="form.qrCodeTwoName"
                   placeholder="请输入二维码描述" />
-        <el-upload class="avatar-uploader m-t-10"
+        <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
@@ -134,7 +134,7 @@
         <el-input v-model="form.qrCodeThreeName"
                   placeholder="请输入二维码描述" />
 
-        <el-upload class="avatar-uploader m-t-10"
+        <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
@@ -351,6 +351,14 @@ export default {
 $upload-width: 140px;
 $upload-height: 140px;
 $upload-lg-height: 150px;
+/deep/.disabled {
+    .el-upload--picture-card {
+        cursor: not-allowed;
+        &:hover {
+            border-color: #c0ccda;
+        }
+    }
+}
 /deep/ .avatar-uploader {
     .el-upload {
         position: relative;
@@ -388,6 +396,15 @@ $upload-lg-height: 150px;
         }
     }
 
+    &.disabled {
+        .el-upload {
+            cursor: not-allowed;
+            &:hover {
+                border-color: #d9d9d9;
+            }
+        }
+    }
+
     &.avatar-uploader-lg {
         .el-upload {
             width: 100%;
diff --git a/src/pages/supplier/manage/basic.vue b/src/pages/supplier/manage/basic.vue
index ff382ee..ef68664 100644
--- a/src/pages/supplier/manage/basic.vue
+++ b/src/pages/supplier/manage/basic.vue
@@ -11,7 +11,7 @@
              size="small"
              :disabled="!editing">
       <el-form-item label="LOGO">
-        <el-upload class="avatar-uploader"
+        <el-upload :class="['avatar-uploader', {disabled: !editing}]"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
@@ -80,7 +80,7 @@
         <el-input type="textarea"
                   rows="4"
                   v-model="form.briefIntroduction" />
-        <el-upload class="m-t-10"
+        <el-upload :class="['m-t-10', {disabled: !editing}]"
                    action="#"
                    list-type="picture-card"
                    :on-remove="handlePicRemove"
@@ -95,7 +95,7 @@
         <el-input v-model="form.qrCodeOneName"
                   placeholder="请输入二维码描述" />
 
-        <el-upload class="avatar-uploader m-t-10"
+        <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
@@ -118,7 +118,7 @@
         <el-input v-model="form.qrCodeTwoName"
                   placeholder="请输入二维码描述" />
 
-        <el-upload class="avatar-uploader m-t-10"
+        <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
@@ -141,7 +141,7 @@
         <el-input v-model="form.qrCodeThreeName"
                   placeholder="请输入二维码描述" />
 
-        <el-upload class="avatar-uploader m-t-10"
+        <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
@@ -395,6 +395,14 @@ export default {
 $upload-width: 140px;
 $upload-height: 140px;
 $upload-lg-height: 150px;
+/deep/.disabled {
+    .el-upload--picture-card {
+        cursor: not-allowed;
+        &:hover {
+            border-color: #c0ccda;
+        }
+    }
+}
 /deep/ .avatar-uploader {
     .el-upload {
         position: relative;
@@ -431,6 +439,14 @@ $upload-lg-height: 150px;
             }
         }
     }
+    &.disabled {
+        .el-upload {
+            cursor: not-allowed;
+            &:hover {
+                border-color: #d9d9d9;
+            }
+        }
+    }
 
     &.avatar-uploader-lg {
         .el-upload {
diff --git a/src/pages/user/detail/index.vue b/src/pages/user/detail/index.vue
index fc4912f..104fb1d 100644
--- a/src/pages/user/detail/index.vue
+++ b/src/pages/user/detail/index.vue
@@ -101,7 +101,7 @@
                          label="类型"
                          align="center">
           <template slot-scope="scope">
-            {{ platformSource.find(e => e.id == scope.row.platformId).name }}
+            {{ scope.row.platformId && platformSource.find(e => e.id == scope.row.platformId).name }}
           </template>
         </el-table-column>
         <el-table-column prop="creditCode"