Browse Source

修改首页bug

Jing 2 tuần trước cách đây
mục cha
commit
dd491a0f7c

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

@@ -1 +1 @@
-{"id":"c9d07707-7b72-4655-8337-cda8413da691","timestamp":1751440689024}
+{"id":"3bd15eac-7980-4b68-9bda-39b8091db749","timestamp":1751535107845}

+ 1 - 0
.nuxt/manifest/meta/3bd15eac-7980-4b68-9bda-39b8091db749.json

@@ -0,0 +1 @@
+{"id":"3bd15eac-7980-4b68-9bda-39b8091db749","timestamp":1751535107845,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/c9d07707-7b72-4655-8337-cda8413da691.json

@@ -1 +0,0 @@
-{"id":"c9d07707-7b72-4655-8337-cda8413da691","timestamp":1751440689024,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/c9d07707-7b72-4655-8337-cda8413da691.json"
+        "./manifest/meta/3bd15eac-7980-4b68-9bda-39b8091db749.json"
       ],
       "#components": [
         "./components"

+ 2 - 1
assets/css/index.less

@@ -538,9 +538,10 @@ section {
             color: #333;
             font-size: 18px;
             padding-left: 22px;
-            margin-top: 3px;
+            margin-top: 22px;
             background: url(@/public/img/6.png) no-repeat left 5px;
             background-size: 17px auto;
+            cursor: pointer;
       }
 
       .index_head_btn_right_a_2:hover {

+ 1 - 1
assets/css/shop/goodsDetail1.less

@@ -411,7 +411,7 @@ section {
 }
 
 .shop_ul_img_2 {
-    height: 260px;
+    height: 285px;
     width: 252px;
     margin: 20px auto 0px;
 }

+ 90 - 36
pages/index.vue

@@ -101,7 +101,11 @@
             <section class="index_3 clearfix">
                 <div class="index_3_head_box clearfix">
                     <span class="index_3_head_btn_a back100 index_3_head_btn_a_only" title="">产品分类</span>
+                    <div class="index_head_btn_right_box_2">
+                        <span class="index_head_btn_right_a_2" @click="goAddShop">发布信息</span>
+                    </div>
                 </div>
+
                 <div class=" clearfix">
                     <div class=" clearfix">
                         <!--产品分类open-->
@@ -152,8 +156,11 @@
                                 </NuxtLink>
                             </div> -->
                         </div>
-                        <div class="index_head_btn_right_box_2">
-                            <a class="index_head_btn_right_a_2" href="" title="">发布信息</a>
+                        <div class="index_head_box_right">
+                            <NuxtLink class="index_head_box_right_1_a" v-if="pageData[0]"
+                                :href="getLinkPath(pageData[0])" :title="pageData[0].alias">
+                                更多 &gt;
+                            </NuxtLink>
                         </div>
                     </div>
                     <!--tabs1-->
@@ -162,29 +169,29 @@
                             <div class="index_ul_4_out clearfix">
                                 <div class="index_ul_4_img_box clearfix">
                                     <NuxtLink v-for="(item, index) in boxData1" :key="index"
-                                        :href="getLinkPathDetail(item)" :title="item.title"
+                                        :href="getLinkPathDetail(item)" :title="item.name"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <img class="index_ul_4_img" :src="item.imgurl" alt="item.title">
+                                        <img class="index_ul_4_img" :src="item.imgurl" :alt="item.name">
                                     </NuxtLink>
                                 </div>
                                 <div class="index_ul_4">
                                     <NuxtLink class="index_ul_4_a dot1" :href="getLinkPathDetail(boxData1[0])"
-                                        v-if="boxData1[0]" :title="boxData1[0].title"
+                                        v-if="boxData1[0]" :title="boxData1[0].name"
                                         :target="boxData1[0].islink == 1 ? '_blank' : '_self'">
-                                        {{ boxData1[0].title }}
+                                        {{ boxData1[0].name }}
                                     </NuxtLink>
                                     <NuxtLink class="index_ul_4_a dot1" :href="getLinkPathDetail(item)"
-                                        v-for="item in boxData1data3" :title="item.title"
+                                        v-for="item in boxData1data3" :title="item.name"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        {{ item.title }}
+                                        {{ item.name }}
                                     </NuxtLink>
                                 </div>
                             </div>
                             <div class="index_ul_5 clearfix">
                                 <NuxtLink class="index_ul_5_a dot1" :href="getLinkPathDetail(item)"
-                                    v-for="item in boxData1data4" :title="item.title"
+                                    v-for="item in boxData1data4" :title="item.name"
                                     :target="item.islink == 1 ? '_blank' : '_self'">
-                                    {{ item.title }}
+                                    {{ item.name }}
                                 </NuxtLink>
                             </div>
                         </div>
@@ -192,28 +199,28 @@
                             <div class="index_ul_4_out clearfix">
                                 <div class="index_ul_4_img_box clearfix">
                                     <NuxtLink v-for="item in boxData1data2" :href="getLinkPathDetail(item)"
-                                        :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
-                                        <img class="index_ul_4_img" :src="item.imgurl" alt="item.title">
+                                        :title="item.name" :target="item.islink == 1 ? '_blank' : '_self'">
+                                        <img class="index_ul_4_img" :src="item.imgurl" :alt="item.name">
                                     </NuxtLink>
                                 </div>
                                 <div class="index_ul_4">
                                     <NuxtLink class="index_ul_4_a dot1" :href="getLinkPathDetail(boxData1data2[0])"
-                                        v-if="boxData1data2[0]" :title="boxData1data2[0].title"
+                                        v-if="boxData1data2[0]" :title="boxData1data2[0].name"
                                         :target="boxData1data2[0].islink == 1 ? '_blank' : '_self'">
-                                        {{ boxData1data2[0].title }}
+                                        {{ boxData1data2[0].name }}
                                     </NuxtLink>
                                     <NuxtLink class="index_ul_4_a dot1" :href="getLinkPathDetail(item)"
-                                        v-for="item in boxData1data5" :title="item.title"
+                                        v-for="item in boxData1data5" :title="item.name"
                                         :target="item.islink == 1 ? '_blank' : '_self'">
-                                        {{ item.title }}
+                                        {{ item.name }}
                                     </NuxtLink>
                                 </div>
                             </div>
                             <div class="index_ul_5 clearfix">
                                 <NuxtLink class="index_ul_5_a dot1" :href="getLinkPathDetail(item)"
-                                    v-for="item in boxData1data6" :title="item.title"
+                                    v-for="item in boxData1data6" :title="item.name"
                                     :target="item.islink == 1 ? '_blank' : '_self'">
-                                    {{ item.title }}
+                                    {{ item.name }}
                                 </NuxtLink>
                             </div>
                         </div>
@@ -698,6 +705,9 @@
 //0.加载页面必备组件 start---------------------------------------->
 import { ref, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
+import { getToken } from '@/store/useCookieStore'
+//获得全局url
+const { $BwebUrl, $CwebUrl } = useNuxtApp();
 //0.加载页面必备组件 end---------------------------------------->
 
 //1.获取头条新闻 start---------------------------------------->
@@ -768,6 +778,14 @@ const qhPicThree = function (num) {
     hoverStatusThree.value = num;
 }
 
+let goAddShop = () => {
+    if (getToken()) {
+        window.open($BwebUrl + '/#/addGood', '_blank');
+    } else {
+        ElMessage.error('请先登录!')
+    }
+}
+
 //图片切换
 const showImg = ref(1)
 const changeImg = function (num) {
@@ -994,24 +1012,24 @@ async function getPageAllData() {
     console.log("mkdata", mkdata)
     if (mkdata.code == 200) {
         //模块1
-        for (let index in mkdata.data[0].imgnum) {
-            if (index < 1) {
-                boxData1.value.push(mkdata.data[0].imgnum[index])
-            } else {
-                boxData1data2.value.push(mkdata.data[0].imgnum[index])
-            }
-        }
-        for (let index in mkdata.data[0].textnum) {
-            if (index < 2) {
-                boxData1data3.value.push(mkdata.data[0].textnum[index])
-            } else if (index >= 2 && index < 5) {
-                boxData1data4.value.push(mkdata.data[0].textnum[index])
-            } else if (index >= 5 && index <= 6) {
-                boxData1data5.value.push(mkdata.data[0].textnum[index])
-            } else if (index >= 7 && index <= 10) {
-                boxData1data6.value.push(mkdata.data[0].textnum[index])
-            }
-        }
+        // for (let index in mkdata.data[0].imgnum) {
+        //     if (index < 1) {
+        //         boxData1.value.push(mkdata.data[0].imgnum[index])
+        //     } else {
+        //         boxData1data2.value.push(mkdata.data[0].imgnum[index])
+        //     }
+        // }
+        // for (let index in mkdata.data[0].textnum) {
+        //     if (index < 2) {
+        //         // boxData1data3.value.push(mkdata.data[0].textnum[index])
+        //     } else if (index >= 2 && index < 5) {
+        //         boxData1data4.value.push(mkdata.data[0].textnum[index])
+        //     } else if (index >= 5 && index <= 6) {
+        //         boxData1data5.value.push(mkdata.data[0].textnum[index])
+        //     } else if (index >= 7 && index <= 10) {
+        //         boxData1data6.value.push(mkdata.data[0].textnum[index])
+        //     }
+        // }
         //模块2
         for (let index in mkdata.data[1].imgnum) {
             if (index < 1) {
@@ -1085,6 +1103,40 @@ async function getPageAllData() {
 }
 getPageAllData();
 
+// 获取首页商品模块数据
+const getShopData1 = async () => {
+    const mkdata = await requestDataPromise('/web/getWebsiteshopList', {
+        method: 'GET',
+        query: {
+            'catid': $pageNav[0],
+            'page': 1,
+            'pageSize': 12,
+            'ismix': 1,
+        },
+    });
+    // console.log("mkdata11111111", mkdata);
+
+    if (mkdata.code == 200) {
+        for (let index in mkdata.data.goods) {
+            if (index < 1) {
+                boxData1.value.push(mkdata.data.goods[index])
+            } else if (index >= 1 && index < 3) {
+                boxData1data3.value.push(mkdata.data.goods[index])
+            } else if (index >= 3 && index < 6) {
+                boxData1data4.value.push(mkdata.data.goods[index])
+            }else if(index >= 6 && index < 7){
+                boxData1data2.value.push(mkdata.data.goods[index])
+            }else if(index >= 7 && index < 9){
+                boxData1data5.value.push(mkdata.data.goods[index])
+            }else if(index >= 9 && index < 12){
+                boxData1data6.value.push(mkdata.data.goods[index])
+            }
+        }
+
+    }
+}
+getShopData1()
+
 // 获取首页商品模块数据
 const getShopData = async () => {
     const mkdata = await requestDataPromise('/web/getWebsiteshopList', {
@@ -1116,6 +1168,8 @@ const getShopData = async () => {
     }
 }
 getShopData()
+
+
 //4.页面数据 end---------------------------------------->
 
 //5.设置seo数据 start---------------------------------------->

+ 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,16 +1,16 @@
 export default defineNuxtPlugin((nuxtApp) => {
   //Pre环境
-  nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  nuxtApp.provide('CwebUrl', 'http://pre.nzgx.org')
-  nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3006')
+  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
+  // nuxtApp.provide('CwebUrl', 'http://pre.nzgx.org')
+  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
+  // nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
+  // nuxtApp.provide('userUrl', 'http://localhost:3006')
 
   //正式环境
-  // nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  // nuxtApp.provide('CwebUrl', 'http://nw.nzgx.org')
-  // nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
-  // nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-  // nuxtApp.provide('userUrl', 'http://localhost:3006')
+  nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+  nuxtApp.provide('CwebUrl', 'http://nw.nzgx.org')
+  nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+  nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+  nuxtApp.provide('userUrl', 'http://localhost:3006')
   
 })

+ 4 - 4
plugins/request.ts

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