Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/layout/components/Navbar.vue

@@ -111,7 +111,7 @@
         </div>
       </el-tooltip>
 
-      <div class="left-menu" style="margin-right: 12px">
+      <div class="left-menu" v-if="organNameList && organNameList.length > 0">
         <el-popover
           placement="top-start"
           width="300"
@@ -135,7 +135,7 @@
           </span>
         </el-popover>
       </div>
-      <el-dropdown class="avatar-container" trigger="hover">
+      <el-dropdown class="avatar-container" trigger="hover" style="margin-left: 12px">
         <div class="avatar-wrapper">
           <img
             v-if="$store.getters.avatar"
@@ -397,7 +397,7 @@ export default {
   mounted() {
     // 手动加入
     this.toggleSideBar();
-    this.organNameList = this.organName.split(",") || [];
+    this.organNameList = this.organName ? this.organName.split(",") : [];
   },
   methods: {
     toggleSideBar() {
@@ -463,6 +463,8 @@ export default {
             this.$store.commit('commit_technician',[])
             this.$store.commit('commit_roles',[])
             this.$store.commit('commit_employs',[])
+            // 移除
+            localStorage.removeItem('searchs')
           }
         }
       })

src/views/contentManager/contentOperation.vue

@@ -55,9 +55,10 @@
         <!-- <el-form-item v-if="type == 3 || type == 6 || type == 5 || type == 8" label="链接地址">
           <el-input v-model.trim="form.linkUrl"></el-input>
         </el-form-item> -->
+        <!-- :rules='[{ required: type == 3 || type == 6 || type == 5 || type == 8 ? false : true, message: "请输入链接地址", trigger: "blur" }]' -->
         <el-form-item label="链接地址"
                       prop="linkUrl"
-                      :rules='[{ required: type == 3 || type == 6 || type == 5 || type == 8 ? false : true, message: "请输入链接地址", trigger: "blur" }]'>
+                      >
           <el-input v-model.trim="form.linkUrl"></el-input>
         </el-form-item>
 
@@ -122,7 +123,9 @@
                class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
           <p class="imageSize"
-             v-if="imageSize">上传图片尺寸为：{{ imageSize }}</p>
+             v-if="imageSize">
+             <template v-if="type == 4 || type == 5 || type == 6 || type == 7">上传图片尺寸为：</template>
+             {{ imageSize }}</p>
         </el-form-item>
         <!-- 广告管理才有时长 -->
         <el-form-item label="显示时长(秒)"
@@ -435,7 +438,7 @@ export default {
         coverImage: null,
         videoCoverImage: null,
         attribute1: null, // 时长
-        linkUrl: url,
+        linkUrl: null,
         subjectIdList: null, // 声部编号
         type: query.type,
         status: 1,
@@ -476,7 +479,7 @@ export default {
         coverImage: null,
         videoCoverImage: null,
         attribute1: null,
-        linkUrl: url,
+        linkUrl: null,
         type: query.type,
         subjectIdList: null,
         status: 1,
@@ -699,7 +702,7 @@ export default {
         coverImage: null,
         videoCoverImage: null,
         attribute1: null,
-        linkUrl: url,
+        linkUrl: null,
         type: query.type,
         status: 1,
         content: null,