修改bug

修改bug

src/utils/auth.js

@@ -4,6 +4,7 @@ const TokenKey = 'Admin-Token'
 const useUrl = 'Back-Url'
 const useType = 'use-Type'
 const expTime = 'exp-time'
+const webStieId = 'web-siteid'
 
 //1.设置token
 export function getToken() {
@@ -43,6 +44,10 @@ export function getUseType() {
   return Cookies.get(useType)
 }
 
+export function getWebSiteId() {
+  return Cookies.get(webStieId)
+}
+
 export function removUseType() {
   return Cookies.remove(useType)
 }

src/views/menu/menulist.vue

@@ -65,7 +65,7 @@
           <el-form-item label="父级菜单名称" :label-width="formLabelWidth" prop="pid_arr" class="custom-align-right" v-if="radio === '2'">
             <el-cascader :key="parentKey" v-model="form.pid_arr" :props="{checkStrictly:true}" :options="pidArrData" clearable></el-cascader>
           </el-form-item>
-          <el-form-item label="默认图标" :label-width="formLabelWidth" prop="icon" class="custom-align-right">
+          <el-form-item label="默认图标" :label-width="formLabelWidth" prop="icon" class="custom-align-right" v-if="radio == '1'">
              <!--图片上传组件 start ------------------------------------------------------------>
               <div class="uploaderBox">
                 <div class="avatar-upload-container" @mouseenter="hovering = true" @mouseleave="hovering = false">
@@ -88,7 +88,7 @@
               </div>
               <!--图片上传组件 end ------------------------------------------------------------>
           </el-form-item>
-          <el-form-item label="选中时图标" :label-width="formLabelWidth" prop="selected_icon" class="custom-align-right">
+          <el-form-item label="选中时图标" :label-width="formLabelWidth" prop="selected_icon" class="custom-align-right" v-if="radio == '1'">
             <!--图片上传组件 start ------------------------------------------------------------>
             <div class="uploaderBox">
               <div class="avatar-upload-container" @mouseenter="hoveringTwo = true" @mouseleave="hoveringTwo = false">

src/views/news/creatNews.vue

@@ -16,7 +16,6 @@
             <el-input v-model="form.title" autocomplete="off" placeholder="请输入资讯标题"></el-input>
             <el-checkbox v-model="form.islink">是否使用外链</el-checkbox>
           </el-form-item>
-
           <div v-if="creatNews_user_type!=10000"> 
             <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
               <el-cascader :key="parentKey" v-model="form.cat_arr_id" placeholder="请选择要绑定的导航池名称" :props="parentData" filterable clearable></el-cascader>
@@ -24,27 +23,16 @@
             <el-form-item label="外链地址：" prop="linkurl" class="custom-align-right">
               <el-input v-model="form.linkurl" autocomplete="off" placeholder="请输入外链地址"></el-input>
             </el-form-item>
-            <el-form-item label="作者：" prop="author" class="custom-align-right">
-              <el-input v-model="form.author" autocomplete="off" placeholder="请输入作者"></el-input>
-            </el-form-item>
           </div>
-
-
-
           <div>
             <div v-if="creatNews_user_type==10000">
-                  
-                  <el-form-item label="站点名称:" prop="cat_arr_id" class="custom-align-right">
-                        <el-cascader :key="parentKey" v-model="form.web_site_id" placeholder="请选择站点名称" :options="creatNews_nav_pool_arr" @change="creatNews_nav_pool_change_fun(form.web_site_id)" filterable clearable></el-cascader>
-                  </el-form-item>  
-
-                   
-                   <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
-                        <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的父级导航" :props="parentData_2" filterable clearable></el-cascader>
-                  </el-form-item>  
-                  
+              <el-form-item label="站点名称:" prop="cat_arr_id" class="custom-align-right">
+                  <el-cascader :key="parentKey" v-model="form.web_site_id" placeholder="请选择站点名称" :options="creatNews_nav_pool_arr" @change="creatNews_nav_pool_change_fun(form.web_site_id)" filterable clearable></el-cascader>
+              </el-form-item>
+                <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
+                  <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的父级导航" :props="parentData_2" filterable clearable></el-cascader>
+              </el-form-item>
             </div>
-
             <el-form-item label="推荐等级：" class="custom-align-right" >
               <el-select v-model="form.level" clearable placeholder="请选择推荐等级..">
                 <el-option label="头条" :value="1"></el-option>
@@ -70,24 +58,7 @@
                     </div>
                   </div>
                 </el-upload>
-              </div>
-            </el-form-item>
-            <el-form-item label="缩略图：" class="custom-align-right" v-else>
-              <div class="uploaderBox">
-                <el-upload class="avatar-uploader" action="#" :show-file-list="false" :before-upload="beforeAvatarUpload">
-                  <!-- <img v-if="imgUrl" :src="imgUrl" class="avatar">
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->
-                  <!-- 预览图片 -->
-                  <img v-if="imgUrl" :src="imgUrl" class="avatar">
-                  <!-- 上传图标 -->
-                  <!-- <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->
-                  <div v-else class="chooseImgDiv">
-                    <div>
-                      <img src="@/assets/public/upload/noImage.png">
-                      <div>选择图片</div>
-                    </div>
-                  </div>
-                </el-upload>
+                <input type="hidden" v-model="form.imgurl">
               </div>
             </el-form-item>
             <el-form-item label="资讯关键词：" prop="keyword" class="custom-align-right">
@@ -189,7 +160,9 @@
             <el-form-item label=""   class="custom-align-right">
               <div v-for="(input, index) in inputList" :key="index">
                  <div class="formLabelFloatBox">
-                  <el-input autocomplete="off" v-model="input.value" maxlength="150" :label-width="formLabelWidth"  placeholder="">  <template slot="prepend">{{ index+1 }}</template></el-input>
+                  <el-input autocomplete="off" v-model="input.value" maxlength="150" :label-width="formLabelWidth"  placeholder="">  
+                    <template slot="prepend">{{ index+1 }}</template>
+                  </el-input>
                   <el-button type="info" icon="el-icon-plus" circle size="mini" @click="addInput(index)" class="formLabeladdIcon"></el-button>
                   <el-button type="info" icon="el-icon-delete" circle size="mini" @click="deleteInput(index)"  class="formLabelDelIcon"></el-button>
                 </div>  
@@ -240,7 +213,7 @@ export default {
     //0.全局操作 start ------------------------------------------------------------>
     //表单验证
     const validateEmpty = (rule,value,callback) => {
-      if (value.length == 0) {
+      if (value == '') {
         callback(new Error('该项不能为空！'))
       } else {
         callback()
@@ -253,6 +226,13 @@ export default {
         callback()
       }
     }
+    const validateRadio = (rule,value,callback) => {
+      if (value!='1'||value!='0') {
+        callback()
+      } else {
+        callback()
+      }
+    }
     let self = this;
     //0.全局操作 end ------------------------------------------------------------>
     return {
@@ -268,16 +248,11 @@ export default {
       tableDivTitle:"添加资讯",
       disclaimer:true,//免责声明
       //提交表单
-
       creatNews_user_type:0,//判断用户类型'
-
       form: {
-
-            user_type:"??",//判断用户类型'
-            cat_arr_id:0,//导航池名称
-            nav_add_pool_id:[],//导航池子级
-
-
+        user_type:"??",//判断用户类型'
+        cat_arr_id:0,//导航池名称
+        nav_add_pool_id:[],//导航池子级
         //1.1使用了外链
         title: '',//资讯标题
         islink:0,//是否使用外链 0非 1是
@@ -303,13 +278,8 @@ export default {
       },
       //1.2 表单验证规则
       formRules: {
-
-
-
-            //导航池名称不能为空
-            cat_arr_id:[{required:true,trigger:'blur',validator:validateArray}],
-            
-
+        //导航池名称不能为空
+        cat_arr_id:[{required:true,trigger:'blur',validator:validateArray}],
         //资讯名称不能为空
         title:[{required:true,trigger:'blur',validator:validateEmpty}],
         //如果使用了外链，外链地址不能为空
@@ -327,7 +297,7 @@ export default {
         //作者不能为空
         author:[{required:true,trigger:'blur',validator:validateEmpty}],
         //是否原创不能为空
-        is_original:[{required:true,trigger:'blur',validator:validateEmpty}],
+        is_original:[{required:true,trigger:'blur',validator:validateRadio}],
         //来源名称和地址不能为空
         copyfrom:[{required:true,trigger:'blur',validator:validateEmpty}],
         fromurl:[{required:true,trigger:'blur',validator:validateEmpty}],
@@ -335,11 +305,11 @@ export default {
         imgUrl:[{required:true,trigger:'blur',validator:validateEmpty}],
         level:[{required:true,trigger:'blur',validator:validateEmpty}],
         //是否开启投票
-        is_survey:[{required:true,trigger:'blur',validator:validateEmpty}],
+        is_survey:[{required:true,trigger:'blur',validator:validateRadio}],
         //问卷标题
         survey_name:[{required:true,trigger:'blur',validator:validateEmpty}],
         //选项
-        survey_type:[{required:true,trigger:'blur',validator:validateEmpty}],
+        survey_type:[{required:true,trigger:'blur',validator:validateRadio}],
       },
       //1.3富文本编辑器配置
       showHtml: false, //用于保存源码内容
@@ -387,7 +357,6 @@ export default {
       imgUrl:"",//在页面上显示缩略图
       //获取父级导航池
       parentKey:0,//获取父级导航
-
       parentData: {
         checkStrictly: true,
         lazy: true,
@@ -528,7 +497,7 @@ export default {
         if(this.checked){
           inputLists.push(allowList);
         }
-        if(inputLists.length<3){
+        if(inputLists.length<=2){
           this.$message.error('投票答案必须大于2条');
           return;
         }
@@ -639,7 +608,6 @@ export default {
         }else{  
           this.form.islink = false;
         }
-
         //不是原创的时候显示来源
         if(res.data.is_original==1){
           this.form.is_original = 1;
@@ -653,18 +621,28 @@ export default {
           this.form.copyfrom = res.data.copyfrom;
           this.form.linkurl = res.data.linkurl;
         }
+        //回显站点名称
+        console.log(778899)
 
 
 
 
-
-        this.form.web_site_id=res.data.web_site_id    //站点名称
- 
+        this.form.web_site_id = res.data.web_site_id    //站点名称
         this.form.cat_arr_id = Array.isArray(res.data.cat_arr_id) ? res.data.cat_arr_id : JSON.parse(res.data.cat_arr_id);
-         
+        console.log(this.form.cat_arr_id)
+
+
+
+        //回显导航池 连同非管理员得一起刷新
         this.parentKey += 1; // 触发级联选择器重新加载
         this.loadCascaderPath(this.form.cat_arr_id); // 加载路径数据
+        this.parentKey_2 += 1; // 触发级联选择器重新加载
+        this.loadCascaderPath(this.form.cat_arr_id); // 加载路径数据
+
 
+
+        
+        //回显其他数据
         this.form.level = res.data.level;
         this.form.imgurl = res.data.imgurl;
         this.imgUrl = res.data.imgurl;
@@ -688,7 +666,6 @@ export default {
             }else{
               this.checked = true
             }
-          
           });
         }else{
           this.inputList.push({"value":""});
@@ -738,7 +715,7 @@ export default {
         if(this.checked){
           inputLists.push(allowList);
         }
-        if(inputLists.length<3){
+        if(inputLists.length<2){
           this.$message.error('投票答案必须大于2条');
           return;
         }