Bläddra i källkod

增加沟通简历功能

Jing 1 dag sedan
förälder
incheckning
8e72c50b35

+ 1 - 1
.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"d19c34dd-ac34-4094-9894-59efeb49f139","timestamp":1753257069775}
+{"id":"c6d0f38f-112b-48d5-96f6-67c14b6b4c38","timestamp":1754035082712}

+ 1 - 0
.nuxt/manifest/meta/c6d0f38f-112b-48d5-96f6-67c14b6b4c38.json

@@ -0,0 +1 @@
+{"id":"c6d0f38f-112b-48d5-96f6-67c14b6b4c38","timestamp":1754035082712,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/d19c34dd-ac34-4094-9894-59efeb49f139.json

@@ -1 +0,0 @@
-{"id":"d19c34dd-ac34-4094-9894-59efeb49f139","timestamp":1753257069775,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 1
.nuxt/nuxt.d.ts

@@ -1,6 +1,6 @@
 // Generated by nuxi
-/// <reference types="@nuxt/telemetry" />
 /// <reference types="@nuxt/devtools" />
+/// <reference types="@nuxt/telemetry" />
 /// <reference path="types/builder-env.d.ts" />
 /// <reference types="nuxt" />
 /// <reference path="types/app-defaults.d.ts" />

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/d19c34dd-ac34-4094-9894-59efeb49f139.json"
+        "./manifest/meta/c6d0f38f-112b-48d5-96f6-67c14b6b4c38.json"
       ],
       "#components": [
         "./components"

+ 207 - 2
assets/css/job/detail_jianli.less

@@ -60,6 +60,210 @@
       }
 }
 
