From 19f4211a649fee97c3d5e11c40055fe5a0e046be Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Wed, 13 Sep 2023 18:09:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E3=80=81=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E3=80=81=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85=E7=AD=89?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 +- components/zbpSwiper.vue | 20 ++-- config/app.js | 4 +- pages/gather/gather.vue | 80 +++++++++---- pages/index/index.vue | 109 ++++++++++-------- pages/plantGrass/plant_detail/index.vue | 6 +- pages/product/basicSet.vue | 5 +- pages/product/list/index.vue | 3 +- pages/short_video/appSwiper/index.nvue | 49 ++++---- .../components/mentioned/mentioned.vue | 9 +- pages/supply_chains/supply_chains.vue | 45 ++++++++ pages/users/login/login_copy.vue | 6 +- 12 files changed, 217 insertions(+), 123 deletions(-) diff --git a/App.vue b/App.vue index 951f3f5..387107c 100644 --- a/App.vue +++ b/App.vue @@ -149,7 +149,7 @@ that.getConfigData() //#ifdef APP-PLUS - + this.checknetwork() jpushModule.setLoggerEnable(true); jpushModule.initJPushService() @@ -258,7 +258,7 @@ uni.reLaunch({ url: '/pages/index/index' }) - + } else { uni.showModal({ diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index dc15f5e..8dea21b 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -7,13 +7,13 @@ - + @@ -51,9 +51,7 @@ getIndexData, getDiy } from '@/api/api.js' - import { - getGeocoder - } from '@/api/store.js'; + import { mapGetters } from 'vuex' @@ -115,11 +113,17 @@ }, mounted() { + this.$bus.$on('value-updated', (newValue) => { // 更新组件的值 this.street = newValue.split(',')[0] + }); }, + onShow() { + this.getBanner() + this.Area() + }, methods: { swiperClick(item) { @@ -130,11 +134,9 @@ }, selectLocation() { this.isSelectPlace ? this.showPicker = true : '' - }, confirm(e) { - this.showPicker = false this.$emit('selectPlce', e) this.$emit('change', e) @@ -144,8 +146,6 @@ }) - - }, changeHandler(e) { const { @@ -266,7 +266,7 @@ height: 66.67rpx; margin-bottom: 26.32rpx; position: relative; - z-index: 9999; + z-index: 0; // 位置 diff --git a/config/app.js b/config/app.js index 8036f9b..63b75ab 100644 --- a/config/app.js +++ b/config/app.js @@ -9,8 +9,8 @@ let httpApiThree // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' // 测试 if (process.env.NODE_ENV === "development") { - // httpApi = 'https://shop.lihaink.cn' // 生产 -httpApi = "https://crmeb-test.shop.lihaink.cn" + httpApi = 'https://shop.lihaink.cn' // 生产 + // httpApi = "https://crmeb-test.shop.lihaink.cn" // httpApi = "http://192.168.0.222" // httpApi = "http://192.168.0.108:8325" // httpApi = 'http://192.168.0.108:8325' diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index e600f37..f5c2e4d 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -1,32 +1,34 @@