Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

components/news/NewsList.vue

@@ -1,13 +1,13 @@
 <template>
   <li v-if="newsData" @click.prevent="checkInfo(newsData)">
-    <div class="newsInfor-img-box" :style="{backgroundImage: `url(${newsData.pic || newsInforImg})`}"></div>
+    <div class="newsInfor-img-box" :style="{backgroundImage: `url(${newsData.cover || newsInforImg})`}"></div>
     <div class="newsInfor-list-content">
       <h5>{{newsData.title}}</h5>
-      <div><span class="mta-hidden-sm">{{newsData.startTime}}</span></div>
-      <div class="mta-hidden-xs"><i></i><span>{{newsData.startTime}}</span><i type="visits"></i><span>{{newsData.visits}}</span>
+      <div><span class="mta-hidden-sm">{{newsData.createDate}}</span></div>
+      <div class="mta-hidden-xs"><i></i><span>{{newsData.createDate}}</span>
       </div>
-      <p>{{newsData.intro}}</p>
-      <a class="mta-hidden-xs" :href="`${baseUrl}/news/${newsData.code}`" >
+      <p v-html="newsData.content"></p>
+      <a class="mta-hidden-xs" :href="`${baseUrl}/news/${newsData.id}`" >
         <span>了解更多</span>
       </a>
 
@@ -44,7 +44,7 @@
         // console.log(self.localtion.href);
         // console.log(document.URL);
         const opt = {
-          id: data.code,
+          id: data.id,
         };
         this.$router.push({ name: 'news-id', params: opt });
 

pages/news/_id.vue

@@ -5,9 +5,9 @@
     <div class="client-details-box">
 
       <!--行业资讯详情-->
-      <div class="client-details-wrap" :class="{'isRiZhi': infoData.newsClassifyId == 3}">
+      <div class="client-details-wrap">
         <h1>{{infoData.title}}</h1>
-        <p class="details-visits-box"><i></i><span>{{infoData.startTime}}</span><i type="visits"></i><span>{{infoData.visits}}</span>
+        <p class="details-visits-box"><i></i><span>{{infoData.createDate}}</span>
         </p>
         <div class="client-content-box" v-html="infoData.content"></div>
         <div class="client-details-pagination">
@@ -21,21 +21,6 @@
           </a>
         </div>
       </div>
-
-      <!-- 最新新闻 -->
-      <div class="latest-news-box mta-hidden-xs" v-if="infoData.newsClassifyId != 3">
-        <h4>最新新闻</h4>
-        <ul class="latest-news-list">
-          <li v-for="(item, index) in newestData" :key="index">
-            <a :href="`${baseUrl}/news/${item.code}`">
-              <span @click.prevent="changeNews(item.code)" :title="item.title">{{item.title}}</span>
-            </a>
-            <p class="details-visits-box"><i></i><span>{{item.startTime}}</span><i type="visits"></i><span style="margin-right: 0">{{item.visits}}</span>
-            </p>
-          </li>
-        </ul>
-      </div>
-
     </div>
   </div>
 </template>
@@ -51,17 +36,14 @@
       // 设置选中菜单
       store.commit('setActiveNav', '/news');
       try {
-        const url = '/home/news/info';
+        const url = '/common/client/web/news/info';
         const opt = {
-          code: params.id,
+          id: params.id,
         };
         const res = await $axios.post(url, opt);
-        const url2 = '/home/news/newest';
-        const res2 = await $axios.post(url2);
           console.log(res);
         return {
           infoData:   res.data.data,
-          newestData: res2.data.data.data,
         };
       } catch (e) {
         return {};
@@ -69,14 +51,14 @@
     },
     head(){
       return {
-        title: this.infoData.title,
-        meta: [
-          {
-            hid: this.infoData.keyword,
-            name: 'description',
-            content: this.infoData.intro
-          }
-        ],
+        // title: this.infoData.title,
+        // meta: [
+        //   {
+        //     hid: this.infoData.keyword,
+        //     name: 'description',
+        //     content: this.infoData.intro
+        //   }
+        // ],
       }
     },
     computed: {

pages/news/index.vue

@@ -1,40 +1,19 @@
 <template>
   <div class="client-newsInfor-page">
-    <!-- 新闻资讯banner栏 -->
-   <!-- <div class="newsInfor-banner" @click="clickBanner(bannerList[0].url)"
-         :style="{backgroundImage: `url(${bannerList[0].pic||require(`~/static/images/client/course/course-banner-background.jpg`)})`}">
-    </div>-->
     <!-- 新闻资讯 -->
     <div class="client-container newsInfor-content-box">
       <ul class="newsInfor-content-ul" style="width:100%">
-        <template v-if="activeIndex!=2" >
+        <template >
           <new-list
             v-for="(item,index) in newsList"
             :newsData="item"
             :key="index"></new-list>
         </template>
-
-        <template v-else>
-          <NewsListRiZhi  v-for="(item,index) in newsList"
-                          :newsData="item"
-                          :key="index"></NewsListRiZhi>
-        </template>
-
       </ul>
       <div class="client-el-pagination">
         <el-pagination
           background
           small
-          class="mta-hidden-sm"
-          layout="prev, pager, next"
-          @current-change="handleCurrentChange"
-          :current-page.sync="currentPage"
-          :page-size="pageSize"
-          :total="totalLists">
-        </el-pagination>
-        <el-pagination
-          background
-          class="mta-hidden-xs"
           layout="prev, pager, next"
           @current-change="handleCurrentChange"
           :current-page.sync="currentPage"
@@ -61,7 +40,7 @@
       // 设置选中菜单
       store.commit('setActiveNav', '/news');
       try {
-        const url2 = '/client/web/news/list';
+        const url2 = '/common/client/web/news/list';
         const opt = {
           page:           1,
           size:           10,
@@ -69,7 +48,6 @@
 
         const res2 = await $axios.post(url2, opt);
         const { data: { data: data2 } } = res2;
-
         return {
           newsList:          data2.data || [],
           totalLists:        data2.total || defaultNewsClassifyId,
@@ -89,7 +67,7 @@
         homeNewsClassify: [],
         totalLists:       0,
         currentPage:      1,
-        pageSize:         5,
+        pageSize:         10,
         // 新闻数据
         newsList:         [],
         activeIndex:      1,
@@ -127,10 +105,10 @@
           page:           this.currentPage,
           size:           this.pageSize,
         };
-        const url2 = '/home/news/list';
+        const url2 = '/common/client/web/news/list';
         const res2 = await this.$axios.post(url2, opt);
-        this.newsList = res2.data.data.data;
-        this.totalLists = res2.data.data.total || defaultNewsClassifyId;
+        this.newsList = res2.data.data;
+        this.totalLists = res2.data.total || defaultNewsClassifyId;
       },
       btnClick(data, index) {
         this.activeIndex = index;