+.contact_me {
+      width: 1200px;
+      margin: 30px auto;
+      height: 70px;
+
+      .contact_me_btn {
+            width: 127px;
+            height: 45px;
+            line-height: 45px;
+            background-color: #255590;
+            color: #fff;
+            border-radius: 4px;
+            font-size: 16px;
+            border: none;
+            cursor: pointer;
+
+            .contact_me_btn_img {
+                  display: inline-block;
+                  width: 18px;
+                  height: 18px;
+                  background-image: url('@/public/images/comments.png');
+                  vertical-align: -4px;
+                  margin-left: 20px;
+            }
+      }
+
+      .contact_me_btn_2 {
+            background-color: #ccc;
+            cursor: default;
+      }
+}
+
+.cruit_alert_rgb {
+      position: fixed;
+      width: 100%;
+      height: 100%;
+      left: 0px;
+      top: 0px;
+      z-index: 1111;
+      background: rgba(0, 0, 0, 0.2);
+
+      .cruit_alert_rgb_box {
+            width: 836px;
+            background: #fff;
+            border-radius: 20px;
+            position: absolute;
+            left: 50%;
+            top: 20%;
+            z-index: 1112;
+            margin-left: -418px;
+      }
+
+      .cruit_alert_rgb_head_box {
+            height: 29px;
+            margin-top: 24px;
+            position: relative;
+      }
+
+      .cruit_alert_rgb_head {
+            height: 29px;
+            line-height: 29px;
+            color: #333;
+            font-size: 20px;
+            text-align: center;
+            font-weight: bold;
+            position: relative;
+
+            .close {
+                  position: absolute;
+                  font-weight: 400;
+                  right: 45px;
+                  top: -5px;
+                  font-size: 25px;
+                  width: 20px;
+                  height: 20px;
+                  cursor: pointer;
+            }
+      }
+
+      .cruit_alert_rgb_close {
+            width: 26px;
+            height: 26px;
+            position: absolute;
+            top: 0px;
+            right: 24px;
+      }
+
+      .cruit_alert_rgb_form {
+            display: block;
+            width: 760px;
+            margin: 30px auto 0;
+      }
+
+      .cruit_alert_rgb_form_in {
+            width: 100%;
+            height: 243px;
+            overflow: auto;
+      }
+
+      .cruit_alert_rgb_li {
+            float: left;
+            background: #FBFBFB;
+            border-top: solid 5px #255590;
+            border-radius: 4px;
+            width: 230px;
+            margin-bottom: 20px;
+            padding: 15px 0px 20px 10px;
+            box-sizing: border-box;
+      }
+
+      .cruit_alert_rgb_li:nth-of-type(3n-1) {
+            margin-left: 33px;
+      }
+
+      .cruit_alert_rgb_li:nth-of-type(3n) {
+            float: right;
+      }
+
+      .cruit_alert_rgb_li:nth-of-type(6n-0) {
+            border-top: solid 5px #DF9A2B;
+      }
+
+      .cruit_alert_rgb_li:nth-of-type(6n-1) {
+            border-top: solid 5px #DF9A2B;
+      }
+
+      .cruit_alert_rgb_li:nth-of-type(6n-2) {
+            border-top: solid 5px #DF9A2B;
+      }
+
+      .cruit_alert_rgb_label {
+            float: right;
+            height: 21px;
+            line-height: 21px;
+            color: #333;
+            font-size: 16px;
+            margin-left: 0px;
+            font-weight: bold;
+            width: 180px;
+            padding-right: 15px;
+            margin-top: 5px;
+      }
+
+      .cruit_alert_rgb_checkbox {
+            float: left;
+            border: 0px;
+            display: block;
+            width: 0px;
+            height: 0px;
+            position: relative;
+            margin: 4px 0px 0px 20px;
+            background: rgba(0, 0, 0, 0);
+            border: none;
+      }
+
+      .cruit_alert_rgb_checkbox::after {
+            content: '';
+            display: block;
+            position: absolute;
+            border: solid 1px #C8CFD2;
+            border-radius: 2px;
+            width: 15px;
+            height: 15px;
+            left: 0px;
+            top: 0px;
+            z-index: 11;
+      }
+
+      input[type="checkbox"]:checked.cruit_alert_rgb_checkbox::after {
+            border: 0px;
+      }
+
+      input[type="checkbox"]:checked.cruit_alert_rgb_checkbox::before {
+            content: '';
+            display: block;
+            position: absolute;
+            background: url(../public/img/4.png) no-repeat 1px 1px #255590;
+            background-size: 13px 13px;
+            border-radius: 2px;
+            width: 15px;
+            height: 15px;
+            left: 0px;
+            top: 0px;
+            z-index: 11;
+      }
+
+      .cruit_alert_rgb_foot {
+            text-align: center;
+      }
+
+      .cruit_alert_rgb_foot_sub {
+            display: inline-block;
+            text-align: right;
+            color: #fff;
+            font-size: 14px;
+            margin: 20px auto 40px;
+            border-radius: 4px;
+            height: 30px;
+            line-height: 30px;
+            background: #255590;
+            padding: 0px 15px;
+      }
+}
+
 a {
       color: #666666;
 }
