Kaynağa Gözat

修改bug

修改bug
dangyunlong 3 ay önce
ebeveyn
işleme
1121a87193
3 değiştirilmiş dosya ile 245 ekleme ve 209 silme
  1. 11 2
      src/store/modules/user.js
  2. 15 10
      src/utils/auth.js
  3. 219 197
      src/views/news/creatNews.vue

+ 11 - 2
src/store/modules/user.js

@@ -1,5 +1,5 @@
 import { login, logout, getInfo, getMenu ,getImgCode,updateUserAvatarNickname } from '@/api/user'
-import { getToken, setToken, setUserUrl, removeToken ,removUserUrl,getUserUrl,getUseType,removUseType,setUseType,setWebSiteId,getExp,setExp,removeExp } from '@/utils/auth'
+import { getToken, setToken, setUserUrl, removeToken ,removUserUrl,getUserUrl,getUseType,removUseType,setUseType,getExp,setExp,removeExp,setWebSiteId,getWebSiteId,removeWebSiteId } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
 import axios from 'axios'
 
@@ -14,6 +14,7 @@ const state = {
   userurl: getUserUrl(),
   usertype: getUseType(),
   exp:getExp(),
+  websiteid:getWebSiteId(),
 }
 
 const mutations = {
@@ -47,6 +48,9 @@ const mutations = {
   SET_EXP: (state, exp) => {
     state.exp = exp
   },
+  SET_WEBSITEID: (state, websiteid) => {
+    state.websiteid = websiteid
+  },
   // 退出登录逻辑直接放在 mutations 中
   LOGOUT(state) {
     state.token = '';
@@ -144,9 +148,14 @@ const actions = {
         //设置用户等级
         commit('SET_USE_TYPE',data.type_id)
         setUseType(data.type_id,state.exp)
-        setWebSiteId(data.sszq,state.exp)
         console.log(data.type_id)
         console.log(state.exp)
+        //设置用户网站
+
+        console.log(123456789)
+        console.log(data.website_id)
+        commit('SET_WEBSITEID',data.website_id)
+        setWebSiteId(data.website_id,state.exp)
 
         resolve(data)
       }).catch(error => {

+ 15 - 10
src/utils/auth.js

@@ -4,7 +4,7 @@ const TokenKey = 'Admin-Token'
 const useUrl = 'Back-Url'
 const useType = 'use-Type'
 const expTime = 'exp-time'
-const webStieId = 'web-siteid'
+const webStieId = 'website-id'
 
 //1.设置token
 export function getToken() {
@@ -40,19 +40,10 @@ export function setUseType(url,exp) {
   return Cookies.set(useType, url, { expires: expdays })
 }
 
-export function setWebSiteId(siteid,exp) {
-      const expdays = convertSecondsToDays(exp)
-      return Cookies.set(webStieId, siteid, { expires: expdays })
-}
-
 export function getUseType() {
   return Cookies.get(useType)
 }
 
-export function getWebSiteId() {
-      return Cookies.get(webStieId)
-}
-    
 export function removUseType() {
   return Cookies.remove(useType)
 }
@@ -71,6 +62,20 @@ export function removeExp() {
   return Cookies.remove(expTime)
 }
 
+//网站id
+export function setWebSiteId(id,exp) {
+  const expdays = convertSecondsToDays(exp)
+  return Cookies.set(webStieId, id, { expires: expdays })
+}
+
+export function getWebSiteId() {
+  return Cookies.get(webStieId)
+}
+
+export function removeWebSiteId() {
+  return Cookies.remove(webStieId)
+}
+
 //5.把秒转换成天
 function convertSecondsToDays(seconds) {
   return seconds/(60*60*24); //1天=60秒*60分钟*24小时

+ 219 - 197
src/views/news/creatNews.vue

@@ -16,162 +16,176 @@
             <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>
+          <div v-if="form.islink==true"> 
+            <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.cat_arr_id" placeholder="请选择要绑定的导航池名称" :props="parentData" filterable clearable></el-cascader>
+            </el-form-item> -->
             <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>
+          <div v-if="form.islink==false">
+            <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>
               </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>
-                <el-option label="轮播图" :value="2"></el-option>
-                <el-option label="推荐图" :value="3"></el-option>
-                <el-option label="热点资讯" :value="4"></el-option>
-                <el-option label="资讯推荐" :value="5"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="缩略图:" class="custom-align-right" prop="imgUrl" v-if="form.level==2||form.level==3">
-              <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">
-              <template #label>
-                <span class="askBox">
-                  资讯关键词:
-                  <el-tooltip class="item" effect="dark" content="资讯关键词,如:三农市场网、全国三农、信息一体化。" placement="top">
-                    <i class="el-icon-question"></i>
-                  </el-tooltip>
-                </span>
-              </template>
-              <el-input v-model="form.keyword" autocomplete="off" placeholder="请输入资讯关键词"></el-input>
-            </el-form-item>
-            <el-form-item label="资讯描述:" prop="introduce" class="custom-align-right">
-              <template #label>
-                <span class="askBox">
-                  资讯描述:
-                  <el-tooltip class="item" effect="dark" content="资讯描述,如:中国三农市场网创建以来,社会效益和会员经济效益贡献。" placement="top">
-                    <i class="el-icon-question"></i>
-                  </el-tooltip>
-                </span>
-              </template>
-              <el-input type="textarea" v-model="form.introduce" class="custom-textarea" placeholder="请输入资讯描述"></el-input>
-            </el-form-item>
-            <div class="QuillTitle">
-              <span>* </span>资讯内容:
-              <div @click="toggleSourceMode" class="QuillModelBtn">
-                {{ showHtml ? '切换到编辑模式' : '切换到源码模式' }}
+            <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>
               </div>
-            </div>
-            <el-form-item label="" prop="content">
-              <div class="editor-container">
-                <div v-if="showHtml">
-                  <textarea v-model="editorHtml" style="width: 100%; height: 400px;"></textarea>
+              <el-form-item label="推荐等级:" class="custom-align-right" >
+                <el-select v-model="form.level" clearable placeholder="请选择推荐等级..">
+                  <el-option label="头条" :value="1"></el-option>
+                  <el-option label="轮播图" :value="2"></el-option>
+                  <el-option label="推荐图" :value="3"></el-option>
+                  <el-option label="热点资讯" :value="4"></el-option>
+                  <el-option label="资讯推荐" :value="5"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="缩略图:" class="custom-align-right" prop="imgUrl" v-if="form.level==2||form.level==3">
+                <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>
-                <div v-else>
-                  <quill-editor ref="quillEditor" v-model="form.content" :options="editorOptions" class="my-quill-editor"/>
+              </el-form-item>
+              <el-form-item label="资讯关键词:" prop="keyword" class="custom-align-right">
+                <template #label>
+                  <span class="askBox">
+                    资讯关键词:
+                    <el-tooltip class="item" effect="dark" content="资讯关键词,如:三农市场网、全国三农、信息一体化。" placement="top">
+                      <i class="el-icon-question"></i>
+                    </el-tooltip>
+                  </span>
+                </template>
+                <el-input v-model="form.keyword" autocomplete="off" placeholder="请输入资讯关键词"></el-input>
+              </el-form-item>
+              <el-form-item label="资讯描述:" prop="introduce" class="custom-align-right">
+                <template #label>
+                  <span class="askBox">
+                    资讯描述:
+                    <el-tooltip class="item" effect="dark" content="资讯描述,如:中国三农市场网创建以来,社会效益和会员经济效益贡献。" placement="top">
+                      <i class="el-icon-question"></i>
+                    </el-tooltip>
+                  </span>
+                </template>
+                <el-input type="textarea" v-model="form.introduce" class="custom-textarea" placeholder="请输入资讯描述"></el-input>
+              </el-form-item>
+              <div class="QuillTitle">
+                <span>* </span>资讯内容:
+                <div @click="toggleSourceMode" class="QuillModelBtn">
+                  {{ showHtml ? '切换到编辑模式' : '切换到源码模式' }}
                 </div>
-                <!-- 多图上传隐藏的input -->
-                <input type="file" ref="multiFileInput" @change="handleMultipleFiles" multiple hidden accept="image/jpeg, image/png" />
               </div>
-            </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>
-            <el-form-item label="浏览量:" class="custom-align-right">
-              <el-input v-model="form.hits" autocomplete="off" placeholder="请输入浏览量"></el-input>
-            </el-form-item>
-            <el-form-item label="是否为原创:" prop="is_original" class="custom-align-right">
-              <el-radio-group v-model="form.is_original" @change="changeIsOriginal">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <div v-if="form.is_original==0">
-              <el-form-item label="来源名称:" prop="copyfrom" class="custom-align-right">
-                <el-input v-model="form.copyfrom" autocomplete="off" placeholder="请输入来源名称"></el-input>
+              <el-form-item label="" prop="content">
+                <div class="editor-container">
+                  <div v-if="showHtml">
+                    <textarea v-model="editorHtml" style="width: 100%; height: 400px;"></textarea>
+                  </div>
+                  <div v-else>
+                    <quill-editor ref="quillEditor" v-model="form.content" :options="editorOptions" class="my-quill-editor"/>
+                  </div>
+                  <!-- 多图上传隐藏的input -->
+                  <input type="file" ref="multiFileInput" @change="handleMultipleFiles" multiple hidden accept="image/jpeg, image/png" />
+                </div>
+              </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>
-              <el-form-item label="来源链接:" prop="fromurl" class="custom-align-right">
-                <el-input v-model="form.fromurl" autocomplete="off" placeholder="请输入来源链接"></el-input>
+              <el-form-item label="浏览量:" class="custom-align-right">
+                <el-input v-model="form.hits" autocomplete="off" placeholder="请输入浏览量"></el-input>
               </el-form-item>
-              <div class="disclaimerBox">
-                <div class="disclaimerTitle">
-                  <img src="@/assets/public/check.png"/>同意《免责声明》:
-                  <!-- <el-checkbox v-model="disclaimer" disabled="disabled"></el-checkbox> -->
+              <el-form-item label="是否为原创:" prop="is_original" class="custom-align-right">
+                <el-radio-group v-model="form.is_original" @change="changeIsOriginal">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <div v-if="form.is_original==0">
+                <el-form-item label="来源名称:" prop="copyfrom" class="custom-align-right">
+                  <el-input v-model="form.copyfrom" autocomplete="off" placeholder="请输入来源名称"></el-input>
+                </el-form-item>
+                <el-form-item label="来源链接:" prop="fromurl" class="custom-align-right">
+                  <el-input v-model="form.fromurl" autocomplete="off" placeholder="请输入来源链接"></el-input>
+                </el-form-item>
+                <div class="disclaimerBox">
+                  <div class="disclaimerTitle">
+                    <img src="@/assets/public/check.png"/>同意《免责声明》:
+                    <!-- <el-checkbox v-model="disclaimer" disabled="disabled"></el-checkbox> -->
+                  </div>
+                  <div class="disclaimerText">本文来源于网络转载,仅供学习交流使用,不构成商业目的。版权归原作者所有,如涉及作品内容、版权和其他问题,请在30日内与本站联系,我们将在第一时间处理。</div>
                 </div>
-                <div class="disclaimerText">本文来源于网络转载,仅供学习交流使用,不构成商业目的。版权归原作者所有,如涉及作品内容、版权和其他问题,请在30日内与本站联系,我们将在第一时间处理。</div>
               </div>
-            </div>
-            <div v-if="form.is_original==1">
-              <el-form-item label="来源名称:" prop="copyfrom" class="custom-align-right">
-                <el-input v-model="form.copyfrom" autocomplete="off" placeholder="请输入来源名称" disabled="disabled"></el-input>
+              <div v-if="form.is_original==1">
+                <el-form-item label="来源名称:" prop="copyfrom" class="custom-align-right">
+                  <el-input v-model="form.copyfrom" autocomplete="off" placeholder="请输入来源名称" disabled="disabled"></el-input>
+                </el-form-item>
+              </div>
+              <el-form-item label="资讯状态:" class="custom-align-right" style="width: 100%;">
+                <el-select v-model="form.status" placeholder="请选择..">
+                  <el-option label="已发布" :value="1"></el-option>
+                  <el-option label="待发布" :value="0"></el-option>
+                </el-select>
               </el-form-item>
+              <el-form-item label="是否开启投票:" prop="is_survey" class="custom-align-right">
+                <el-radio-group v-model="form.is_survey" >
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <div v-if="form.is_survey==1">
+                <el-form-item label="问卷标题:" prop="survey_name" class="custom-align-right">
+                  <el-input v-model="form.survey_name" autocomplete="off" placeholder="请输入问卷标题"></el-input>
+                </el-form-item>
+                <el-form-item label="选项:" prop="survey_type" class="custom-align-right">
+                  <el-radio-group v-model="form.survey_type" >
+                    <el-radio :label="0">单选</el-radio>
+                    <el-radio :label="1">多选</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <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-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>  
+                  </div>
+                </el-form-item>
+                <el-form-item label=""  class="custom-align-right">
+                    <el-checkbox v-model="checked">允许用户自己填写</el-checkbox>
+                </el-form-item>
+              </div>
             </div>
-
-            <el-form-item label="资讯状态:" class="custom-align-right" style="width: 100%;">
-              <el-select v-model="form.status" placeholder="请选择..">
-                <el-option label="已发布" :value="1"></el-option>
-                <el-option label="待发布" :value="0"></el-option>
-              </el-select>
-            </el-form-item>
-           
-            <el-form-item label="是否开启投票:" prop="is_survey" class="custom-align-right">
-              <el-radio-group v-model="form.is_survey" >
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <div v-if="form.is_survey==1">
-            <el-form-item label="问卷标题:" prop="survey_name" class="custom-align-right">
-              <el-input v-model="form.survey_name" autocomplete="off" placeholder="请输入问卷标题"></el-input>
-            </el-form-item>
-            <el-form-item label="选项:" prop="survey_type" class="custom-align-right">
-              <el-radio-group v-model="form.survey_type" >
-                <el-radio :label="0">单选</el-radio>
-                <el-radio :label="1">多选</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <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-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>  
-            </div>
-          </el-form-item>
-          <el-form-item label=""  class="custom-align-right">
-                <el-checkbox v-model="checked">允许用户自己填写</el-checkbox>
-            </el-form-item>
-          </div>
           </div>
         </div>
       </el-form>
@@ -368,12 +382,13 @@ export default {
           console.log(level)
           let parentId = level == 0 ? 0 : data.value
           let parames = {
+            'website_id':getWebSiteId(),
             'pid':parentId
           }
-          self.$store.dispatch('pool/categoryList',parames).then(res=> {
+          self.$store.dispatch('pool/get_creatNews_nav_son_actions',parames).then(res=> {
             if (res.data) {
               const nodes = res.data.map(item => ({
-                value: item.id,
+                value: item.category_id,
                 label: item.name,
                 leaf: level >= 3,
                 children: []
@@ -403,9 +418,8 @@ export default {
           }
           
           let parames = {
-            'website_id':self.form.web_site_id ?self.form.web_site_id :self.websiteid,
+            'website_id':self.websiteid,
             'pid':parentId
-            
           }
            
           self.$store.dispatch('pool/get_creatNews_nav_son_actions',parames).then(res=> {
@@ -413,7 +427,7 @@ export default {
             if (res.data) {
               const nodes = res.data.map(item => ({
                 value: item.category_id,
-                label: item.name,
+                label: item.alias,
                 leaf: level >= 3,
                 children: []
               }))
@@ -485,24 +499,28 @@ export default {
     },
     //1.2 提交表单
     addToServe(){
-      if(this.form.is_survey==1){
-        const hasEmptyInput = this.inputList.some(input => input.value === '');
-        if (hasEmptyInput) {
-          // 如果有输入框为空,弹出提示信息
-          this.$message.error('请确保所有输入框都有内容');
-          return;
-        }
-        const inputLists = this.inputList.map(input => input.value);
-        const allowList = [this.checked?1:0,""];
-        if(this.checked){
-          inputLists.push(allowList);
-        }
-        if(inputLists.length<=2){
-          this.$message.error('投票答案必须大于2条');
-          return;
+
+      if(this.form.islink==false){
+        if(this.form.is_survey==1){
+          const hasEmptyInput = this.inputList.some(input => input.value === '');
+          if (hasEmptyInput) {
+            // 如果有输入框为空,弹出提示信息
+            this.$message.error('请确保所有输入框都有内容');
+            return;
+          }
+          const inputLists = this.inputList.map(input => input.value);
+          const allowList = [this.checked?1:0,""];
+          if(this.checked){
+            inputLists.push(allowList);
+          }
+          if(inputLists.length<=2){
+            this.$message.error('投票答案必须大于2条');
+            return;
+          }
+          this.form.suvey_array = JSON.stringify(inputLists);
         }
-        this.form.suvey_array = JSON.stringify(inputLists);
       }
+
       // console.log('提交的数据:', this.inputList.map(input => input.value));
       // this.form.suvey_array
       // return false;
@@ -622,14 +640,26 @@ export default {
           this.form.linkurl = res.data.linkurl;
         }
         //回显站点名称
+        console.log(778899)
+
+
+
+
         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;
@@ -659,12 +689,7 @@ export default {
           this.inputList.push({"value":""});
         }
         console.log( this.inputList)
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '网络错误,请重试!'
-        });
-      });
+      })
     },
     async loadCascaderPath(path) {
       for (let i = 0; i < path.length; i++) {
@@ -689,27 +714,29 @@ export default {
     },
     //1.3提交修改
     editToServe(){
-      //提交之前先判断是否为外链
-      //如果使用了外链,清理掉除了外链以外的内容
-      if(this.form.is_survey==1){
-        const hasEmptyInput = this.inputList.some(input => input.value === '');
-        if (hasEmptyInput) {
-          // 如果有输入框为空,弹出提示信息
-          this.$message.error('请确保所有输入框都有内容');
-          return;
-        }
-        const inputLists = this.inputList.map(input => input.value);
-        const allowList = [this.checked?1:0,""];
-        if(this.checked){
-          inputLists.push(allowList);
-        }
-        if(inputLists.length<2){
-          this.$message.error('投票答案必须大于2条');
-          return;
+
+      //不使用外联 验证投票逻辑
+      if(this.form.islink==false){
+        if(this.form.is_survey==1){
+          const hasEmptyInput = this.inputList.some(input => input.value === '');
+          if (hasEmptyInput) {
+            // 如果有输入框为空,弹出提示信息
+            this.$message.error('请确保所有输入框都有内容');
+            return;
+          }
+          const inputLists = this.inputList.map(input => input.value);
+          const allowList = [this.checked?1:0,""];
+          if(this.checked){
+            inputLists.push(allowList);
+          }
+          if(inputLists.length<2){
+            this.$message.error('投票答案必须大于2条');
+            return;
+          }
+          this.form.suvey_array = JSON.stringify(inputLists);
         }
-        this.form.suvey_array = JSON.stringify(inputLists);
       }
-    
+
       console.log(this.form)
       if(this.form.islink==1){
         this.cleatForm(1)
@@ -948,23 +975,18 @@ export default {
 
       },
  
-
-
-
-
-
-
   },
 
   mounted(){
-      this.creatNews_user_type = getUseType()
-      this.websiteid= getWebSiteId()
-
-      this.get_creatNews_form_id_fun()//
-      this.get_creatNews_nav_pool_arr_fun()//
- 
+    this.creatNews_user_type = getUseType()
+    this.websiteid= getWebSiteId()
 
+    console.log(123456)
+    console.log(this.websiteid)
 
+    this.get_creatNews_form_id_fun()//
+    this.get_creatNews_nav_pool_arr_fun()//
+ 
     //1.判断是新建还是回显
     if(this.$route.query.id!=undefined){
       this.editId = this.$route.query.id;