修改bug

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"a9f62d15-969a-4c2e-92a5-984f5e63c345","timestamp":1745732338402}
+{"id":"b06221d5-3a68-4263-98e8-5555eb084847","timestamp":1745906168684}

.nuxt/manifest/meta/a9f62d15-969a-4c2e-92a5-984f5e63c345.json

@@ -1 +0,0 @@
-{"id":"a9f62d15-969a-4c2e-92a5-984f5e63c345","timestamp":1745732338402,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/b06221d5-3a68-4263-98e8-5555eb084847.json

@@ -0,0 +1 @@
+{"id":"b06221d5-3a68-4263-98e8-5555eb084847","timestamp":1745906168684,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/a9f62d15-969a-4c2e-92a5-984f5e63c345.json"
+        "./manifest/meta/b06221d5-3a68-4263-98e8-5555eb084847.json"
       ],
       "#components": [
         "./components"

.nuxt/types/plugins.d.ts

@@ -17,6 +17,7 @@ type NuxtAppInjections =
   InjectionType<typeof import("../../node_modules/nuxt/dist/pages/runtime/plugins/prefetch.client.js")> &
   InjectionType<typeof import("../../plugins/element-plus.js")> &
   InjectionType<typeof import("../../plugins/request.js")> &
+  InjectionType<typeof import("../../plugins/category")> &
   InjectionType<typeof import("../../plugins/globals.js")> &
   InjectionType<typeof import("../../plugins/pinia.js")>
 

assets/css/public/kefu.less

@@ -1,161 +1,196 @@
 //添加在线客服
 .kefu {
-  bottom: 100px;
-  height: 430px;
-  position: fixed;
-  right: 10px;
-  width: 100px;
-  .kefu_itemKf {
-      background-color: #fff;
-      border-radius: 10px;
-      box-shadow: 0 4px 16px #0000001a;
-      height: 100px;
-      margin-bottom: 15px;
-      text-align: center;
-      width: 100px;
-      box-sizing: border-box;
-      position: relative;
-      cursor: pointer;
-      margin-bottom: 100px;
-      a {
-          >p {
-              color: #666;
-              font-size: 14px;
-              font-weight: 500;
-              line-height: 16px;
-          }
-          >img {
-              margin-top: 15px;
-              width: 50px;
-              height:50px;
-              margin-bottom: 5px;
-          }
-      }
-  }
-  .kefu_itemQQ {
-      background-color: #fff;
-      border-radius: 10px;
-      box-shadow: 0 4px 16px #0000001a;
-      height: 100px;
-      margin-bottom: 15px;
-      text-align: center;
-      width: 100px;
-      box-sizing: border-box;
-      position: relative;
-      cursor: pointer;
-      >p {
-          color: #666;
-          font-size: 14px;
-          font-weight: 500;
-          line-height: 16px;
-      }
-      >img {
-          margin-top: 10px;
-          width: 60px;
-          height: 60px;
-      }
-      &:hover {
-          .kefu_item_content_QQ {
-              display: block;
-          }
-      }
-  }
-  .kefu_itemPhone {
-      background-color: #fff;
-      border-radius: 10px;
-      box-shadow: 0 4px 16px #0000001a;
-      height: 100px;
-      margin-bottom: 15px;
-      text-align: center;
-      width: 100px;
-      box-sizing: border-box;
-      position: relative;
-      cursor: pointer;
-      >p {
-          color: #666;
-          font-size: 14px;
-          font-weight: 500;
-          line-height: 16px;
-      }
-      >img {
-          margin-top: 10px;
-          width: 60px;
-          height: 60px;
-      }
-      &:hover {
-          .kefu_item_content_phone {
-              display: block;
-          }
-      }
-  }
-  .kefu_item_content_QQ {
-      position: absolute;
-      top: -100px;
-      right: 100px;
-      background: #fff;
-      border-radius: 10px;
-      display: none;
-      width: 190px;
-      height: 330px;
-      background: #fff;
-      box-shadow: 0 4px 16px #0000001a;
-      z-index: 99;
-      box-sizing: border-box;
-      padding: 20px;
-      img {
-          margin-bottom: 10px;
-      }
-      .qqfs {
-          margin-bottom: 20px;
-          font-size: 14px;
-          color: #333;
-      }
-      .arrow {
-          width: 0;
-          height: 0;
-          width: 0;
-          border-top: 20px solid transparent;
-          border-bottom: 20px solid transparent; 
-          border-left: 20px solid #fff; 
-          position: absolute;
-          top: 120px;
-          right: -20px;
-          transform: translateX(-50%);
-          z-index: 100;
-      }
-  }
-  .kefu_item_content_phone {
-      position: absolute;
-      top: 0;
-      right: 100px;
-      background: #fff;
-      border-radius: 10px;
-      display: none;
-      width: 190px;
-      height: 80px;
-      background: #fff;
-      box-shadow: 0 4px 16px #0000001a;
-      z-index: 99;
-      box-sizing: border-box;
-      padding: 20px;
-      text-align: left;
-      color: #333;
-      .kefu_item_content_phone_title {
-          margin-bottom: 5px;
-          font-weight: bold;
-      }
-      .arrow {
-          width: 0;
-          height: 0;
-          width: 0;
-          border-top: 20px solid transparent;
-          border-bottom: 20px solid transparent; 
-          border-left: 20px solid #fff; 
-          position: absolute;
-          top: 20px;
-          right: -20px;
-          transform: translateX(-50%);
-          z-index: 100;
-      }
-  }
+    bottom: 100px;
+    height: 430px;
+    position: fixed;
+    right: 10px;
+    width: 100px;
+
+    .kefu_itemKf {
+        background-color: #fff;
+        border-radius: 10px;
+        box-shadow: 0 4px 16px #0000001a;
+        height: 100px;
+        margin-bottom: 15px;
+        text-align: center;
+        width: 100px;
+        box-sizing: border-box;
+        position: relative;
+        cursor: pointer;
+        margin-bottom: 100px;
+
+        a {
+            >p {
+                color: #666;
+                font-size: 14px;
+                font-weight: 500;
+                line-height: 16px;
+            }
+
+            >img {
+                margin-top: 15px;
+                width: 50px;
+                height: 50px;
+                margin-bottom: 5px;
+            }
+        }
+    }
+
+    .kefu_itemQQ {
+        background-color: #fff;
+        border-radius: 10px;
+        box-shadow: 0 4px 16px #0000001a;
+        height: 100px;
+        margin-bottom: 15px;
+        text-align: center;
+        width: 100px;
+        box-sizing: border-box;
+        position: relative;
+        cursor: pointer;
+
+        >p {
+            color: #666;
+            font-size: 14px;
+            font-weight: 500;
+            line-height: 16px;
+        }
+
+        >img {
+            margin-top: 10px;
+            width: 60px;
+            height: 60px;
+        }
+
+        &:hover {
+            .kefu_item_content_QQ {
+                display: block;
+            }
+        }
+    }
+
+    .kefu_itemPhone {
+        background-color: #fff;
+        border-radius: 10px;
+        box-shadow: 0 4px 16px #0000001a;
+        height: 100px;
+        margin-bottom: 15px;
+        text-align: center;
+        width: 100px;
+        box-sizing: border-box;
+        position: relative;
+        cursor: pointer;
+
+        >p {
+            color: #666;
+            font-size: 14px;
+            font-weight: 500;
+            line-height: 16px;
+        }
+
+        >img {
+            margin-top: 10px;
+            width: 60px;
+            height: 60px;
+        }
+
+        &:hover {
+            .kefu_item_content_phone {
+                display: block;
+
+
+            }
+        }
+    }
+
+    .kefu_item_content_QQ {
+        position: absolute;
+        top: -100px;
+        right: 100px;
+        background: #fff;
+        border-radius: 10px;
+        display: none;
+        width: 190px;
+        height: 330px;
+        background: #fff;
+        box-shadow: 0 4px 16px #0000001a;
+        z-index: 99;
+        box-sizing: border-box;
+        padding: 20px;
+
+        img {
+            margin-bottom: 10px;
+        }
+
+
+
+        .arrow {
+            width: 0;
+            height: 0;
+            width: 0;
+            border-top: 20px solid transparent;
+            border-bottom: 20px solid transparent;
+            border-left: 20px solid #fff;
+            position: absolute;
+            top: 120px;
+            right: -20px;
+            transform: translateX(-50%);
+            z-index: 100;
+        }
+
+        .qqadd {
+            height: 150px;
+            position: relative;
+
+            img {
+                width: 100px;
+                height: 100px;
+            }
+
+            .qqfs {
+                margin-bottom: 20px;
+                font-size: 14px;
+                color: #333;
+                position: absolute;
+                top: 110px;
+                left: 0;
+            }
+        }
+    }
+
+    .kefu_item_content_phone {
+        position: absolute;
+        top: 0;
+        right: 100px;
+        background: #fff;
+        border-radius: 10px;
+        display: none;
+        width: 190px;
+        height: 80px;
+        background: #fff;
+        box-shadow: 0 4px 16px #0000001a;
+        z-index: 99;
+        box-sizing: border-box;
+        padding: 20px;
+        text-align: left;
+        color: #333;
+
+        .kefu_item_content_phone_title {
+            margin-bottom: 5px;
+            font-weight: bold;
+        }
+
+        .arrow {
+            width: 0;
+            height: 0;
+            width: 0;
+            border-top: 20px solid transparent;
+            border-bottom: 20px solid transparent;
+            border-left: 20px solid #fff;
+            position: absolute;
+            top: 20px;
+            right: -20px;
+            transform: translateX(-50%);
+            z-index: 100;
+        }
+    }
 }

components/home/kefu.vue

@@ -11,45 +11,45 @@
       <img src="https://img.bjzxtw.org.cn/pre/public/image/qq1.png">
       <p>QQ客服</p>
       <div class="kefu_item_content_QQ">
-          <div @click="addQQFriend(bottomBase.customer_service_qq)" class="qqadd">
-              <img :src="bottomBase.service_qq_img" width="100">
-              <div class="qqfs">{{bottomBase.customer_service_qq}}</div>
-          </div>
-          <div @click="addQQFriend(bottomBase.communications)" class="qqadd">
-              <img :src="bottomBase.communications_img" width="100">
-              <div class="qqfs">{{bottomBase.communications}}</div>
-          </div>
-          <div class="arrow"></div>
+        <div @click="addQQFriend(bottomBase.customer_service_qq)" class="qqadd">
+          <img :src="bottomBase.service_qq_img" width="100" v-if="bottomBase.service_qq_img">
+          <div class="qqfs">{{ bottomBase.customer_service_qq }}</div>
+        </div>
+        <div @click="addQQFriend(bottomBase.communications)" class="qqadd">
+          <img :src="bottomBase.communications_img" width="100" v-if="bottomBase.communications_img">
+          <div class="qqfs">{{ bottomBase.communications }}</div>
+        </div>
+        <div class="arrow"></div>
       </div>
     </div>
     <div class="kefu_itemPhone">
       <img src="https://img.bjzxtw.org.cn/pre/public/image/dianhua1.png">
       <p>电话客服</p>
       <div class="kefu_item_content_phone">
-          <div class="kefu_item_content_phone_title">联系电话：</div>
-          <div>{{bottomBase.customer_service}}</div>
-          <div class="arrow"></div>
+        <div class="kefu_item_content_phone_title">联系电话：</div>
+        <div>{{ bottomBase.customer_service }}</div>
+        <div class="arrow"></div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-  const props = defineProps({
-    bottomBase: {
-      type: Object,
-      required: true
-    }
-  })
-
-  //添加网站客服
-  function addQQFriend(qqNumber) {
-    let qq = qqNumber.match(/\d+/g);
-    // 使用tencent协议唤起QQ客户端并添加好友
-    window.location.href = `tencent://message/?uin=${qq}&Site=&Menu=yes`;
+const props = defineProps({
+  bottomBase: {
+    type: Object,
+    required: true
   }
+})
+
+//添加网站客服
+function addQQFriend(qqNumber) {
+  let qq = qqNumber.match(/\d+/g);
+  // 使用tencent协议唤起QQ客户端并添加好友
+  window.location.href = `tencent://message/?uin=${qq}&Site=&Menu=yes`;
+}
 </script>
 
 <style lang="less" scoped>
-  @import url('@/assets/css/public/kefu.less');
+@import url('@/assets/css/public/kefu.less');
 </style>

pages/[dir]/[dir]/[id].vue

@@ -3,7 +3,7 @@
     <HomePageHead></HomePageHead>
     <!-- 导航栏 -->
     <HomePageNavigation1></HomePageNavigation1>
-    <!-- 列表页广告一 -->
+    <!-- 广告1 -->
     <HomeAdvertising :imgurl="adImg1"></HomeAdvertising>
     <!-- 资讯列表 -->
     <div class="newsDetail">
@@ -38,11 +38,7 @@
                         发布时间: <span>{{ time }}</span>
                     </p>
                 </div>
-                <div 
-                    class="leftBottom" 
-                    v-html="newsDetail.content" 
-                    v-if="newsDetail.content" 
-                    @click="openPreview">
+                <div class="leftBottom" v-html="newsDetail.content" v-if="newsDetail.content" @click="openPreview">
                 </div>
                 <div v-if="previewVisible" class="preview-modal" @click="closePreview">
                     <img :src="selectedImage" alt="Preview">
@@ -57,69 +53,60 @@
                     <div class="index_3_box_vote" v-if="articleChoice">
                         <div class="voteTitle">投票区</div>
                         <div class="inquire">
-                            <p v-if="voteList.length>0">{{voteList[0].survey_name}}</p>
+                            <p v-if="voteList.length > 0">{{ voteList[0].survey_name }}</p>
                             <div class="radioBox">
-                            <!--投票选项-->
-                            <div v-if="!isDisabled">
-                                <div class="radio" v-if="isRadio">
-                                    <el-radio-group v-model="radio1" @change="handleRadioChange">
-                                        <el-radio v-for="item in voteList" :key="item.id" :value="item.id" size="large">
-                                            <span v-if="item.is_other == 0">{{item.choice_name}}</span>
-                                            <span v-else>其他</span>
-                                        </el-radio>
-                                    </el-radio-group>
-                                    <el-input
-                                        v-if="showUserChoice"
-                                        v-model="userChoice"
-                                        :rows="2"
-                                        type="textarea"
-                                        resize="none"
-                                        placeholder="请输入.."
-                                    />
-                                </div>
-                                <div class="checkInputBox" v-else>
-                                    <el-checkbox-group v-model="check1" @change="handleCheckboxChange">
-                                        <span v-for="item in voteList" :key="item.id">
-                                            <span v-if="item.is_other == 0">
-                                                <el-checkbox size="large" :label="item.choice_name" :value="item.id"/>
-                                            </span>
-                                            <span v-else>
-                                                <el-checkbox size="large" label="其他" :value="item.id"/>
+                                <!--投票选项-->
+                                <div v-if="!isDisabled">
+                                    <div class="radio" v-if="isRadio">
+                                        <el-radio-group v-model="radio1" @change="handleRadioChange">
+                                            <el-radio v-for="item in voteList" :key="item.id" :value="item.id"
+                                                size="large">
+                                                <span v-if="item.is_other == 0">{{ item.choice_name }}</span>
+                                                <span v-else>其他</span>
+                                            </el-radio>
+                                        </el-radio-group>
+                                        <el-input v-if="showUserChoice" v-model="userChoice" :rows="2" type="textarea"
+                                            resize="none" placeholder="请输入.." />
+                                    </div>
+                                    <div class="checkInputBox" v-else>
+                                        <el-checkbox-group v-model="check1" @change="handleCheckboxChange">
+                                            <span v-for="item in voteList" :key="item.id">
+                                                <span v-if="item.is_other == 0">
+                                                    <el-checkbox size="large" :label="item.choice_name"
+                                                        :value="item.id" />
+                                                </span>
+                                                <span v-else>
+                                                    <el-checkbox size="large" label="其他" :value="item.id" />
+                                                </span>
                                             </span>
-                                        </span>
-                                    </el-checkbox-group>
-                                    <el-input
-                                        v-if="showUserChoice"
-                                        v-model="userChoice"
-                                        :rows="2"
-                                        type="textarea"
-                                        resize="none"
-                                        placeholder="请输入.."
-                                    />
+                                        </el-checkbox-group>
+                                        <el-input v-if="showUserChoice" v-model="userChoice" :rows="2" type="textarea"
+                                            resize="none" placeholder="请输入.." />
+                                    </div>
                                 </div>
-                            </div>
-                            <!--投票结果-->
-                            <div class="inquireData" v-else>
-                                <div v-for="item in websiteSurveyData.data" :key="item.id">
-                                    <div class="inquireDataItem active" v-if="item.status == 1">
-                                        <div class="inquireDataItemTitle">
-                                            <span v-if="item.choice_name == ''">其他</span>
-                                            <span v-else>{{item.choice_name}}</span>
+                                <!--投票结果-->
+                                <div class="inquireData" v-else>
+                                    <div v-for="item in websiteSurveyData.data" :key="item.id">
+                                        <div class="inquireDataItem active" v-if="item.status == 1">
+                                            <div class="inquireDataItemTitle">
+                                                <span v-if="item.choice_name == ''">其他</span>
+                                                <span v-else>{{ item.choice_name }}</span>
+                                            </div>
+                                            <div class="inquireDataItemNum">{{ item.results }}票</div>
                                         </div>
-                                        <div class="inquireDataItemNum">{{item.results}}票</div>
-                                    </div>
-                                    <div class="inquireDataItem" v-else>
-                                        <div class="inquireDataItemTitle">
-                                            <span v-if="item.choice_name == ''">其他</span>
-                                            <span v-else>{{item.choice_name}}</span>
+                                        <div class="inquireDataItem" v-else>
+                                            <div class="inquireDataItemTitle">
+                                                <span v-if="item.choice_name == ''">其他</span>
+                                                <span v-else>{{ item.choice_name }}</span>
+                                            </div>
+                                            <div class="inquireDataItemNum">{{ item.results }}票</div>
                                         </div>
-                                        <div class="inquireDataItemNum">{{item.results}}票</div>
                                     </div>
                                 </div>
                             </div>
-                            </div>
                             <div class="btn">
-                                <button class="voting" @click="addWebsiteSurvey" :disabled="isDisabled" v-if="!isDisabled">投票</button>
+                                <button class="voting" @click="addWebsiteSurvey" :disabled="isDisabled"
+                                    v-if="!isDisabled">投票</button>
                             </div>
                         </div>
                     </div>
@@ -138,6 +125,8 @@
             </div>
         </div>
     </div>
+    <!-- 广告1 -->
+    <HomeAdvertising :imgurl="adImg2"></HomeAdvertising>
     <!-- 页面底部 -->
     <HomeFoot1></HomeFoot1>
 </template>
@@ -145,7 +134,7 @@
 <script setup>
 //1.页面依赖 start ---------------------------------------->
 import { onMounted } from 'vue'
-import { ElBreadcrumb, ElBreadcrumbItem,ElRadio, ElRadioGroup,ElCheckbox,ElCheckboxGroup,ElMessage,ElInput } from 'element-plus'
+import { ElBreadcrumb, ElBreadcrumbItem, ElRadio, ElRadioGroup, ElCheckbox, ElCheckboxGroup, ElMessage, ElInput } from 'element-plus'
 import { ArrowRight } from '@element-plus/icons-vue'
 //1.页面依赖 end ---------------------------------------->
 
@@ -162,12 +151,12 @@ const getRouteId = await requestDataPromise('/web/getWebsiteRoute', {
         'pinyin': targetSegment,
     },
 });
-if(getRouteId.code == 200){
+if (getRouteId.code == 200) {
     routeId = getRouteId.data.category_id
-}else{
+} else {
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     console.log("错误位置：通过url路径查询导航池id")
-    console.log("后端错误反馈：",getRouteId.message)
+    console.log("后端错误反馈：", getRouteId.message)
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
 }
 //2.页面路径 end ---------------------------------------->
@@ -184,7 +173,7 @@ let getParentNav = async () => {
             'catid': routeId
         },
     });
-    
+
     if (listData.code == 200) {
         parent_name.value = listData.data.alias;
         parent_id.value = listData.data.parent_id;
@@ -214,15 +203,15 @@ const routLevelId = ref("");
 const articleChoice = ref(false);
 //4.5 获取详情
 async function getPageData() {
-    const mkdata =  await requestDataPromise('/web/selectWebsiteArticleInfo', {
+    const mkdata = await requestDataPromise('/web/selectWebsiteArticleInfo', {
         method: 'GET',
         query: {
             'articleid': articleId
         },
     });
-    if(mkdata.code==200){
+    if (mkdata.code == 200) {
         //判断是否显示投票
-        if(mkdata.data.is_survey==1){
+        if (mkdata.data.is_survey == 1) {
             console.log("本篇文章含有投票！")
             articleChoice.value = true;
             getVoteList();
@@ -240,10 +229,10 @@ async function getPageData() {
         } else {
             routeNewsTtitle.value = newsDetail.value.title
         }
-    }else{
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：获取详情内容")
-        console.log("后端错误反馈：",mkdata.message)
+        console.log("后端错误反馈：", mkdata.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
@@ -253,7 +242,8 @@ getPageData();
 
 //5.广告 start ---------------------------------------->
 let adImg1 = ref([]);
-onMounted(async ()  => {
+let adImg2 = ref([]);
+onMounted(async () => {
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
     let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_detail_0001`
@@ -266,17 +256,28 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
+    //广告2
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_detail_0002`
+    const responseAd2 = await fetch(url2, {
+        headers: {
+            'Content-Type': 'application/json',
+            'Userurl': $CwebUrl,
+            'Origin': $CwebUrl
+        }
+    });
+    const resultAd2 = await responseAd2.json();
+    adImg2.value = resultAd2.data[0];
 })
 //5.广告 end ---------------------------------------->
 
 //6.设置seo信息 start---------------------------------------->
-const setData =  await requestDataPromise('/web/selectWebsiteArticleInfo', {
+const setData = await requestDataPromise('/web/selectWebsiteArticleInfo', {
     method: 'GET',
     query: {
         'articleid': articleId
     },
 });
-if(setData.code==200){
+if (setData.code == 200) {
     let seoTitle = setData.data.title;
     let seoDescription = setData.data.introduce;
     let seoKeywords = setData.data.keyword;
@@ -286,12 +287,12 @@ if(setData.code==200){
     useSeoMeta({
         title: seoTitle + "_" + seoName + "_" + seoSuffix,
         meta: [
-            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix , tagPriority: 10 },
-            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
         ]
     });
-}else{
-    console.log("获取广告数据失败！",setData.message)
+} else {
+    console.log("获取广告数据失败！", setData.message)
 }
 //6.设置seo信息 end---------------------------------------->
 
@@ -309,45 +310,45 @@ const websiteSurveyData = ref([]);//投票结果
 
 //7.1获得投票列表
 let voteList = ref([]);
-async function getVoteList(){
-    const voteData = await requestHome('/web/getWebsiteSurvey',{method:'GET',query:{'art_id':articleId}});
+async function getVoteList() {
+    const voteData = await requestHome('/web/getWebsiteSurvey', { method: 'GET', query: { 'art_id': articleId } });
     console.log(778899)
     console.log(voteData)
-    if(voteData.code == 200){
+    if (voteData.code == 200) {
         voteList.value = voteData.data;
         console.log(voteList.value)
         //判断显示单选还是多选
         //survey_type 0是单选 1是多选
-        if(voteData.data[0].survey_type == 0){
+        if (voteData.data[0].survey_type == 0) {
             isRadio.value = true;
             console.log("1111")
-        }else{
+        } else {
             isRadio.value = false;
         }
         //把最后一个的值拿出来 用于判断用户是否选择了其他
-        for(let item of voteData.data){
+        for (let item of voteData.data) {
             //如果含有其他
-            if(item.is_other==1){
+            if (item.is_other == 1) {
                 userIsChoice.value = item.id;
             }
         }
         //用户投票属于哪一篇文章
         userSurId.value = voteData.data[0].sur_id;
 
-    }else{
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：首页投票")
-        console.log("后端错误反馈：",voteData.message)
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->") 
+        console.log("后端错误反馈：", voteData.message)
+        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
 
 
 //7.2当用户选择了选项，判断是否展示其他输入框
 const handleRadioChange = (value) => {
-    if(value == userIsChoice.value){
+    if (value == userIsChoice.value) {
         showUserChoice.value = true;
-    }else{
+    } else {
         showUserChoice.value = false;
     }
 }
@@ -361,37 +362,37 @@ const handleCheckboxChange = (value) => {
 }
 
 //7.3发起投票
-async function addWebsiteSurvey(){
+async function addWebsiteSurvey() {
     //判断当前是单选还是多选
     console.log(isRadio.value)
-    if(isRadio.value){
+    if (isRadio.value) {
         console.log("用户单选！")
-        if(radio1.value!=''){
+        if (radio1.value != '') {
             //先判断一下是否使用了其他选项
-            if(showUserChoice.value){
-                if(userChoice.value!=''){
+            if (showUserChoice.value) {
+                if (userChoice.value != '') {
                     //文章id
                     // console.log(userSurId.value)
                     // 用户输入的值
                     // console.log(userChoice.value)
                     //如果使用了其他，其他的选项需要增加进去
-                    const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
-                        method:'GET',
-                        query:{
-                            'sur_id':userSurId.value,//投票的新闻id
-                            'choice_name':userChoice.value,//投票的选项id
+                    const ChoiceData = await requestHome('/web/addWebsiteSurveyOption', {
+                        method: 'GET',
+                        query: {
+                            'sur_id': userSurId.value,//投票的新闻id
+                            'choice_name': userChoice.value,//投票的选项id
                         }
                     });
-                    if(ChoiceData.code == 200){
+                    if (ChoiceData.code == 200) {
                         //提交完其他选项以后，再正式发起投票
-                        const mkData = await requestHome('/web/addWebsiteSurveyVote',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,
-                                'choice_id':ChoiceData.data
+                        const mkData = await requestHome('/web/addWebsiteSurveyVote', {
+                            method: 'GET',
+                            query: {
+                                'sur_id': userSurId.value,
+                                'choice_id': ChoiceData.data
                             }
                         });
-                        if(mkData.code == 200){
+                        if (mkData.code == 200) {
                             ElMessage.success('投票成功！')
                             //把投票结果显示到页面上 禁用投票按钮
                             isDisabled.value = true;
@@ -399,80 +400,80 @@ async function addWebsiteSurvey(){
                             //遍历一下，把用户选中的那个设置status为1
                             let data = mkData.data;
                             //遍历一下，把用户选中的那个设置status为1
-                            for(let item of data.data){
-                                for(let i of data.choice){
-                                    if(item.id == i){
+                            for (let item of data.data) {
+                                for (let i of data.choice) {
+                                    if (item.id == i) {
                                         console.log(item.id)
                                         item.status = 1;
                                     }
                                 }
                             }
                             websiteSurveyData.value = data;
-                        }else{
+                        } else {
                             ElMessage.error(mkData.message)
                         }
-                    }else{
+                    } else {
                         ElMessage.error('其他投票失败！')
                     }
-                }else{
+                } else {
                     ElMessage.error('请输入选项内容！')
                 }
-            }else{
+            } else {
                 //如果没选择其他，直接提交选择的内容
-                const mkData = await requestHome('/web/addWebsiteSurveyVote',{
-                    method:'GET',
-                    query:{
-                        'sur_id':userSurId.value,
-                        'choice_id':radio1.value
+                const mkData = await requestHome('/web/addWebsiteSurveyVote', {
+                    method: 'GET',
+                    query: {
+                        'sur_id': userSurId.value,
+                        'choice_id': radio1.value
                     }
                 });
-                if(mkData.code == 200){
+                if (mkData.code == 200) {
                     ElMessage.success('投票成功！')
                     //把投票结果显示到页面上 禁用投票按钮
                     isDisabled.value = true;
                     let data = mkData.data;
                     //遍历一下，把用户选中的那个设置status为1
-                    for(let item of data.data){
-                        for(let i of data.choice){
-                            if(item.id == i){
+                    for (let item of data.data) {
+                        for (let i of data.choice) {
+                            if (item.id == i) {
                                 item.status = 1;
                             }
                         }
                     }
                     websiteSurveyData.value = data;
-                }else{
+                } else {
                     ElMessage.error('投票失败！')
                 }
             }
-        }else{
+        } else {
             ElMessage.error('请选择一个选项')
         }
-    }else{
+    } else {
         console.log("多选！")
         //多选
-        if(check1.value!=[]){
-             //先判断一下是否使用了其他选项
-            if(showUserChoice.value){
-                if(userChoice.value!=''){
+        if (check1.value != []) {
+            //先判断一下是否使用了其他选项
+            if (showUserChoice.value) {
+                if (userChoice.value != '') {
                     //判断用户是否只选择了一个其他
-                    if(check1.value.length == 1){
-                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,//投票的新闻id
-                                'choice_name':userChoice.value,//用户输入的其他选项文字
+                    if (check1.value.length == 1) {
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption', {
+                            method: 'GET',
+                            query: {
+                                'sur_id': userSurId.value,//投票的新闻id
+                                'choice_name': userChoice.value,//用户输入的其他选项文字
                             }
                         });
-                        if(ChoiceData.code == 200){
+                        if (ChoiceData.code == 200) {
                             //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                                method:'GET',
-                                query:{
-                                    'sur_id':userSurId.value,
-                                    'choice_id':ChoiceData.data
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote', {
+                                method: 'GET',
+                                query: {
+                                    'sur_id': userSurId.value,
+                                    'choice_id': ChoiceData.data
                                 }
                             });
-                            if(mkData.code == 200){
+                            if (mkData.code == 200) {
                                 ElMessage.success('投票成功！')
                                 //把投票结果显示到页面上 禁用投票按钮
                                 isDisabled.value = true;
@@ -480,32 +481,32 @@ async function addWebsiteSurvey(){
                                 //遍历一下，把用户选中的那个设置status为1
                                 let data = mkData.data;
                                 //遍历一下，把用户选中的那个设置status为1
-                                for(let item of data.data){
-                                    for(let i of data.choice){
-                                        if(item.id == i){
+                                for (let item of data.data) {
+                                    for (let i of data.choice) {
+                                        if (item.id == i) {
                                             console.log(item.id)
                                             item.status = 1;
                                         }
                                     }
                                 }
                                 websiteSurveyData.value = data;
-                            }else{
+                            } else {
                                 ElMessage.error(mkData.message)
                             }
-                        }else{
+                        } else {
                             ElMessage.error('其他投票失败！')
                         }
 
-                    }else{
+                    } else {
                         //用户选择了除了其他以外，还包括别的选项
-                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,//投票的新闻id
-                                'choice_name':userChoice.value,//用户输入的其他选项文字
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption', {
+                            method: 'GET',
+                            query: {
+                                'sur_id': userSurId.value,//投票的新闻id
+                                'choice_name': userChoice.value,//用户输入的其他选项文字
                             }
                         });
-                        if(ChoiceData.code == 200){
+                        if (ChoiceData.code == 200) {
                             let data = check1.value;
                             //找到多选的数组，把其他默认值给替换掉
                             for (let i = 0; i < data.length; i++) {
@@ -515,15 +516,15 @@ async function addWebsiteSurvey(){
                             }
                             let jsonArray = JSON.stringify(data);
                             //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                                method:'GET',
-                                query:{
-                                    'sur_id':userSurId.value,
-                                    'choice_id':jsonArray
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote', {
+                                method: 'GET',
+                                query: {
+                                    'sur_id': userSurId.value,
+                                    'choice_id': jsonArray
                                 }
                             });
-                            
-                            if(mkData.code == 200){
+
+                            if (mkData.code == 200) {
                                 ElMessage.success('投票成功！')
                                 //把投票结果显示到页面上 禁用投票按钮
                                 isDisabled.value = true;
@@ -531,37 +532,37 @@ async function addWebsiteSurvey(){
                                 //遍历一下，把用户选中的那个设置status为1
                                 let data = mkData.data;
                                 //遍历一下，把用户选中的那个设置status为1
-                                for(let item of data.data){
-                                    for(let i of data.choice){
-                                        if(item.id == i){
+                                for (let item of data.data) {
+                                    for (let i of data.choice) {
+                                        if (item.id == i) {
                                             //console.log(item.id)
                                             item.status = 1;
                                         }
                                     }
                                 }
                                 websiteSurveyData.value = data;
-                            }else{
+                            } else {
                                 ElMessage.error(mkData.message)
                             }
-                        }else{
+                        } else {
                             ElMessage.error('其他投票失败！')
                         }
 
                     }
-                }else{
+                } else {
                     ElMessage.error('请输入选项内容！')
                 }
-            }else{
+            } else {
                 let jsonArray = JSON.stringify(check1.value);
                 //如果没选择其他，直接提交选择的内容
-                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                    method:'GET',
-                    query:{
-                        'sur_id':userSurId.value,
-                        'choice_id':jsonArray
+                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote', {
+                    method: 'GET',
+                    query: {
+                        'sur_id': userSurId.value,
+                        'choice_id': jsonArray
                     }
                 });
-                if(mkData.code == 200){
+                if (mkData.code == 200) {
                     ElMessage.success('投票成功！')
                     //把投票结果显示到页面上 禁用投票按钮
                     isDisabled.value = true;
@@ -569,20 +570,20 @@ async function addWebsiteSurvey(){
                     //遍历一下，把用户选中的那个设置status为1
                     let data = mkData.data;
                     //遍历一下，把用户选中的那个设置status为1
-                    for(let item of data.data){
-                        for(let i of data.choice){
-                            if(item.id == i){
+                    for (let item of data.data) {
+                        for (let i of data.choice) {
+                            if (item.id == i) {
                                 console.log(item.id)
                                 item.status = 1;
                             }
                         }
                     }
                     websiteSurveyData.value = data;
-                }else{
+                } else {
                     ElMessage.error('投票失败！')
                 }
             }
-        }else{
+        } else {
             ElMessage.error('请选择一个选项')
         }
     }

pages/[dir]/[id].vue

@@ -3,9 +3,9 @@
     <HomePageHead></HomePageHead>
     <!-- 导航栏 -->
     <HomePageNavigation1></HomePageNavigation1>
-    <!-- 列表页广告一 -->
+    <!-- 广告1 -->
     <HomeAdvertising :imgurl="adImg1"></HomeAdvertising>
-    
+
     <!-- 资讯列表 -->
     <div class="newsDetail">
         <div class="inner">
@@ -21,7 +21,7 @@
                             <el-breadcrumb-item v-if="parent_children_count > 0">
                                 <NuxtLink :to="`/${parent_pinyin}/index.html`"> {{ parent_name }}</NuxtLink>
                             </el-breadcrumb-item>
-                            <el-breadcrumb-item v-else">
+                            <el-breadcrumb-item v-else>
                                 <NuxtLink :to="`/${parent_pinyin}/list-1.html`"> {{ parent_name }}</NuxtLink>
                             </el-breadcrumb-item>
                             <el-breadcrumb-item>{{ routeNewsTtitle }}</el-breadcrumb-item>
@@ -36,11 +36,7 @@
                         发布时间: <span>{{ time }}</span>
                     </p>
                 </div>
-                <div 
-                    class="leftBottom" 
-                    v-html="newsDetail.content" 
-                    v-if="newsDetail.content" 
-                    @click="openPreview">
+                <div class="leftBottom" v-html="newsDetail.content" v-if="newsDetail.content" @click="openPreview">
                 </div>
                 <div v-if="previewVisible" class="preview-modal" @click="closePreview">
                     <img :src="selectedImage" alt="Preview">
@@ -55,69 +51,60 @@
                     <div class="index_3_box_vote" v-if="articleChoice">
                         <div class="voteTitle">投票区</div>
                         <div class="inquire">
-                            <p v-if="voteList.length>0">{{voteList[0].survey_name}}</p>
+                            <p v-if="voteList.length > 0">{{ voteList[0].survey_name }}</p>
                             <div class="radioBox">
-                            <!--投票选项-->
-                            <div v-if="!isDisabled">
-                                <div class="radio" v-if="isRadio">
-                                    <el-radio-group v-model="radio1" @change="handleRadioChange">
-                                        <el-radio v-for="item in voteList" :key="item.id" :value="item.id" size="large">
-                                            <span v-if="item.is_other == 0">{{item.choice_name}}</span>
-                                            <span v-else>其他</span>
-                                        </el-radio>
-                                    </el-radio-group>
-                                    <el-input
-                                        v-if="showUserChoice"
-                                        v-model="userChoice"
-                                        :rows="2"
-                                        type="textarea"
-                                        resize="none"
-                                        placeholder="请输入.."
-                                    />
-                                </div>
-                                <div class="checkInputBox" v-else>
-                                    <el-checkbox-group v-model="check1" @change="handleCheckboxChange">
-                                        <span v-for="item in voteList" :key="item.id">
-                                            <span v-if="item.is_other == 0">
-                                                <el-checkbox size="large" :label="item.choice_name" :value="item.id"/>
-                                            </span>
-                                            <span v-else>
-                                                <el-checkbox size="large" label="其他" :value="item.id"/>
+                                <!--投票选项-->
+                                <div v-if="!isDisabled">
+                                    <div class="radio" v-if="isRadio">
+                                        <el-radio-group v-model="radio1" @change="handleRadioChange">
+                                            <el-radio v-for="item in voteList" :key="item.id" :value="item.id"
+                                                size="large">
+                                                <span v-if="item.is_other == 0">{{ item.choice_name }}</span>
+                                                <span v-else>其他</span>
+                                            </el-radio>
+                                        </el-radio-group>
+                                        <el-input v-if="showUserChoice" v-model="userChoice" :rows="2" type="textarea"
+                                            resize="none" placeholder="请输入.." />
+                                    </div>
+                                    <div class="checkInputBox" v-else>
+                                        <el-checkbox-group v-model="check1" @change="handleCheckboxChange">
+                                            <span v-for="item in voteList" :key="item.id">
+                                                <span v-if="item.is_other == 0">
+                                                    <el-checkbox size="large" :label="item.choice_name"
+                                                        :value="item.id" />
+                                                </span>
+                                                <span v-else>
+                                                    <el-checkbox size="large" label="其他" :value="item.id" />
+                                                </span>
                                             </span>
-                                        </span>
-                                    </el-checkbox-group>
-                                    <el-input
-                                        v-if="showUserChoice"
-                                        v-model="userChoice"
-                                        :rows="2"
-                                        type="textarea"
-                                        resize="none"
-                                        placeholder="请输入.."
-                                    />
+                                        </el-checkbox-group>
+                                        <el-input v-if="showUserChoice" v-model="userChoice" :rows="2" type="textarea"
+                                            resize="none" placeholder="请输入.." />
+                                    </div>
                                 </div>
-                            </div>
-                            <!--投票结果-->
-                            <div class="inquireData" v-else>
-                                <div v-for="item in websiteSurveyData.data" :key="item.id">
-                                    <div class="inquireDataItem active" v-if="item.status == 1">
-                                        <div class="inquireDataItemTitle">
-                                            <span v-if="item.choice_name == ''">其他</span>
-                                            <span v-else>{{item.choice_name}}</span>
+                                <!--投票结果-->
+                                <div class="inquireData" v-else>
+                                    <div v-for="item in websiteSurveyData.data" :key="item.id">
+                                        <div class="inquireDataItem active" v-if="item.status == 1">
+                                            <div class="inquireDataItemTitle">
+                                                <span v-if="item.choice_name == ''">其他</span>
+                                                <span v-else>{{ item.choice_name }}</span>
+                                            </div>
+                                            <div class="inquireDataItemNum">{{ item.results }}票</div>
                                         </div>
-                                        <div class="inquireDataItemNum">{{item.results}}票</div>
-                                    </div>
-                                    <div class="inquireDataItem" v-else>
-                                        <div class="inquireDataItemTitle">
-                                            <span v-if="item.choice_name == ''">其他</span>
-                                            <span v-else>{{item.choice_name}}</span>
+                                        <div class="inquireDataItem" v-else>
+                                            <div class="inquireDataItemTitle">
+                                                <span v-if="item.choice_name == ''">其他</span>
+                                                <span v-else>{{ item.choice_name }}</span>
+                                            </div>
+                                            <div class="inquireDataItemNum">{{ item.results }}票</div>
                                         </div>
-                                        <div class="inquireDataItemNum">{{item.results}}票</div>
                                     </div>
                                 </div>
                             </div>
-                            </div>
                             <div class="btn">
-                                <button class="voting" @click="addWebsiteSurvey" :disabled="isDisabled" v-if="!isDisabled">投票</button>
+                                <button class="voting" @click="addWebsiteSurvey" :disabled="isDisabled"
+                                    v-if="!isDisabled">投票</button>
                             </div>
                         </div>
                     </div>
@@ -136,6 +123,8 @@
             </div>
         </div>
     </div>
+    <!-- 广告2 -->
+    <HomeAdvertising :imgurl="adImg2"></HomeAdvertising>
     <!-- 页面底部 -->
     <HomeFoot1></HomeFoot1>
 </template>
@@ -143,7 +132,7 @@
 <script setup>
 //1.页面依赖 start ---------------------------------------->
 import { onMounted } from 'vue'
-import { ElBreadcrumb, ElBreadcrumbItem,ElRadio, ElRadioGroup,ElCheckbox,ElCheckboxGroup,ElMessage,ElInput } from 'element-plus'
+import { ElBreadcrumb, ElBreadcrumbItem, ElRadio, ElRadioGroup, ElCheckbox, ElCheckboxGroup, ElMessage, ElInput } from 'element-plus'
 import { ArrowRight } from '@element-plus/icons-vue'
 //1.页面依赖 end ---------------------------------------->
 
@@ -157,9 +146,9 @@ const getRouteId = await requestDataPromise('/web/getWebsiteRoute', {
         'pinyin': targetSegment,
     },
 });
-if(getRouteId.code == 200){
+if (getRouteId.code == 200) {
     routeId = getRouteId.data.category_id
-}else{
+} else {
     console.log("错误位置：获得页面路径")
 }
 //2.页面路径 start ---------------------------------------->
@@ -205,15 +194,15 @@ const routLevelId = ref("");
 const articleChoice = ref(false);
 //4.5 获取详情
 async function getPageData() {
-    const mkdata =  await requestDataPromise('/web/selectWebsiteArticleInfo', {
+    const mkdata = await requestDataPromise('/web/selectWebsiteArticleInfo', {
         method: 'GET',
         query: {
             'articleid': articleId
         },
     });
-    if(mkdata.code==200){
+    if (mkdata.code == 200) {
         //判断是否显示投票
-        if(mkdata.data.is_survey==1){
+        if (mkdata.data.is_survey == 1) {
             console.log("本篇文章含有投票！")
             articleChoice.value = true;
             getVoteList();
@@ -231,7 +220,7 @@ async function getPageData() {
         } else {
             routeNewsTtitle.value = newsDetail.value.title
         }
-    }else{
+    } else {
         console.log("错误位置：获取详情内容")
     }
 }
@@ -240,8 +229,9 @@ getPageData();
 
 //5.广告 start ---------------------------------------->
 let adImg1 = ref([]);
+let adImg2 = ref([]);
 
-onMounted(async ()  => {
+onMounted(async () => {
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
     let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_detail_0001`
@@ -254,17 +244,28 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
+    //广告2
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nmw_detail_0002`
+    const responseAd2 = await fetch(url2, {
+        headers: {
+            'Content-Type': 'application/json',
+            'Userurl': $CwebUrl,
+            'Origin': $CwebUrl
+        }
+    });
+    const resultAd2 = await responseAd2.json();
+    adImg2.value = resultAd2.data[0];
 })
 //5.广告 end ---------------------------------------->
 
 //6.设置seo信息 start---------------------------------------->
-const setData =  await requestDataPromise('/web/selectWebsiteArticleInfo', {
+const setData = await requestDataPromise('/web/selectWebsiteArticleInfo', {
     method: 'GET',
     query: {
         'articleid': articleId
     },
 });
-if(setData.code==200){
+if (setData.code == 200) {
     let seoTitle = setData.data.title;
     let seoDescription = setData.data.introduce;
     let seoKeywords = setData.data.keyword;
@@ -274,14 +275,14 @@ if(setData.code==200){
     useSeoMeta({
         title: seoTitle + "_" + seoName + "_" + seoSuffix,
         meta: [
-            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix , tagPriority: 10 },
-            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+            { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+            { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
         ]
     });
-}else{
+} else {
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     console.log("错误位置：设置详情页面SEO数据")
-    console.log("后端错误反馈：",setData.message)
+    console.log("后端错误反馈：", setData.message)
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
 }
 //6.设置seo信息 end---------------------------------------->
@@ -300,45 +301,45 @@ const websiteSurveyData = ref([]);//投票结果
 
 //7.2获得投票列表
 let voteList = ref([]);
-async function getVoteList(){
-    const voteData = await requestHome('/web/getWebsiteSurvey',{method:'GET',query:{'art_id':articleId}});
+async function getVoteList() {
+    const voteData = await requestHome('/web/getWebsiteSurvey', { method: 'GET', query: { 'art_id': articleId } });
     console.log(778899)
     console.log(voteData)
-    if(voteData.code == 200){
+    if (voteData.code == 200) {
         voteList.value = voteData.data;
         console.log(voteList.value)
         //判断显示单选还是多选
         //survey_type 0是单选 1是多选
-        if(voteData.data[0].survey_type == 0){
+        if (voteData.data[0].survey_type == 0) {
             isRadio.value = true;
             console.log("1111")
-        }else{
+        } else {
             isRadio.value = false;
         }
         //把最后一个的值拿出来 用于判断用户是否选择了其他
-        for(let item of voteData.data){
+        for (let item of voteData.data) {
             //如果含有其他
-            if(item.is_other==1){
+            if (item.is_other == 1) {
                 userIsChoice.value = item.id;
             }
         }
         //用户投票属于哪一篇文章
         userSurId.value = voteData.data[0].sur_id;
 
-    }else{
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置：首页投票")
-        console.log("后端错误反馈：",voteData.message)
-        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->") 
+        console.log("后端错误反馈：", voteData.message)
+        console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
 
 
 //7.3当用户选择了选项，判断是否展示其他输入框
 const handleRadioChange = (value) => {
-    if(value == userIsChoice.value){
+    if (value == userIsChoice.value) {
         showUserChoice.value = true;
-    }else{
+    } else {
         showUserChoice.value = false;
     }
 }
@@ -352,37 +353,37 @@ const handleCheckboxChange = (value) => {
 }
 
 //7.4发起投票
-async function addWebsiteSurvey(){
+async function addWebsiteSurvey() {
     //判断当前是单选还是多选
     console.log(isRadio.value)
-    if(isRadio.value){
+    if (isRadio.value) {
         console.log("用户单选！")
-        if(radio1.value!=''){
+        if (radio1.value != '') {
             //先判断一下是否使用了其他选项
-            if(showUserChoice.value){
-                if(userChoice.value!=''){
+            if (showUserChoice.value) {
+                if (userChoice.value != '') {
                     //文章id
                     // console.log(userSurId.value)
                     // 用户输入的值
                     // console.log(userChoice.value)
                     //如果使用了其他，其他的选项需要增加进去
-                    const ChoiceData = await requestHome('/web/addWebsiteSurveyOption',{
-                        method:'GET',
-                        query:{
-                            'sur_id':userSurId.value,//投票的新闻id
-                            'choice_name':userChoice.value,//投票的选项id
+                    const ChoiceData = await requestHome('/web/addWebsiteSurveyOption', {
+                        method: 'GET',
+                        query: {
+                            'sur_id': userSurId.value,//投票的新闻id
+                            'choice_name': userChoice.value,//投票的选项id
                         }
                     });
-                    if(ChoiceData.code == 200){
+                    if (ChoiceData.code == 200) {
                         //提交完其他选项以后，再正式发起投票
-                        const mkData = await requestHome('/web/addWebsiteSurveyVote',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,
-                                'choice_id':ChoiceData.data
+                        const mkData = await requestHome('/web/addWebsiteSurveyVote', {
+                            method: 'GET',
+                            query: {
+                                'sur_id': userSurId.value,
+                                'choice_id': ChoiceData.data
                             }
                         });
-                        if(mkData.code == 200){
+                        if (mkData.code == 200) {
                             ElMessage.success('投票成功！')
                             //把投票结果显示到页面上 禁用投票按钮
                             isDisabled.value = true;
@@ -390,80 +391,80 @@ async function addWebsiteSurvey(){
                             //遍历一下，把用户选中的那个设置status为1
                             let data = mkData.data;
                             //遍历一下，把用户选中的那个设置status为1
-                            for(let item of data.data){
-                                for(let i of data.choice){
-                                    if(item.id == i){
+                            for (let item of data.data) {
+                                for (let i of data.choice) {
+                                    if (item.id == i) {
                                         console.log(item.id)
                                         item.status = 1;
                                     }
                                 }
                             }
                             websiteSurveyData.value = data;
-                        }else{
+                        } else {
                             ElMessage.error(mkData.message)
                         }
-                    }else{
+                    } else {
                         ElMessage.error('其他投票失败！')
                     }
-                }else{
+                } else {
                     ElMessage.error('请输入选项内容！')
                 }
-            }else{
+            } else {
                 //如果没选择其他，直接提交选择的内容
-                const mkData = await requestHome('/web/addWebsiteSurveyVote',{
-                    method:'GET',
-                    query:{
-                        'sur_id':userSurId.value,
-                        'choice_id':radio1.value
+                const mkData = await requestHome('/web/addWebsiteSurveyVote', {
+                    method: 'GET',
+                    query: {
+                        'sur_id': userSurId.value,
+                        'choice_id': radio1.value
                     }
                 });
-                if(mkData.code == 200){
+                if (mkData.code == 200) {
                     ElMessage.success('投票成功！')
                     //把投票结果显示到页面上 禁用投票按钮
                     isDisabled.value = true;
                     let data = mkData.data;
                     //遍历一下，把用户选中的那个设置status为1
-                    for(let item of data.data){
-                        for(let i of data.choice){
-                            if(item.id == i){
+                    for (let item of data.data) {
+                        for (let i of data.choice) {
+                            if (item.id == i) {
                                 item.status = 1;
                             }
                         }
                     }
                     websiteSurveyData.value = data;
-                }else{
+                } else {
                     ElMessage.error('投票失败！')
                 }
             }
-        }else{
+        } else {
             ElMessage.error('请选择一个选项')
         }
-    }else{
+    } else {
         console.log("多选！")
         //多选
-        if(check1.value!=[]){
-             //先判断一下是否使用了其他选项
-            if(showUserChoice.value){
-                if(userChoice.value!=''){
+        if (check1.value != []) {
+            //先判断一下是否使用了其他选项
+            if (showUserChoice.value) {
+                if (userChoice.value != '') {
                     //判断用户是否只选择了一个其他
-                    if(check1.value.length == 1){
-                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,//投票的新闻id
-                                'choice_name':userChoice.value,//用户输入的其他选项文字
+                    if (check1.value.length == 1) {
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption', {
+                            method: 'GET',
+                            query: {
+                                'sur_id': userSurId.value,//投票的新闻id
+                                'choice_name': userChoice.value,//用户输入的其他选项文字
                             }
                         });
-                        if(ChoiceData.code == 200){
+                        if (ChoiceData.code == 200) {
                             //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                                method:'GET',
-                                query:{
-                                    'sur_id':userSurId.value,
-                                    'choice_id':ChoiceData.data
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote', {
+                                method: 'GET',
+                                query: {
+                                    'sur_id': userSurId.value,
+                                    'choice_id': ChoiceData.data
                                 }
                             });
-                            if(mkData.code == 200){
+                            if (mkData.code == 200) {
                                 ElMessage.success('投票成功！')
                                 //把投票结果显示到页面上 禁用投票按钮
                                 isDisabled.value = true;
@@ -471,32 +472,32 @@ async function addWebsiteSurvey(){
                                 //遍历一下，把用户选中的那个设置status为1
                                 let data = mkData.data;
                                 //遍历一下，把用户选中的那个设置status为1
-                                for(let item of data.data){
-                                    for(let i of data.choice){
-                                        if(item.id == i){
+                                for (let item of data.data) {
+                                    for (let i of data.choice) {
+                                        if (item.id == i) {
                                             console.log(item.id)
                                             item.status = 1;
                                         }
                                     }
                                 }
                                 websiteSurveyData.value = data;
-                            }else{
+                            } else {
                                 ElMessage.error(mkData.message)
                             }
-                        }else{
+                        } else {
                             ElMessage.error('其他投票失败！')
                         }
 
-                    }else{
+                    } else {
                         //用户选择了除了其他以外，还包括别的选项
-                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption',{
-                            method:'GET',
-                            query:{
-                                'sur_id':userSurId.value,//投票的新闻id
-                                'choice_name':userChoice.value,//用户输入的其他选项文字
+                        const ChoiceData = await requestDataPromise('/web/addWebsiteSurveyOption', {
+                            method: 'GET',
+                            query: {
+                                'sur_id': userSurId.value,//投票的新闻id
+                                'choice_name': userChoice.value,//用户输入的其他选项文字
                             }
                         });
-                        if(ChoiceData.code == 200){
+                        if (ChoiceData.code == 200) {
                             let data = check1.value;
                             //找到多选的数组，把其他默认值给替换掉
                             for (let i = 0; i < data.length; i++) {
@@ -506,15 +507,15 @@ async function addWebsiteSurvey(){
                             }
                             let jsonArray = JSON.stringify(data);
                             //提交完其他选项以后，再正式发起投票
-                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                                method:'GET',
-                                query:{
-                                    'sur_id':userSurId.value,
-                                    'choice_id':jsonArray
+                            const mkData = await requestDataPromise('/web/addWebsiteSurveyVote', {
+                                method: 'GET',
+                                query: {
+                                    'sur_id': userSurId.value,
+                                    'choice_id': jsonArray
                                 }
                             });
-                            
-                            if(mkData.code == 200){
+
+                            if (mkData.code == 200) {
                                 ElMessage.success('投票成功！')
                                 //把投票结果显示到页面上 禁用投票按钮
                                 isDisabled.value = true;
@@ -522,37 +523,37 @@ async function addWebsiteSurvey(){
                                 //遍历一下，把用户选中的那个设置status为1
                                 let data = mkData.data;
                                 //遍历一下，把用户选中的那个设置status为1
-                                for(let item of data.data){
-                                    for(let i of data.choice){
-                                        if(item.id == i){
+                                for (let item of data.data) {
+                                    for (let i of data.choice) {
+                                        if (item.id == i) {
                                             //console.log(item.id)
                                             item.status = 1;
                                         }
                                     }
                                 }
                                 websiteSurveyData.value = data;
-                            }else{
+                            } else {
                                 ElMessage.error(mkData.message)
                             }
-                        }else{
+                        } else {
                             ElMessage.error('其他投票失败！')
                         }
 
                     }
-                }else{
+                } else {
                     ElMessage.error('请输入选项内容！')
                 }
-            }else{
+            } else {
                 let jsonArray = JSON.stringify(check1.value);
                 //如果没选择其他，直接提交选择的内容
-                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote',{
-                    method:'GET',
-                    query:{
-                        'sur_id':userSurId.value,
-                        'choice_id':jsonArray
+                const mkData = await requestDataPromise('/web/addWebsiteSurveyVote', {
+                    method: 'GET',
+                    query: {
+                        'sur_id': userSurId.value,
+                        'choice_id': jsonArray
                     }
                 });
-                if(mkData.code == 200){
+                if (mkData.code == 200) {
                     ElMessage.success('投票成功！')
                     //把投票结果显示到页面上 禁用投票按钮
                     isDisabled.value = true;
@@ -560,20 +561,20 @@ async function addWebsiteSurvey(){
                     //遍历一下，把用户选中的那个设置status为1
                     let data = mkData.data;
                     //遍历一下，把用户选中的那个设置status为1
-                    for(let item of data.data){
-                        for(let i of data.choice){
-                            if(item.id == i){
+                    for (let item of data.data) {
+                        for (let i of data.choice) {
+                            if (item.id == i) {
                                 console.log(item.id)
                                 item.status = 1;
                             }
                         }
                     }
                     websiteSurveyData.value = data;
-                }else{
+                } else {
                     ElMessage.error('投票失败！')
                 }
             }
-        }else{
+        } else {
             ElMessage.error('请选择一个选项')
         }
     }

pages/index.vue

@@ -548,6 +548,8 @@ const boxData9data2 = ref([]);
 const boxData10 = ref([]);
 const boxData10data2 = ref([]);
 
+const { $pageNav } = useNuxtApp();
+
 //4.3获得导航数据
 try {
     const navigateData = await requestDataPromise('/web/getWebsiteModelCategory', {
@@ -570,25 +572,25 @@ try {
             };
             //渲染标题
             //1 农业生产372
-            if (navigateData.data[index].category_id == 372) { pageData.value[0] = data }
+            if (navigateData.data[index].category_id == $pageNav[0]) { pageData.value[0] = data }
             //2 三农资讯445 499
-            if (navigateData.data[index].category_id == 499) { pageData.value[1] = data }
+            if (navigateData.data[index].category_id == $pageNav[1]) { pageData.value[1] = data }
             //3 市场行情377
-            if (navigateData.data[index].category_id == 377) { pageData.value[2] = data }
+            if (navigateData.data[index].category_id == $pageNav[2]) { pageData.value[2] = data }
             //4 商贸信息375
-            if (navigateData.data[index].category_id == 375) { pageData.value[3] = data }
+            if (navigateData.data[index].category_id == $pageNav[3]) { pageData.value[3] = data }
             //5 农民生活373
-            if (navigateData.data[index].category_id == 373) { pageData.value[4] = data }
+            if (navigateData.data[index].category_id == $pageNav[4]) { pageData.value[4] = data }
             //6 法治天地432
-            if (navigateData.data[index].category_id == 432) { pageData.value[5] = data }
+            if (navigateData.data[index].category_id == $pageNav[5]) { pageData.value[5] = data }
             //7 招商引资431
-            if (navigateData.data[index].category_id == 431) { pageData.value[6] = data }
+            if (navigateData.data[index].category_id == $pageNav[6]) { pageData.value[6] = data }
             //8 农知农技374
-            if (navigateData.data[index].category_id == 374) { pageData.value[7] = data }
+            if (navigateData.data[index].category_id == $pageNav[7]) { pageData.value[7] = data }
             //9 农民合作社433
-            if (navigateData.data[index].category_id == 433) { pageData.value[8] = data }
+            if (navigateData.data[index].category_id == $pageNav[8]) { pageData.value[8] = data }
             //10 新农村11
-            if (navigateData.data[index].category_id == 748) { pageData.value[9] = data }
+            if (navigateData.data[index].category_id == $pageNav[9]) { pageData.value[9] = data }
         }
     } else {
         console.log("获取导航池出错！", navigateData.message)
@@ -598,16 +600,16 @@ try {
 }
 
 let getJson = [
-    { "parent": "372,2,12", "child": "" },//模块1 农业生产372
-    { "parent": "499,1,4", "child": "" },//模块2 三农资讯328
-    { "parent": "377,1,4", "child": "" },//模块3 市场行情377
-    { "parent": "375,1,10", "child": "" },//模块4 商贸信息375
-    { "parent": "373,1,8", "child": "" },//模块5 农民生活373
-    { "parent": "432,3,11", "child": "" },//模块6 法治天地432
-    { "parent": "431,4,4", "child": "" },//模块7 招商引资431
-    { "parent": "374,1,5", "child": "" },//模块8 农知农技374
-    { "parent": "433,1,5", "child": "" },//模块9 农民合作社433
-    { "parent": "748,1,5", "child": "" },//模块10 新农村11 748
+    { "parent": $pageNav[0] + ",2,12", "child": "" },//模块1 农业生产372
+    { "parent": $pageNav[1] + ",1,4", "child": "" },//模块2 三农资讯328
+    { "parent": $pageNav[2] + ",1,4", "child": "" },//模块3 市场行情377
+    { "parent": $pageNav[3] + ",1,10", "child": "" },//模块4 商贸信息375
+    { "parent": $pageNav[4] + ",1,8", "child": "" },//模块5 农民生活373
+    { "parent": $pageNav[5] + ",3,11", "child": "" },//模块6 法治天地432
+    { "parent": $pageNav[6] + ",4,4", "child": "" },//模块7 招商引资431
+    { "parent": $pageNav[7] + ",1,5", "child": "" },//模块8 农知农技374
+    { "parent": $pageNav[8] + ",1,5", "child": "" },//模块9 农民合作社433
+    { "parent": $pageNav[9] + ",1,5", "child": "" },//模块10 新农村11 748
 ]
 
 let jsonString = JSON.stringify(getJson);
@@ -654,8 +656,8 @@ async function getPageAllData() {
         });
         mkdata.data[5].textnum.forEach((item, index) => {
             if (index < 6) {
-                boxData6data3.value.push(item); 
-            } else{
+                boxData6data3.value.push(item);
+            } else {
                 boxData6data4.value.push(item);
             }
         })

plugins/category.ts

@@ -0,0 +1,34 @@
+
+//master 环境
+const navMaster: number[] = [
+    372,
+    499,
+    377,
+    375,
+    373,
+    432,
+    431,
+    374,
+    433,
+    748
+]
+
+const navPre: number[] = [
+    372,
+    328,
+    377,
+    375,
+    373,
+    426,
+    425,
+    374,
+    427,
+    491
+]
+
+export default defineNuxtPlugin((nuxtApp) => {
+    //master 环境
+    // nuxtApp.provide('pageNav', navMaster)
+    //pre 环境
+    nuxtApp.provide('pageNav', navPre)
+})

plugins/globals.js

@@ -1,16 +1,17 @@
 export default defineNuxtPlugin((nuxtApp) => {
   //农民网Pre环境
-  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://pre.nmwwt.org')
-  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('userUrl', 'http://localhost:3002')
+  nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
+  nuxtApp.provide('CwebUrl', 'http://pre.nmwwt.org')
+  nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
+  nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
+  nuxtApp.provide('userUrl', 'http://localhost:3002')
 
   //农民网正式环境
-  nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  nuxtApp.provide('CwebUrl', 'http://nw.nmwwt.org')
-  nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
-  nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3002')
+  // nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+  // nuxtApp.provide('CwebUrl', 'http://nw.nmwwt.org')
+  // nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+  // nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+  // nuxtApp.provide('userUrl', 'http://localhost:3002')
 
   //Dev环境
   // nuxtApp.provide('webUrl', 'http://apidev.bjzxtw.org.cn')

plugins/request.js

@@ -6,11 +6,11 @@ export default defineNuxtPlugin(nuxtApp => {
 
     let Url = {
         //正式环境
-        webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
-        CwebUrl: 'nw.nmwwt.org/' //页面地址
+        // webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
+        // CwebUrl: 'nw.nmwwt.org/' //页面地址
         //pre环境
-        // webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
-        // CwebUrl: 'pre.nmwwt.org' //页面地址
+        webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
+        CwebUrl: 'pre.nmwwt.org' //页面地址
     }
 
     const service = axios.create({