Merge branch 'master' of http://124.222.105.7:3000/dianliang/dl_site_nuxt

ecosystem.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   apps: [
     {
-      name: 'suodee',
+      name: 'truck',
       exec_mode: 'cluster',
       instances: '1', // Or a number of instances
       script: './node_modules/nuxt/bin/nuxt.js',

env.js

@@ -8,8 +8,8 @@ module.exports = {
   // 开发环境 接口请求地址 (http)或(https)://www.a.com(换成你的域名)/api
   dev: {
     MODE: 'dev',
-    // VUE_APP_API_URL: 'http://122.51.230.86:8099/',
+    VUE_APP_API_URL: 'http://114.132.197.85:8099/',
-    VUE_APP_API_URL: 'http://localhost:8099/',
+    // VUE_APP_API_URL: 'http://localhost:8099/',
     VUE_APP_WEBSOCKET: 'ws://localhost:8099/ws/asset/'
   },
   // 生产环境 接口请求地址 (http)或(https)://www.a.com(换成你的域名)/api 非独立部署默认为空

nuxt.config.js

@@ -80,7 +80,7 @@ export default {
     icons: false
   },
   sitemap: {
-    hostname: 'http://122.51.230.86:8099',
+    hostname: 'http://www.lighting-it.cn',
     sitemaps: [
       {
         path: '/sitemap.xml',
@@ -89,6 +89,7 @@ export default {
           '/products.xml',
           '/inquiry.xml',
           '/article-page.xml',
+          '/separate.xml'
         ],
         gzip: true
       }, 
@@ -99,17 +100,59 @@ export default {
       {
         path: '/products.xml',
         routes: async () => {
-          const { data: res} = await axios.get('http://122.51.230.86:8099/web/prodPageList?pageNum=1&pageSize=9&catgId=43bb1e22091c0f674453c8db7e89b4a3&tenantId=main')
+          const { data: res} = await axios.get('http://114.132.197.85:8099/web/siteMap?catgType=cp&tenantId=main')
-          return res.data.records.map(item => {
+          return res.data.map(item => {
             return {
-              url: `/products/${item.id}`,
+              url: `/products/${item.id}?catgId=${item.id}&maxCatgId=${item.maxCatgId}`,
               changefreq: 'daily',
               priority: 1
             }
           })
         },
         gzip: true
-      }
+      },
+      {
+        path: '/inquiry.xml',
+        routes: async () => {
+          const { data: res} = await axios.get('http://114.132.197.85:8099/web/siteMap?catgType=xp&tenantId=main')
+          return res.data.map(item => {
+            return {
+              url: `/inquiry?maxCatgId=${item.maxCatgId}?title=${item.title}`,
+              changefreq: 'daily',
+              priority: 1
+            }
+          })
+        },
+        gzip: true
+      },
+      {
+        path: '/article-page.xml',
+        routes: async () => {
+          const { data: res} = await axios.get('http://114.132.197.85:8099/web/siteMap?catgType=wz&tenantId=main')
+          return res.data.map(item => {
+            return {
+              url: `/article-page/${item.id}?catgId=${item.id}&maxCatgId=${item.maxCatgId}`,
+              changefreq: 'daily',
+              priority: 1
+            }
+          })
+        },
+        gzip: true
+      },
+      {
+        path: '/inquiry.xml',
+        routes: async () => {
+          const { data: res} = await axios.get('http://114.132.197.85:8099/web/siteMap?catgType=dym&tenantId=main')
+          return res.data.map(item => {
+            return {
+              url: `/separate?maxCatgId=${item.maxCatgId}?title=${item.title}`,
+              changefreq: 'daily',
+              priority: 1
+            }
+          })
+        },
+        gzip: true
+      },
     ]
   },
   router: {
@@ -169,7 +212,7 @@ export default {
     host: '0.0.0.0', // default: localhost
     proxy: {
       '/dev': {
-        target: 'http://192.168.1.17:8099/',
+        target: 'http://114.132.197.85:8099/',
         pathRewrite: { '^/dev': '' },
         changeOrigin: true,
       }

pages/article-page/index.vue

@@ -3,7 +3,7 @@
   <section class="article-page-list">
     <nuxt-link 
       class="article-page-item box_shadow row mt-4" 
-      :to="`/article-page/${item.id}`"
+      :to="`/article-page/${item.id}?maxCatgId=${item.maxCatgId}&catgId=${item.catgId}`"
       v-for="item in pordObj.records"
       :key="item.id"
     >

pages/index.vue

@@ -80,7 +80,7 @@
           </template>
         </b-carousel-slide>
       </b-carousel>
-      <nuxt-link class="more box_shadow" to="/products?maxCatgId=660179025d0e2e0e4263db0eec86a8cc">{{ $t('common.readMore') }}</nuxt-link>
+      <nuxt-link class="more box_shadow" :to="`/products?maxCatgId=${hotProductList[0].maxCatgId}`">{{ $t('common.readMore') }}</nuxt-link>
     </section>
 
     <!-- Products -->
@@ -111,7 +111,7 @@
               </article>
           </li>
         </ul>
-        <nuxt-link class="more box_shadow" to="/products?&maxCatgId=660179025d0e2e0e4263db0eec86a8cc">{{ $t('common.readMore') }}</nuxt-link>
+        <nuxt-link class="more box_shadow" :to="`/products?&maxCatgId=${productTopList[0].maxCatgId}`">{{ $t('common.readMore') }}</nuxt-link>
       </div>
     </section>
     
@@ -131,7 +131,7 @@
               <div class="pc-news-footer">
                 <nuxt-link 
                   class="more box_shadow" 
-                  :to="`/article-page/${hotNewsList[0].id}?&maxCatgId=660179025d0e2e0e4263db0eec86a8cc&catgId=${hotNewsList[0].catgId}`"
+                  :to="`/article-page/${hotNewsList[0].id}?&maxCatgId=${hotNewsList[0].maxCatgId}&catgId=${hotNewsList[0].catgId}`"
                 >
                   {{ $t('common.readMore') }}
                 </nuxt-link>
@@ -142,7 +142,7 @@
           <ul class="col-12 col-md-6">
             <li class="new-item box_shadow mb-3" v-for="item in hotNewsList.slice(1, 5)" :key="item.id">
               <article>
-                <nuxt-link class="row" :to="`/article-page/${item.id}?&maxCatgId=660179025d0e2e0e4263db0eec86a8cc&catgId=${item.catgId}`">
+                <nuxt-link class="row" :to="`/article-page/${item.id}?&maxCatgId=${item.maxCatgId}&catgId=${item.catgId}`">
                   <img class="col-5 cover" :src="item.mainPic" fluid-grow :alt="item.title"></img>
                   <div class="news-info col-7">
                     <h4 class="text-ellipsis">{{ item.title }}</h4>
@@ -159,7 +159,7 @@
             </li>
           </ul>
         </div>
-        <nuxt-link class="more box_shadow mb-4" to="/article-page?&maxCatgId=660179025d0e2e0e4263db0eec86a8cc">{{ $t('common.readMore') }}</nuxt-link>
+        <nuxt-link class="more box_shadow mb-4" :to="`/article-page?&maxCatgId=${hotNewsList[0].maxCatgId}`">{{ $t('common.readMore') }}</nuxt-link>
       </div>
     </section>
 

pages/products/index.vue

@@ -5,7 +5,7 @@
       <li class="col-12 col-md-4"  v-for="item in pordObj.records" :key="item.id">
         <nuxt-link 
           class="products-item box_shadow mt-2" 
-          :to="`/products/${item.id}?catgId=${item.catgId}&maxCatgId=${maxCatgId}`"
+          :to="`/products/${item.id}?catgId=${item.catgId}&maxCatgId=${item.maxCatgId}`"
         >
           <article class="product-card box_shadow">
             <img style="height: 200px;" class="img_reset" :src="item.mainPic" alt="product"></img>

pages/search-result.vue

@@ -5,7 +5,7 @@
       <section class="article-page-list">
         <nuxt-link 
           class="article-page-item box_shadow row mt-4" 
-          :to="`/${jumpUrl(item.dataType)}/${item.id}?catgId=${item.catgId}&maxCatgId=660179025d0e2e0e4263db0eec86a8cc`"
+          :to="`/${jumpUrl(item.dataType)}/${item.id}?catgId=${item.catgId}&maxCatgId=${item.maxCatgId}`"
           v-for="item in pordObj.records"
           :key="item.id"
         >