From 631385d5a9110702fb329515b9a8602f5101042f Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Wed, 17 Dec 2025 18:09:28 +0800 Subject: [PATCH] update --- pages/index/index.vue | 77 +- pages/shopMallPage/index/index.vue | 1497 +++-- pages/shopMallPage/shopType/index.vue | 110 +- pages/shopMallPage/user/newIndex.vue | 4947 +++++++++-------- pages/user/index.vue | 84 +- static/images/caiyunyi1.png | Bin 0 -> 1025808 bytes .../mp-weixin/pages/index/index.js.map | 2 +- .../pages/shopMallPage/index/index.js.map | 2 +- .../pages/shopMallPage/shopType/index.js.map | 2 +- .../mp-weixin/pages/user/index.js.map | 2 +- .../dist/dev/mp-weixin/pages/index/index.js | 124 +- .../pages/shopMallPage/index/index.js | 72 +- .../pages/shopMallPage/shopType/index.js | 79 +- .../dist/dev/mp-weixin/pages/user/index.js | 90 +- 14 files changed, 3861 insertions(+), 3227 deletions(-) create mode 100644 static/images/caiyunyi1.png diff --git a/pages/index/index.vue b/pages/index/index.vue index 9c00773d..f23dc2d4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -915,34 +915,10 @@ export default { } await this.handleGetAdvertisementData(); - // 并行加载所有数据 // const loadPromises = [ // ]; - this.handleGetHighwayHeadlines(); // 高速头条播报 - this.handleGetSpecialOffers(); // 促销单品 - this.handleGetProductsList(); // 甄选商品 - this.handleGetShoppingMall(); // 商城的内容 - this.handleGetShopMallData(); - - if (this.seat.latitude && this.seat.longitude) { - // 景区信息 - this.handleGetScenicData(); - } - - // 等待所有数据加载完成 - // try { - // await Promise.all(loadPromises); - // } catch (error) { - // console.error("数据加载失败:", error); - // } - - // this.handleAes() - this.$utils.addUserBehaviorNew({ - behaviorRecordDesc: "进入了首页", - }); - // 所有数据加载完成,隐藏骨架屏 if (this.skeletonControl && this.skeletonControl.showSkeleton) { // 如果是首次访问,延迟隐藏骨架屏并标记已访问 @@ -973,6 +949,29 @@ export default { } }, 300); }); + + if (this.seat.latitude && this.seat.longitude) { + // 景区信息 + this.handleGetScenicData(); + } + + this.handleGetHighwayHeadlines(); // 高速头条播报 + this.handleGetSpecialOffers(); // 促销单品 + this.handleGetProductsList(); // 甄选商品 + this.handleGetShoppingMall(); // 商城的内容 + this.handleGetShopMallData(); + + // 等待所有数据加载完成 + // try { + // await Promise.all(loadPromises); + // } catch (error) { + // console.error("数据加载失败:", error); + // } + + // this.handleAes() + this.$utils.addUserBehaviorNew({ + behaviorRecordDesc: "进入了首页", + }); }, async onShow() { // onShow 中不控制骨架屏,骨架屏只在 onLoad 中控制一次 @@ -1192,8 +1191,6 @@ export default { req2 ); - console.log("datadatadatadatadatadatadatadatadata", data1); - console.log("datadatadatadatadatadatadatadatadata", data2); let res1 = data1.Result_Data.List; let res2 = data2.Result_Data.List; @@ -1480,6 +1477,7 @@ export default { }, 300); }); }, + // 关闭广告 并跳转到指定页面 handleHidePopup() { uni.setStorageSync("showIndexPoster", 1); this.$refs.noticeRef.close(); @@ -1489,9 +1487,15 @@ export default { url: `/pages/shopMallPage/shopType/index?selectIndex=3&pageType=`, }); } else { - uni.navigateTo({ - url: `/pages/shopMallPage/shopType/index`, - }); + if (this.poster.SERVERPARTSHOP_ID) { + uni.navigateTo({ + url: `/pages/shopMallPage/shopType/index?indexDefaultLeftSelect=${this.poster.SERVERPARTSHOP_ID}`, + }); + } else { + uni.navigateTo({ + url: `/pages/shopMallPage/shopType/index`, + }); + } } }, // 回到顶部 @@ -1800,9 +1804,18 @@ export default { url: `/pages/shopMallPage/shopType/index?selectIndex=3`, }); } else if (obj.index === 1) { - uni.navigateTo({ - url: `/pages/shopMallPage/shopType/index?comeForm=index`, - }); + if (this.firstObj1.SERVERPARTSHOP_ID) { + uni.navigateTo({ + url: `/pages/shopMallPage/shopType/index?comeForm=index&indexDefaultLeftSelect=${this.firstObj1.SERVERPARTSHOP_ID}`, + }); + } else { + uni.navigateTo({ + url: `/pages/shopMallPage/shopType/index?comeForm=index`, + }); + } + // uni.navigateTo({ + // url: `/pages/shopMallPage/shopType/index?comeForm=index`, + // }); } else { uni.navigateTo({ url: `/pages/highwayHeadlines/attractInvestment`, diff --git a/pages/shopMallPage/index/index.vue b/pages/shopMallPage/index/index.vue index c3192fe3..b9bcc996 100644 --- a/pages/shopMallPage/index/index.vue +++ b/pages/shopMallPage/index/index.vue @@ -1,80 +1,119 @@