From e6d2ba84d67d39f5fe300869b37ecba6595ec8fc Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Mon, 19 May 2025 09:35:01 +0800 Subject: [PATCH] update --- pages/highwayHeadlines/attractInvestment.vue | 13 +- pages/highwayHeadlines/detail.vue | 8 +- pages/highwayHeadlines/index.vue | 12 +- pages/index/index.vue | 24 +- pages/shopMallPage/index/index.vue | 229 +++-- pages/shopMallPage/shopType/index.vue | 10 +- pages/shopPages/shopDetail/index.vue | 822 ++++++++++-------- .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../mp-weixin/components/card.js.map | 2 +- .../components/currentService.js.map | 2 +- .../mp-weixin/components/keyboard.js.map | 2 +- .../mp-weixin/components/noData.js.map | 2 +- .../mp-weixin/components/shopTabbar.js.map | 2 +- .../mp-weixin/components/tabbar.js.map | 2 +- .../mp-weixin/pages/allFunPage/index.js.map | 2 +- .../mp-weixin/pages/bindCar/index.js.map | 2 +- .../pages/evaluateList/addEvaluate.js.map | 2 +- .../evaluateList/components/orderItem.js.map | 2 +- .../mp-weixin/pages/evaluateList/index.js.map | 2 +- .../pages/highwayHeadlines/detail.js.map | 2 +- .../pages/highwayHeadlines/index.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../pages/myAddress/address/index.js.map | 2 +- .../pages/myAddress/newAdd/index.js.map | 2 +- .../mp-weixin/pages/newEvaluate/index.js.map | 2 +- .../mp-weixin/pages/newMap/index/index.js.map | 2 +- .../mp-weixin/pages/noDataPage/index.js.map | 2 +- .../buyOrder/components/orderItem.js.map | 2 +- .../pages/order/buyOrder/index.js.map | 2 +- .../foodOrder/components/orderItem.js.map | 2 +- .../pages/order/foodOrder/index.js.map | 2 +- .../pages/order/orderFoodDetail/index.js.map | 2 +- .../pages/order/orderdetail/index.js.map | 2 +- .../pages/otherFunPage/finance/index.js.map | 2 +- .../otherFunPage/goPublicPage/index.js.map | 2 +- .../pages/otherFunPage/insurance/index.js.map | 2 +- .../mp-weixin/pages/payfor/index.js.map | 2 +- .../mp-weixin/pages/register/index.js.map | 2 +- .../pages/reservationOrder/index.js.map | 2 +- .../pages/serviceDetail/index.js.map | 2 +- .../mp-weixin/pages/serviceList/index.js.map | 2 +- .../pages/shopMallPage/index/index.js.map | 2 +- .../pages/shopMallPage/shopCar/index.js.map | 2 +- .../pages/shopMallPage/shopType/index.js.map | 2 +- .../pages/shopMallPage/user/index.js.map | 2 +- .../components/commodityItem.js.map | 2 +- .../components/loading/index.js.map | 2 +- .../settlement/components/orderInfo.js.map | 2 +- .../settlement/components/orderStatus.js.map | 2 +- .../settlement/components/receiveGoods.js.map | 2 +- .../pages/shopPages/settlement/index.js.map | 2 +- .../shopPages/settlementFood/index.js.map | 2 +- .../shop/components/merchantEvaluation.js.map | 2 +- .../pages/shopPages/shop/index.js.map | 2 +- .../pages/shopPages/shopDetail/index.js.map | 2 +- .../pages/shopPages/shopList/index.js.map | 2 +- .../components/merchantEvaluation.js.map | 2 +- .../mp-weixin/pages/storeDetail/index.js.map | 2 +- .../mp-weixin/pages/user/index.js.map | 2 +- .../components/l-dragSort/l-dragSort.js.map | 2 +- .../components/uni-icons/uni-icons.js.map | 2 +- .../components/uni-popup/uni-popup.js.map | 2 +- .../components/uni-rate/uni-rate.js.map | 2 +- .../pages/highwayHeadlines/detail.js | 5 +- .../pages/highwayHeadlines/detail.wxml | 2 +- .../pages/highwayHeadlines/index.wxml | 2 +- .../pages/highwayHeadlines/index.wxss | 3 +- .../dist/dev/mp-weixin/pages/index/index.js | 22 +- .../dist/dev/mp-weixin/pages/index/index.wxml | 2 +- .../pages/shopMallPage/index/index.js | 155 ++-- .../pages/shopMallPage/index/index.wxml | 2 +- .../pages/shopMallPage/index/index.wxss | 17 + .../pages/shopMallPage/shopType/index.js | 19 +- .../pages/shopPages/shopDetail/index.js | 10 +- .../pages/shopPages/shopDetail/index.wxml | 2 +- .../pages/shopPages/shopDetail/index.wxss | 60 +- .../dev/mp-weixin/project.private.config.json | 7 + 77 files changed, 897 insertions(+), 641 deletions(-) diff --git a/pages/highwayHeadlines/attractInvestment.vue b/pages/highwayHeadlines/attractInvestment.vue index e5ec7a94..d2d358ef 100644 --- a/pages/highwayHeadlines/attractInvestment.vue +++ b/pages/highwayHeadlines/attractInvestment.vue @@ -7,7 +7,7 @@ --> -
+
@@ -30,8 +30,8 @@ " />
- -
+
+
@@ -44,6 +44,7 @@ import NoData from "../../components/noData.vue"; export default { data() { return { + safeHeight: {}, tabList: [], selectTab: 0, messageList: [], // 当前显示的数据 @@ -59,6 +60,11 @@ export default { }), }, onLoad() { + let systemInfo = uni.getSystemInfoSync(); + let height = systemInfo.safeAreaInsets.bottom; + this.safeHeight = Number(height); + + // 拿到tab的数据 // this.handleGetTabList(); // this.handleGetHighwayHeadlines() @@ -370,7 +376,6 @@ export default { .contentList { width: 100%; - height: calc(100vh - 50px); overflow-y: auto; .contentItem { diff --git a/pages/highwayHeadlines/detail.vue b/pages/highwayHeadlines/detail.vue index c7d10eb7..6911b46f 100644 --- a/pages/highwayHeadlines/detail.vue +++ b/pages/highwayHeadlines/detail.vue @@ -1,5 +1,5 @@ @@ -367,8 +366,7 @@ export default { .contentList { width: 100%; - height: calc(100vh - 50px); - overflow-y: auto; + height: calc(100vh - 70px); .contentItem { width: 100%; diff --git a/pages/index/index.vue b/pages/index/index.vue index 91f48c11..372b0bda 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -32,7 +32,8 @@ - + @@ -455,13 +456,15 @@ export default { }, pageType: "", // spring 春节模式 swiperList: [ - "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg", + // "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg", + "http://saas.eshangtech.com/minTestImg/正大泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg", ], previewImageList: [ - "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg", + // "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg", + "http://saas.eshangtech.com/minTestImg/正大泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg", @@ -496,7 +499,7 @@ export default { let _this = this setTimeout(() => { _this.$refs.noticeRef.close(); - }, 5000) + }, 8000) } else { this.showPoster = false; @@ -1039,9 +1042,16 @@ export default { this.handleGoShop(); } } else if (obj.value === 17) { - uni.navigateTo({ - url: `/pages/highwayHeadlines/attractInvestment`, - }); + if (obj.index === 0) { + uni.navigateTo({ + url: `/pages/shopMallPage/shopType/index`, + }); + } else { + uni.navigateTo({ + url: `/pages/highwayHeadlines/attractInvestment`, + }); + } + } }, // 跳转到商城 diff --git a/pages/shopMallPage/index/index.vue b/pages/shopMallPage/index/index.vue index 33bfb59d..2c7eda67 100644 --- a/pages/shopMallPage/index/index.vue +++ b/pages/shopMallPage/index/index.vue @@ -192,7 +192,7 @@