@@ -70,10 +274,11 @@ a {
 
 .gerenjianli {
       width: 100%;
-      height: 250px;
+      min-height: 250px;
       background-color: #fbfbfb;
 }
-.index_1{
+
+.index_1 {
       width: 1200px;
       margin: 0 auto;
 }

+ 2 - 0
components/home/pageHead.vue

@@ -211,6 +211,8 @@ let goAdvertising = () => {
 
 //点击商圈
 let goTopic = () => {
+    //本地启动商圈服务
+    // window.open('/topic', '_blank');
     if (getToken()) {
         window.open($CwebUrl + '/topic', '_blank');
     } else {

+ 91 - 3
components/job/detail_jobHunting.vue

@@ -82,10 +82,21 @@
                     <img class="index_1_right_img" src="@/public/image/touxiang.png" title="" alt=""
                         v-if="!jobInfo.imgurl">
                     <img class="index_1_right_img" :src="jobInfo.imgurl" title="" alt="" v-if="jobInfo.imgurl">
-
                 </div>
             </section>
             <!-- 个人简历 -->
+            <div class="contact_me" v-if="type_id==3">
+                <div class="contact_me_btn" @click="getContactMe">
+                    <span class="contact_me_btn_img"></span>
+                    沟通简历
+                </div>
+            </div>
+            <div class="contact_me" v-else>
+                <div class="contact_me_btn contact_me_btn_2">
+                    <span class="contact_me_btn_img"></span>
+                    沟通简历
+                </div>
+            </div>
         </main>
 
         <main class="jianli" v-if="type == 2">
@@ -206,13 +217,41 @@
                 </div>
             </section>
             <!-- 联系方式 -->
+            <!-- 弹框 -->
+            <section class="cruit_alert_rgb clearfix" v-if="resumeBool">
+                <!-- 请选择要投递的简历1 -->
+                <div class="cruit_alert_rgb_box">
+                    <div class="cruit_alert_rgb_head_box">
+                        <div class="cruit_alert_rgb_close hand back100"></div>
+                        <div class="cruit_alert_rgb_head">请选择要沟通的岗位
+                            <span class="close" @click="resumeBool = false">x</span>
+                        </div>
+                    </div>
+                    <form class="cruit_alert_rgb_form clearfix" action=" " method=" ">
+                        <div class="cruit_alert_rgb_form_in clearfix">
+                            <div class="cruit_alert_rgb_li clearfix" v-for="(item, index) in companyJobList"
+                                :key="item.id">
+                                <el-radio :value="item.id" v-model="company_job" @change="jobChange">
+                                    <div class="cruit_alert_rgb_label dot1">
+                                        {{ item.title }}
+                                    </div>
+                                </el-radio>
+                            </div>
+                        </div>
+                        <div class="cruit_alert_rgb_foot clearfix">
+                            <div class="cruit_alert_rgb_foot_sub hand" @click="getresume">沟通岗位</div>
+                        </div>
+                    </form>
+                </div>
+                <!-- 请选择要投递的简历2 -->
+            </section>
         </main>
     </div>
 
 </template>
 <script setup>
 import { ref } from 'vue'
-import { ElBreadcrumb, ElBreadcrumbItem } from 'element-plus'
+import { ElBreadcrumb, ElBreadcrumbItem, ElMessage } from 'element-plus'
 import { ArrowRight } from '@element-plus/icons-vue'
 const route = useRoute();
 const type = ref(2);
@@ -228,15 +267,64 @@ let getUserInfo = () => {
         console.log("gettypeid", response.data);
         type_id.value = response.data.type_id
         website_id.value = response.data.website_id
+        companyJOb()
     })
+
 }
 onMounted(() => {
     getUserInfo()
 })
 
-
 //1.1 获得跳转过来的id
 const articleId = parseInt(route.params.id);  //获得该页面的id
+let articleIdArr = Array.of(articleId);
+
+//获取当前企业会员的职位
+const companyJobList = ref([])
+let companyJOb = () => {
+    axios.post("/web/getWebsiteJobRecruiting", {
+        'pageSize': 10,
+        'website_id': website_id.value,
+    }).then(response => {
+        console.log("gettypeid_获取到的企业会员的职位:", response.data);
+        companyJobList.value = response.data
+    })
+}
+
+const resumeBool = ref(false)
+const job_search = ref('')
+const company_job = ref('')
+const allResume = ref(false)
+// 3 沟通简历
+const getContactMe = async () => {
+    resumeBool.value = true
+}
+let getresume = () => {
+    axios.post('/web/getWebsiteJobResume', {
+        website_id: website_id.value,
+        recruit_id: company_job.value,
+        hunt_id: articleIdArr,
+    }).then(res => {
+        console.log("沟通岗位", res);
+        if (res.code == 200) {
+            ElMessage({
+                message: '投递成功',
+                type: 'sussess',
+            });
+            resumeBool.value = false;
+        } else {
+            ElMessage({
+                message: res.message,
+                type: 'error',
+            });
+            resumeBool.value = false;
+        }
+        company_job.value = '';
+        job_search.value = 2;
+        allResume.value = false;
+    })
+}
+
 
 //1.2 获得路由
 const targetSegment = getRoutePath(1);

+ 1 - 1
pages/[dir]/[dir]/[dir]/list-[id].vue

@@ -307,7 +307,7 @@ try {
         query: {
             'placeid': 1,
             'pid': routeId,
-            'num': 8,
+            'num': 20,
             'type': 1
         },
     });

+ 3 - 3
pages/[dir]/[dir]/index.html.vue

@@ -11,7 +11,7 @@
             <div class="categ_color_box clearfix">
                 <div class="categ_color_name clearfix">直达:</div>
                 <div class="categ_color_in clearfix">
-                    <NuxtLink class="categ_color_a" :href="`/${item.aLIas_pinyin}/list-1.html`" title="item.title"
+                    <NuxtLink class="categ_color_a" :href="`/${item.aLIas_pinyin}/list-1.html`" :title="item.title"
                         v-for="(item, index) in newsData" :key="index">
                         {{ item.alias }}
                     </NuxtLink>
@@ -159,7 +159,7 @@
             <div class="categ_color_box clearfix">
                 <div class="categ_color_name clearfix">直达:</div>
                 <div class="categ_color_in clearfix">
-                    <NuxtLink class="categ_color_a" :href="`/${item.aLIas_pinyin}/list-1.html`" title="item.title"
+                    <NuxtLink class="categ_color_a" :href="`/${item.aLIas_pinyin}/list-1.html`" :title="item.title"
                         v-for="(item, index) in goodsData">
                         {{ item.alias }}
                     </NuxtLink>
@@ -484,7 +484,7 @@ try {
         query: {
             'placeid': 1,
             'pid': routeId,
-            'num': 8,
+            'num': 20,
             'type': 1
         },
     });

+ 38 - 50
pages/topic/[id].vue

@@ -2,7 +2,7 @@
     <div>
         <!-- 页面头部 -->
         <HomePageHead></HomePageHead>
-        <HomePageNavigation1></HomePageNavigation1>
+        <HomePageNavigation></HomePageNavigation>
 
         <!-- 商圈详情 -->
         <div class="topicInfoBox">
@@ -14,9 +14,10 @@
                         <div class="userInfo left">
                             <el-badge value="楼主" class="item" type="warning">
                                 <img v-if='dataInfo.avatar' :src="dataInfo.avatar" alt="">
-                                <img v-else src='http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Rectangle.png' alt="">
+                                <img v-else src='http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Rectangle.png'
+                                    alt="">
                             </el-badge>
-                            <span>{{ dataInfo.author }}</span>
+                            <span>{{ dataInfo.nickname }}</span>
                         </div>
                         <div class="headContent left">
                             <h2>{{ dataInfo.title }}</h2>
@@ -30,7 +31,7 @@
                     <div class="right">
                         <div class="one">
                             <span v-for="item in typeList" :key="index">
-                                <span v-if="dataInfo.type == item.value" class="one">{{item.label}}</span> 
+                                <span v-if="dataInfo.type == item.value" class="one">{{ item.label }}</span>
                             </span>
                         </div>
                         <p>{{ dataInfo.updated_at }}</p>
@@ -54,10 +55,10 @@
 
                     <div class="commentList" v-for="item in replyList" v-show="page_total != 0">
                         <div class="left">
-                            <img v-if='item.avatar' :src="item.avatar" alt="" >
+                            <img v-if='item.avatar' :src="item.avatar" alt="">
                             <img v-else src='http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Rectangle.png' alt="">
-                            <span class="name">{{ item.author }} : </span>
-                            
+                            <span class="name">{{ item.nickname }} : </span>
+
                         </div>
                         <div class="center">
                             <span class="context">{{ item.content }}</span>
@@ -121,7 +122,7 @@ const seoData = ref({
 });
 
 // 在 onMounted 钩子中获取数据
-onMounted(()=>{
+onMounted(() => {
     seoData.value.title = '商圈';
     seoData.value.description = '默认描述';
     seoData.value.keywords = '默认关键词';
@@ -235,6 +236,7 @@ const joinGroup = () => {
                     type: 'success',
                 })
                 setTimeout(() => {
+                    // window.open($BwebUrl + '/#/hall?userurl=' + $webUrl, '_blank');
                     window.open($BwebUrl + '/#/businessDistrict?userurl=' + $webUrl, '_blank');
                     //window.open('http://admindev.bjzxtw.org.cn/#/hall', '_blank');
                 }, 1000)
@@ -244,6 +246,7 @@ const joinGroup = () => {
                     type: 'success',
                 })
                 setTimeout(() => {
+                    // window.open($BwebUrl + '/#/hall?userurl=' + $webUrl, '_blank');
                     window.open($BwebUrl + '/#/businessDistrict?userurl=' + $webUrl, '_blank');
                     //window.open('http://admindev.bjzxtw.org.cn/#/hall', '_blank');
                 }, 1000)
@@ -285,8 +288,8 @@ const addReply = () => {
 useSeoMeta({
     title: "商圈" + "_" + "三农资讯网_全国政务信息一体化应用平台",
     meta: [
-        { name: 'description', content: "三农资讯网以服务于党和国家各级职能部门三农政务资讯发布及政务公开信息公示为基点,为全国县级以上各级党政机关及其职能部门配置各自公开独立网络发布平台。主要频道有:三农政务资讯,农科资讯,农资购销,农产购销,农贸资讯,三农致富信息,农村文化生活,三农政策法规,三农之窗,三农调查,三农服务,三农知识,农民工,打假维权等。三农资讯网打造最具影响力的三农信息发布平台,并成为最具权威的三农资讯网。_三农资讯网-测试专用_全国政务信息一体化应用平台" , tagPriority: 10 },
-        { name: 'keywords', content: "三农资讯,农业,三农,三农在线,农业新闻,三农资讯网_三农资讯网-测试专用_全国政务信息一体化应用平台" , tagPriority: 10 }
+        { name: 'description', content: "三农资讯网以服务于党和国家各级职能部门三农政务资讯发布及政务公开信息公示为基点,为全国县级以上各级党政机关及其职能部门配置各自公开独立网络发布平台。主要频道有:三农政务资讯,农科资讯,农资购销,农产购销,农贸资讯,三农致富信息,农村文化生活,三农政策法规,三农之窗,三农调查,三农服务,三农知识,农民工,打假维权等。三农资讯网打造最具影响力的三农信息发布平台,并成为最具权威的三农资讯网。_三农资讯网-测试专用_全国政务信息一体化应用平台", tagPriority: 10 },
+        { name: 'keywords', content: "三农资讯,农业,三农,三农在线,农业新闻,三农资讯网_三农资讯网-测试专用_全国政务信息一体化应用平台", tagPriority: 10 }
     ]
 });
 </script>
@@ -422,22 +425,28 @@ useSeoMeta({
 
         // 有详情信息
         .infoContent {
-            width:1196px;
+            width: 1196px;
             overflow: hidden;
-            padding: 40px 46px;
+            padding: 30px 46px;
             font-family: Microsoft YaHei, Microsoft YaHei;
             font-size: 20px;
             line-height: 40px;
             box-sizing: border-box;
-            div{
-                word-wrap: break-word;       /* 强制长单词或 URL 换行 */
-                overflow-wrap: break-word;   /* 现代推荐用法,等同于 word-wrap */
-                white-space: pre-wrap;       /* 保留空白字符并允许自动换行 */
-                word-break: break-all;       /* 强制在任意字符处换行 */
+
+            div {
+                word-wrap: break-word;
+                /* 强制长单词或 URL 换行 */
+                overflow-wrap: break-word;
+                /* 现代推荐用法,等同于 word-wrap */
+                white-space: pre-wrap;
+                /* 保留空白字符并允许自动换行 */
+                word-break: break-all;
+                /* 强制在任意字符处换行 */
             }
         }
-        .leftBottom::v-deep p{
-            width:1200px;
+
+        .leftBottom::v-deep p {
+            width: 1200px;
             white-space: pre-wrap;
         }
 
@@ -480,7 +489,6 @@ useSeoMeta({
             }
 
             .commentList {
-                // height: 112px;
                 border: 1px solid #E1E1E1;
                 background-color: #fafafa;
                 margin-top: 20px;
@@ -491,34 +499,32 @@ useSeoMeta({
                 justify-content: space-between;
 
                 .left {
-                    width:400px;
-                    margin-right: 40px;
-                    // overflow: hidden;
+                    width: 400px;
+                    margin-right: 30px;
                     display: flex;
                     justify-content: space-between;
+
                     img {
-                        // float: left;
                         width: 52px;
                         height: 52px;
                         border-radius: 50%;
                         vertical-align: middle;
                         margin-right: 15px;
                     }
-                    span{
-                        // float: left;
+
+                    span {
                         height: 52px;
                         line-height: 22px;
                         padding-top: 10px;
                     }
 
                     .name {
-                        width: 100px;
+                        width: 120px;
                         font-family: Microsoft YaHei, Microsoft YaHei;
                         font-weight: 400;
                         font-size: 16px;
                         color: #333333;
-                        margin-right: 30px;
-                        width: 100px;
+                        margin-right: 15px;
                         white-space: nowrap;
                         overflow: hidden;
                         text-overflow: ellipsis;
@@ -526,7 +532,7 @@ useSeoMeta({
 
                     }
 
-                    
+
                 }
 
                 .center {
@@ -566,25 +572,7 @@ useSeoMeta({
                 }
             }
 
-            // .comment_empty {
-            //     height: 200px;
-            //     line-height: 200px;
-            //     text-align: center;
-
-            //     img {
-            //         width: 78px;
-            //         height: 78px;
-            //         vertical-align: -25px;
-            //         margin-right: 20px;
-            //     }
-
-            //     span {
-            //         font-family: Microsoft YaHei, Microsoft YaHei;
-            //         font-weight: bold;
-            //         font-size: 26px;
-            //         color: #CCCCCC;
-            //     }
-            // }
+
         }
     }
 }
@@ -592,7 +580,7 @@ useSeoMeta({
 //评论回复
 .message {
     width: 1200px;
-    margin: 0 auto;
+    margin: 0 auto 20px;
     padding: 0px 25px;
     box-sizing: border-box;
     height: 145px;

+ 17 - 13
pages/topic/index.vue

@@ -2,7 +2,7 @@
     <div>
         <!-- 页面头部 -->
         <HomePageHead></HomePageHead>
-        <HomePageNavigation1></HomePageNavigation1>
+        <HomePageNavigation></HomePageNavigation>
 
         <div class="topicBox">
             <div class="inner">
@@ -14,7 +14,7 @@
                                 <div class="listHead">
                                     <div class="left">
                                         <span v-for="i in typeList" :key="index">
-                                            <span v-if="item.type == i.value" class="one">{{i.label}}</span> 
+                                            <span v-if="item.type == i.value" class="one">{{ i.label }}</span>
                                         </span>
                                     </div>
                                     <div class="right">{{ item.created_at }}</div>
@@ -24,9 +24,12 @@
                                         <h2>{{ item.title }}</h2>
                                         <p>
                                             <img v-if='item.avatar' :src="item.avatar" alt="">
-                                            <img v-else src='http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Rectangle.png' alt="">
-                                            <span> {{ item.author }}</span>
-                                            <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Chat.png" alt="">
+                                            <img v-else
+                                                src='http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Rectangle.png'
+                                                alt="">
+                                            <span> {{ item.nickname }}</span>
+                                            <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Chat.png"
+                                                alt="">
                                             <span> {{ item.num ? item.num : 0 }}</span>
                                         </p>
                                     </div>
@@ -44,12 +47,12 @@
                     </el-tab-pane>
                     <el-tab-pane :label="item.label" :name="item.value" v-for="item in typeList">
                         <!-- 列表 -->
-                        <NuxtLink :to="`/topic/${item.id}`" target="_blank" v-for="item in listData">
+                        <NuxtLink :to="`/topic/${item.id}`" v-for="item in listData">
                             <div class="topicList">
                                 <div class="listHead">
                                     <div class="left">
                                         <span v-for="i in typeList" :key="index">
-                                            <span v-if="item.type == i.value" class="one">{{i.label}}</span> 
+                                            <span v-if="item.type == i.value" class="one">{{ i.label }}</span>
                                         </span>
                                     </div>
                                     <div class="right">{{ item.created_at }}</div>
@@ -60,8 +63,9 @@
                                         <p>
                                             <img :src="item.avatar" alt="">
                                             <!-- <img v-else src='../../static/topic/Rectangle.png' alt=""> -->
-                                            <span> {{ item.author }}</span>
-                                            <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Chat.png" alt="">
+                                            <span> {{ item.nickname }}</span>
+                                            <img src="http://img.bjzxtw.org.cn/master/bjzxtw/public/topic/Chat.png"
+                                                alt="">
                                             <span> {{ item.num ? item.num : 0 }}</span>
                                         </p>
                                     </div>
@@ -80,7 +84,7 @@
                 </el-tabs>
 
                 <!-- 分页 -->
-                <div class="paginationBox"  v-show="currentPage">
+                <div class="paginationBox" v-show="currentPage">
                     <el-pagination background layout="prev, pager, next" :total="currentPage" prev-text="上一页"
                         next-text="下一页" @change="pageChage" />
                 </div>
@@ -116,7 +120,7 @@ const seoData = ref({
 });
 
 // 在 onMounted 钩子中获取数据
-onMounted(()=>{
+onMounted(() => {
     seoData.value.title = '商圈';
     seoData.value.description = '默认描述';
     seoData.value.keywords = '默认关键词';
@@ -210,8 +214,8 @@ onMounted(() => {
 useSeoMeta({
     title: "商圈" + "_" + "三农资讯网_全国政务信息一体化应用平台",
     meta: [
-        { name: 'description', content: "三农资讯网以服务于党和国家各级职能部门三农政务资讯发布及政务公开信息公示为基点,为全国县级以上各级党政机关及其职能部门配置各自公开独立网络发布平台。主要频道有:三农政务资讯,农科资讯,农资购销,农产购销,农贸资讯,三农致富信息,农村文化生活,三农政策法规,三农之窗,三农调查,三农服务,三农知识,农民工,打假维权等。三农资讯网打造最具影响力的三农信息发布平台,并成为最具权威的三农资讯网。_三农资讯网-测试专用_全国政务信息一体化应用平台" , tagPriority: 10 },
-        { name: 'keywords', content: "三农资讯,农业,三农,三农在线,农业新闻,三农资讯网_三农资讯网-测试专用_全国政务信息一体化应用平台" , tagPriority: 10 }
+        { name: 'description', content: "三农资讯网以服务于党和国家各级职能部门三农政务资讯发布及政务公开信息公示为基点,为全国县级以上各级党政机关及其职能部门配置各自公开独立网络发布平台。主要频道有:三农政务资讯,农科资讯,农资购销,农产购销,农贸资讯,三农致富信息,农村文化生活,三农政策法规,三农之窗,三农调查,三农服务,三农知识,农民工,打假维权等。三农资讯网打造最具影响力的三农信息发布平台,并成为最具权威的三农资讯网。_三农资讯网-测试专用_全国政务信息一体化应用平台", tagPriority: 10 },
+        { name: 'keywords', content: "三农资讯,农业,三农,三农在线,农业新闻,三农资讯网_三农资讯网-测试专用_全国政务信息一体化应用平台", tagPriority: 10 }
     ]
 });
 </script>

+ 2 - 2
plugins/category.ts

@@ -44,7 +44,7 @@ const navPre: number[] = [
 
 export default defineNuxtPlugin((nuxtApp) => {
     //master 环境
-    nuxtApp.provide('pageNav', navMaster)
+    // nuxtApp.provide('pageNav', navMaster)
     //pre 环境
-    // nuxtApp.provide('pageNav', navPre)
+    nuxtApp.provide('pageNav', navPre)
 })

+ 10 - 10
plugins/globals.ts

@@ -1,15 +1,15 @@
 export default defineNuxtPlugin((nuxtApp) => {
   // 三农市场网pre环境
-  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://pre.snscw.org.cn')
-  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
+  nuxtApp.provide('webUrl', 'https://apipre1.bjzxtw.org.cn')
+  nuxtApp.provide('CwebUrl', 'http://pre.snscw.org.cn')
+  nuxtApp.provide('BwebUrl', 'https://adminpre.bjzxtw.org.cn')
+  nuxtApp.provide('LoginWebUrl', 'https://adminpre.bjzxtw.org.cn/adminapi')
+  nuxtApp.provide('userUrl', 'http://localhost:3000')
 
   //正式环境
-  nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  nuxtApp.provide('CwebUrl', 'http://nw.snscw.org.cn')
-  nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
-  nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3000')
+  // nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+  // nuxtApp.provide('CwebUrl', 'http://nw.snscw.org.cn')
+  // nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+  // nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+  // nuxtApp.provide('userUrl', 'http://localhost:3000')
 })

+ 5 - 6
plugins/request.ts

@@ -6,11 +6,11 @@ export default defineNuxtPlugin(() => {
 
     let Url = {
         //正式环境
-        webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
-        CwebUrl: 'nw.snscw.org.cn' //页面地址
+        // webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
+        // CwebUrl: 'nw.snscw.org.cn' //页面地址
         //pre环境
-        // webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
-        // CwebUrl: 'pre.snscw.org.cn' //页面地址
+        webUrl: 'https://apipre1.bjzxtw.org.cn', //pre接口地址
+        CwebUrl: 'pre.snscw.org.cn' //页面地址
     }
 
     const service = axios.create({
@@ -22,11 +22,10 @@ export default defineNuxtPlugin(() => {
         // console.log("请求拦截器",config);
         // 从cookie中获取数据
         const token = getToken()
-        //const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJwaHBlcjY2Ni9qd3QiLCJ1aWQiOjc2LCJ1c2VyX25hbWUiOiIxNzM0MDUzMTQ1NCIsIm1vYmlsZSI6IjE3MzExMTExMTExIiwiZW1haWwiOiIiLCJsZXZlbF9pZCI6MCwidHlwZV9pZCI6MTAwMDAsImp3dF9zY2VuZSI6ImRlZmF1bHQiLCJqdGkiOiJkZWZhdWx0XzY3ZDBmYmQ2OWUwZDk2LjY3MTU1NDM5IiwiaWF0IjoxNzQxNzQ5MjA2LCJuYmYiOjE3NDE3NDkyMDYsImV4cCI6MTc0MTgzNTYwNn0.1pfYged1EOSVaQNdAlaKA_kvBJLgOkWKkk38yog_xoU"
+        // const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJwaHBlcjY2Ni9qd3QiLCJ1aWQiOjEzNywidXNlcl9uYW1lIjoiMTczNjcyMTMzMzMiLCJtb2JpbGUiOiIxNTYzNTI0MTY1MiIsImVtYWlsIjoiMTY3ODQ2ODRAcXEuY29tIiwibGV2ZWxfaWQiOjAsInR5cGVfaWQiOjMsImp3dF9zY2VuZSI6ImRlZmF1bHQiLCJqdGkiOiJkZWZhdWx0XzY4OGMzNDIyNGVmOWY4LjUxMTI1NTA3IiwiaWF0IjoxNzU0MDE4ODUwLCJuYmYiOjE3NTQwMTg4NTAsImV4cCI6MTc1NDEwNTI1MH0.DQurkPjOO-qSPuccCX8gMXHCOINso6S4e-7zi4WGcM8"
         if (token) {
             config.headers.token = token;
         }
-
         config.headers.Userurl = Url.CwebUrl;
         return config;
     }, error => {

BIN
public/images/comments.png