From 566ef9de61525a28d1ac43da9d3a99c4aa37058d Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Tue, 8 Oct 2024 00:25:03 +0800 Subject: [PATCH 001/174] =?UTF-8?q?Feat=EF=BC=9A=E5=BA=B7=E5=85=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/v12-style.less | 7 +- pages.json | 37 +++- pkg_product/views/expoDetails.vue | 119 +++++++++++ pkg_product/views/expoList.vue | 60 ++++++ pkg_product/views/healthFoodDetails.vue | 238 ++++++++++++++++++++++ pkg_product/views/healthFoods.vue | 249 ++++++++++++++++++++++++ pkg_product/views/healthList.vue | 58 ++++-- pkg_product/views/healthSanctum.vue | 152 +++++++++++++++ 8 files changed, 901 insertions(+), 19 deletions(-) create mode 100644 pkg_product/views/expoDetails.vue create mode 100644 pkg_product/views/expoList.vue create mode 100644 pkg_product/views/healthFoodDetails.vue create mode 100644 pkg_product/views/healthFoods.vue create mode 100644 pkg_product/views/healthSanctum.vue diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less index a5a4b62..3191b86 100644 --- a/assets/css/v12-style.less +++ b/assets/css/v12-style.less @@ -3,8 +3,8 @@ @dark-color: #333333; @white-color: #fff; -@colors: #C52733, #333333, #fff, #666, #F0F0F0, #999999, #E92727, #FFC543; -@classnames: primary, dark, white, secondary-dark, grey, dark1, red, yellow; +@colors: #C52733, #333333, #fff, #666, #F0F0F0, #999999, #E92727, #FFC543, #69C573; +@classnames: primary, dark, white, secondary-dark, grey, dark1, red, yellow, success; /*=====================================*/ each(@colors, { @@ -192,6 +192,9 @@ each(@colors, { .v12-full-width{ width: 100%; } +.v12-nowrap{ + white-space: nowrap +} diff --git a/pages.json b/pages.json index d962e7b..96a5a28 100644 --- a/pages.json +++ b/pages.json @@ -540,7 +540,42 @@ { "path": "views/healthList", "style": { - "navigationBarTitleText": "康养 · 食材" + "navigationBarTitleText": "选择城市" + } + }, + { + "path": "views/expoList", + "style": { + "navigationBarTitleText": "康养生活", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "views/expoDetails", + "style": { + "navigationBarTitleText": "康养生活", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "views/healthSanctum", + "style": { + "navigationBarTitleText": "康养生活", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "views/healthFoods", + "style": { + "navigationBarTitleText": "康养生活", + "navigationBarBackgroundColor": "#FAEED8" + } + }, + { + "path": "views/healthFoodDetails", + "style": { + "navigationBarTitleText": "康养生活", + "navigationBarBackgroundColor": "#FFFFFF" } }, { diff --git a/pkg_product/views/expoDetails.vue b/pkg_product/views/expoDetails.vue new file mode 100644 index 0000000..df0bc77 --- /dev/null +++ b/pkg_product/views/expoDetails.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/pkg_product/views/expoList.vue b/pkg_product/views/expoList.vue new file mode 100644 index 0000000..b8584fe --- /dev/null +++ b/pkg_product/views/expoList.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/pkg_product/views/healthFoodDetails.vue b/pkg_product/views/healthFoodDetails.vue new file mode 100644 index 0000000..b8fd672 --- /dev/null +++ b/pkg_product/views/healthFoodDetails.vue @@ -0,0 +1,238 @@ + + + \ No newline at end of file diff --git a/pkg_product/views/healthFoods.vue b/pkg_product/views/healthFoods.vue new file mode 100644 index 0000000..e2ac714 --- /dev/null +++ b/pkg_product/views/healthFoods.vue @@ -0,0 +1,249 @@ + + + \ No newline at end of file diff --git a/pkg_product/views/healthList.vue b/pkg_product/views/healthList.vue index 5a3136d..286c1d6 100644 --- a/pkg_product/views/healthList.vue +++ b/pkg_product/views/healthList.vue @@ -1,20 +1,20 @@ \ No newline at end of file diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue index 0a67a90..8192aec 100644 --- a/pkg_product/views/healthSanctum.vue +++ b/pkg_product/views/healthSanctum.vue @@ -12,8 +12,11 @@ - - 旅居预约 + + + + + 旅居预约 @@ -29,12 +32,18 @@ - - + + {{ item.areaName }} - {{ item.address }} - + {{ item.address }} + @@ -51,16 +60,7 @@ export default { return { tabs: [], items: [], - traveItems: [ - {img: '', value: ''}, - {img: '', value: ''}, - {img: '', value: ''}, - {img: '', value: ''}, - {img: '', value: ''}, - {img: '', value: ''}, - {img: '', value: ''}, - {img: '', value: ''}, - ], + traveItems: [], actived: 0, cityId: '', cityName: '', @@ -70,12 +70,13 @@ export default { }, onLoad(opts) { this.cityId = opts.city - this.cityName = opts.cityName + this.cityName = decodeURIComponent(decodeURIComponent(opts.cityName)) getCategory().then(res => { this.tabs = res.data this.categoryId = res.data[0].id this.getList() }) + this.getTop() }, methods: { handleTab(index, tab) { @@ -103,7 +104,27 @@ export default { }, search() { this.getList() - } + }, + getTop() { + const params = { + goodCityId: this.cityId, + categoryId: 0, + page: 1, + limit: 9999 + } + getWellnessPlace(params).then(res => { + // console.log(res); + this.traveItems = res.data.records + }) + }, + toStore(id) { + this.$yrouter.push({ + path: '/pagesInn/inn/innHome', + query: { + id: id + } + }) + }, } } From 8c2e785ea0f4ab7a4945bc2cde14a07428971b44 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 9 Oct 2024 23:58:37 +0800 Subject: [PATCH 005/174] =?UTF-8?q?Feat=EF=BC=9A=E5=BA=B7=E5=85=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4=EF=BC=88?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 3 +- pkg_product/views/expoDetails.vue | 23 ++++-- pkg_product/views/healthFoods.vue | 119 ++++++++++++++-------------- pkg_product/views/healthList.vue | 36 +++++++-- pkg_product/views/healthSanctum.vue | 64 ++++++++++++--- 5 files changed, 161 insertions(+), 84 deletions(-) diff --git a/pages.json b/pages.json index 96a5a28..1c6dd7d 100644 --- a/pages.json +++ b/pages.json @@ -540,7 +540,8 @@ { "path": "views/healthList", "style": { - "navigationBarTitleText": "选择城市" + "navigationBarTitleText": "选择城市", + "navigationBarBackgroundColor": "#FFFFFF" } }, { diff --git a/pkg_product/views/expoDetails.vue b/pkg_product/views/expoDetails.vue index 96f367b..7cb81b0 100644 --- a/pkg_product/views/expoDetails.vue +++ b/pkg_product/views/expoDetails.vue @@ -4,7 +4,7 @@ - {{ details.theme }} + {{ details.name }} 展会信息 @@ -14,7 +14,7 @@ 内容 - {{ details.content||'' }} + 时间 @@ -28,7 +28,10 @@ 其他展会 - 查看更多 + + 查看更多 + + \ No newline at end of file + From dce372aca35694b4d67bbc8781dbaaebd98ed0ba Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Thu, 10 Oct 2024 19:46:37 +0800 Subject: [PATCH 010/174] =?UTF-8?q?Fix=EF=BC=9A2462=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BA=B7=E5=85=BB?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E2=80=94=E5=B1=95=E4=BC=9A=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E2=80=94=E5=85=B6=E4=BB=96=E5=B1=95=E4=BC=9A=EF=BC=8C=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E6=9A=82=E6=97=A0=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E2=80=9D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 10 +++++----- pkg_product/views/expoList.vue | 9 +++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pages.json b/pages.json index 1c6dd7d..6d139a1 100644 --- a/pages.json +++ b/pages.json @@ -547,35 +547,35 @@ { "path": "views/expoList", "style": { - "navigationBarTitleText": "康养生活", + "navigationBarTitleText": "康养旅居", "navigationBarBackgroundColor": "#FFFFFF" } }, { "path": "views/expoDetails", "style": { - "navigationBarTitleText": "康养生活", + "navigationBarTitleText": "康养旅居", "navigationBarBackgroundColor": "#FFFFFF" } }, { "path": "views/healthSanctum", "style": { - "navigationBarTitleText": "康养生活", + "navigationBarTitleText": "康养旅居", "navigationBarBackgroundColor": "#FFFFFF" } }, { "path": "views/healthFoods", "style": { - "navigationBarTitleText": "康养生活", + "navigationBarTitleText": "康养旅居", "navigationBarBackgroundColor": "#FAEED8" } }, { "path": "views/healthFoodDetails", "style": { - "navigationBarTitleText": "康养生活", + "navigationBarTitleText": "康养旅居", "navigationBarBackgroundColor": "#FFFFFF" } }, diff --git a/pkg_product/views/expoList.vue b/pkg_product/views/expoList.vue index 7e8b207..71e97b7 100644 --- a/pkg_product/views/expoList.vue +++ b/pkg_product/views/expoList.vue @@ -18,6 +18,14 @@ > {{ item.name }} + + + + + @@ -26,6 +34,7 @@ import { getWellnessExhibition } from '@/api/health' export default{ data() { return { + webUrl: this.$VUE_APP_RESOURCES_URL, keyword: '', expoList: [] } From 021e94084fe0f868bb87fbc3273985e6a4c1bcc7 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Thu, 10 Oct 2024 19:48:41 +0800 Subject: [PATCH 011/174] =?UTF-8?q?Fix=EF=BC=9A2460=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=BB=E7=94=9F?= =?UTF-8?q?=E5=9C=A3=E5=9C=B0--=E7=82=B9=E5=87=BB=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=9B=BE=E4=B8=8D=E4=BC=9A=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/healthSanctum.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue index 158c158..75e9c15 100644 --- a/pkg_product/views/healthSanctum.vue +++ b/pkg_product/views/healthSanctum.vue @@ -40,7 +40,7 @@ - + --> - + @@ -165,6 +165,7 @@ import { getFoodDetails } from '@/api/health' background: #fff; border-radius: 20rpx; padding: 20rpx; + box-sizing: border-box; } .tips-wrap{ background: #F2F2F2; From b3b5f3f6e48158a5ed716605fb69afa44d45043e Mon Sep 17 00:00:00 2001 From: linxi Date: Fri, 11 Oct 2024 14:57:18 +0800 Subject: [PATCH 021/174] =?UTF-8?q?Fix=EF=BC=9A2472=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=B1=95=E4=BC=9A=E8=BD=AE=E6=92=AD=E5=9B=BE=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=B1=95=E4=BC=9A=E8=AF=A6?= =?UTF-8?q?=E6=83=85=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=90=8E=E5=8F=B0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E8=BD=AE=E6=92=AD=E5=9B=BE=EF=BC=8C=E5=92=8C?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=98=BE=E7=A4=BA=E7=9A=84=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/health.js | 8 ++++++++ pkg_product/views/healthList.vue | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/api/health.js b/api/health.js index fa1d0a8..ad8c63a 100644 --- a/api/health.js +++ b/api/health.js @@ -70,4 +70,12 @@ export function getFoodDetails(id) { */ export function getRecipe(params) { return request.get("/wellness/recipe", params) +} + +/** + * 康养生活-展会轮播图 + * @returns + */ +export function getBanner() { + return request.get("/wellness/exhibition/banner") } \ No newline at end of file diff --git a/pkg_product/views/healthList.vue b/pkg_product/views/healthList.vue index 210316e..6c60cdf 100644 --- a/pkg_product/views/healthList.vue +++ b/pkg_product/views/healthList.vue @@ -36,9 +36,9 @@ :key="index" > @@ -168,7 +168,7 @@ // 康养食材 import { fetchCity } from '@/api/wenwan' import { wellnessFood, wellnessPlaceList } from '@/api/product' -import { getWellnessPlace, getWellnessExhibition } from '@/api/health' +import { getWellnessPlace, getWellnessExhibition, getBanner } from '@/api/health' import { getProducts } from '@/api/store' import { pageListenMixins } from '@/mixins/pageListenMixins' export default { @@ -195,8 +195,8 @@ export default { }, methods: { init() { - wellnessFood().then(({data}) => { - this.bannerList = data.banner + getBanner().then(({data}) => { + this.bannerList = data }) fetchCity(4).then(({data}) => { this.asideList = data.group From e493acec5970cddee84673cafb92625747f62ded Mon Sep 17 00:00:00 2001 From: linxi Date: Fri, 11 Oct 2024 15:41:06 +0800 Subject: [PATCH 022/174] =?UTF-8?q?Fix=EF=BC=9A2475=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E9=A2=84=E7=BA=A6=E6=97=85=E5=B1=85?= =?UTF-8?q?=E4=B8=8E=E8=8D=AF=E8=86=B3=E9=A3=9F=E8=B0=B1=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E6=A1=86=E9=80=8F=E6=98=8E=E5=BA=A6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA70%=EF=BC=8C=E6=96=87=E5=AD=97=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E6=97=B6=E7=94=A8=E7=9C=81=E7=95=A5=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=B8=8D=E8=A6=81=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/healthFoods.vue | 2 +- pkg_product/views/healthSanctum.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_product/views/healthFoods.vue b/pkg_product/views/healthFoods.vue index b58062b..e782c9a 100644 --- a/pkg_product/views/healthFoods.vue +++ b/pkg_product/views/healthFoods.vue @@ -460,7 +460,7 @@ export default { bottom: 30rpx; text-align: center; width: 212rpx; - background: rgba(255, 255, 255, 0.9); + background: rgba(255, 255, 255, 0.7); border-radius: 60rpx; font-size: 28rpx; font-weight: bold; diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue index 87ef2f5..3be244c 100644 --- a/pkg_product/views/healthSanctum.vue +++ b/pkg_product/views/healthSanctum.vue @@ -188,7 +188,7 @@ export default { bottom: 30rpx; text-align: center; width: 212rpx; - background: rgba(255,255,255,0.9); + background: rgba(255,255,255,0.7); border-radius: 60rpx; font-size: 28rpx; font-weight: bold; From 28ce362a394e1a7f6bca217770a3b86c6fea6a40 Mon Sep 17 00:00:00 2001 From: linxi Date: Fri, 11 Oct 2024 16:19:38 +0800 Subject: [PATCH 023/174] =?UTF-8?q?Fix=EF=BC=9A2455=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=BB=E7=94=9F?= =?UTF-8?q?=E5=9C=A3=E5=9C=B0=E5=BA=97=E9=93=BA=E6=90=9C=E7=B4=A2=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=8D=95=E7=8B=AC=E5=BC=80=E4=B8=AA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E4=B8=8D?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=86=E7=B1=BB=E5=B1=95=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=B1=95=E7=A4=BA=E5=BD=93=E5=89=8D=E5=9F=8E?= =?UTF-8?q?=E5=B8=82=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 7 ++ pkg_product/views/healthSanctum.vue | 8 +- pkg_product/views/healthSearch.vue | 115 ++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 pkg_product/views/healthSearch.vue diff --git a/pages.json b/pages.json index 6d139a1..aebcea3 100644 --- a/pages.json +++ b/pages.json @@ -579,6 +579,13 @@ "navigationBarBackgroundColor": "#FFFFFF" } }, + { + "path": "views/healthSearch", + "style": { + "navigationBarTitleText": "搜索", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { "path": "views/heritage", "style": { diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue index 3be244c..4e73889 100644 --- a/pkg_product/views/healthSanctum.vue +++ b/pkg_product/views/healthSanctum.vue @@ -11,8 +11,8 @@ class="icon" /> {{ cityName }} - - + + @@ -126,7 +126,9 @@ export default { }) }, search() { - this.getList() + uni.navigateTo({ + url: '/pkg_product/views/healthSearch?city=' + this.cityId + '&cityName=' + this.cityName + }) }, getTop() { const params = { diff --git a/pkg_product/views/healthSearch.vue b/pkg_product/views/healthSearch.vue new file mode 100644 index 0000000..3f3f8d6 --- /dev/null +++ b/pkg_product/views/healthSearch.vue @@ -0,0 +1,115 @@ + + + + + \ No newline at end of file From da940c76682ab34a8081010deb5099f48b12c0e3 Mon Sep 17 00:00:00 2001 From: linxi Date: Fri, 11 Oct 2024 16:44:45 +0800 Subject: [PATCH 024/174] =?UTF-8?q?Fix=EF=BC=9A2482=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=BB=E7=94=9F?= =?UTF-8?q?=E5=9C=A3=E5=9C=B0=EF=BC=8C=E5=BA=97=E9=93=BA=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E4=B8=BA=E8=A7=86=E9=A2=91=E6=97=B6=EF=BC=8C=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=B0=81=E9=9D=A2=E5=85=A5=E5=8F=A3=E5=B0=81=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/healthSanctum.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue index 4e73889..2e04330 100644 --- a/pkg_product/views/healthSanctum.vue +++ b/pkg_product/views/healthSanctum.vue @@ -20,7 +20,7 @@ - + 旅居预约 @@ -49,6 +49,8 @@ :src="item.cover" :play-btn-position="center" :show-fullscreen-btn="false" + :show-center-play-btn="flase" + :show-play-btn="false" v-if="item.coverType === 2"> From 37349183f264e1ac2ab1140b52628aa9572af009 Mon Sep 17 00:00:00 2001 From: linxi Date: Fri, 11 Oct 2024 17:27:56 +0800 Subject: [PATCH 025/174] =?UTF-8?q?Fix=EF=BC=9A2485=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=8C=89=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E5=9B=BE=E4=B8=8A=E4=BC=A0164*250=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E5=9B=BE=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AE=8C=E6=95=B4=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/healthFoods.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_product/views/healthFoods.vue b/pkg_product/views/healthFoods.vue index e782c9a..9f60507 100644 --- a/pkg_product/views/healthFoods.vue +++ b/pkg_product/views/healthFoods.vue @@ -67,7 +67,7 @@ - + {{ k.title @@ -399,7 +399,7 @@ export default { width: 100%; background: #999; border-radius: 20rpx; - overflow: auto; + overflow: hidden; box-sizing: border-box; position: relative; } From 387fe8d2b814105ad37bf0975db6c5718e090787 Mon Sep 17 00:00:00 2001 From: linxi Date: Fri, 11 Oct 2024 17:39:12 +0800 Subject: [PATCH 026/174] =?UTF-8?q?Fix=EF=BC=9A2455=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=BB=E7=94=9F?= =?UTF-8?q?=E5=9C=A3=E5=9C=B0=E5=BA=97=E9=93=BA=E6=90=9C=E7=B4=A2=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=8D=95=E7=8B=AC=E5=BC=80=E4=B8=AA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E4=B8=8D?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=86=E7=B1=BB=E5=B1=95=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=B1=95=E7=A4=BA=E5=BD=93=E5=89=8D=E5=9F=8E?= =?UTF-8?q?=E5=B8=82=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/healthSearch.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg_product/views/healthSearch.vue b/pkg_product/views/healthSearch.vue index 3f3f8d6..0e423ef 100644 --- a/pkg_product/views/healthSearch.vue +++ b/pkg_product/views/healthSearch.vue @@ -31,7 +31,7 @@ - + @@ -66,7 +66,15 @@ export default { // console.log(res); this.items = res.data.records }) - } + }, + toStore(id) { + this.$yrouter.push({ + path: '/pagesInn/inn/innHome', + query: { + id: id + } + }) + }, } } From 09941be7b68e60794d41d24a34b3e211c66761e2 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 21:18:51 +0800 Subject: [PATCH 027/174] =?UTF-8?q?Fix=EF=BC=9A2482=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=BB=E7=94=9F?= =?UTF-8?q?=E5=9C=A3=E5=9C=B0=EF=BC=8C=E5=BA=97=E9=93=BA=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E4=B8=BA=E8=A7=86=E9=A2=91=E6=97=B6=EF=BC=8C=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=B0=81=E9=9D=A2=E5=85=A5=E5=8F=A3=E5=B0=81=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/healthSanctum.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue index 2e04330..0277b5f 100644 --- a/pkg_product/views/healthSanctum.vue +++ b/pkg_product/views/healthSanctum.vue @@ -51,6 +51,7 @@ :show-fullscreen-btn="false" :show-center-play-btn="flase" :show-play-btn="false" + :controls="false" v-if="item.coverType === 2"> From 226a17f420ab24639944f8aaa5f9bf68c8d26f7e Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 21:24:02 +0800 Subject: [PATCH 028/174] =?UTF-8?q?Fix=EF=BC=9A2417=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=98=BE=E7=A4=BA=E9=A9=B3=E5=9B=9E=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/OrderDetails/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 2a0d495..3cba9e9 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -8,7 +8,10 @@ 待核销 {{ getStatus(orderInfo) }} - {{ orderInfo._status._msg }} + + {{ orderInfo._status._msg }} + 驳回原因: {{ orderInfo.refundReasonWap }} + 需支付{{ orderInfo.payPrice }}元， From 8536ad2aca1bda29524afcc4469c549bdd4733c6 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 21:26:30 +0800 Subject: [PATCH 029/174] =?UTF-8?q?Fix=EF=BC=9A2424=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=8D=83=E5=8E=BF?= =?UTF-8?q?=E2=80=94=E6=96=87=E5=8C=96=E5=9B=BE=E7=89=87=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=8B=89=E4=BC=B8=EF=BC=88=E9=95=BF=E5=AE=BD?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA1:1=E6=AD=A3=E6=96=B9?= =?UTF-8?q?=E5=BD=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/famousQianxianShop.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue index c4177ce..e50ba47 100644 --- a/pkg_product/views/famousQianxianShop.vue +++ b/pkg_product/views/famousQianxianShop.vue @@ -1469,7 +1469,7 @@ export default { .img { display: block; width: 320rpx; - height: 360rpx; + height: 320rpx; border-radius: 16rpx; } &:nth-child(2n) { From abd13edb817f7aeb04e0c8e8d317f7b3eb934d9f Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 21:35:13 +0800 Subject: [PATCH 030/174] =?UTF-8?q?Fix=EF=BC=9A2444=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=97=8F-=E5=8D=83=E5=8E=BF=EF=BC=8C=E5=8D=83?= =?UTF-8?q?=E5=8E=BF=E5=BA=97=E9=93=BA=E6=94=B6=E8=97=8F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=BA=95=E8=89=B2=E6=98=BE=E7=A4=BA=E4=B8=8D=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_user/views/myFavorite.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue index 6271b9f..a72e70b 100644 --- a/pkg_user/views/myFavorite.vue +++ b/pkg_user/views/myFavorite.vue @@ -220,7 +220,7 @@ v-if="tabsIndex === 3" :class="{'manage-state':isManage}" class="scroll-box county-scroll" - :style="{background : countyFamousList.length === 0 ? '#f5f5f5' : '#fff !important'}" + :style="{background : countyFamousList.length === 0 ? '#f5f5f5' : '#f5f5f5 !important'}" scroll-y @scrolltolower="fetchCountyFamous()" > @@ -801,9 +801,10 @@ export default { .county-list-wrap { display: flex; flex-wrap: wrap; - width: 710rpx; + // width: 710rpx; + justify-content: center; margin: 0 auto; - background-color: #f0f0f0; + background-color: #f5f5f5; .county-item { width: 344rpx; height: 440rpx; From d9c696af233deb198cf401dc54b5ac1f323f55c6 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 21:49:07 +0800 Subject: [PATCH 031/174] =?UTF-8?q?Fix=EF=BC=9A2445=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=9C=AA=E6=89=93?= =?UTF-8?q?=E5=BC=80=E5=94=AE=E5=90=8E=E7=9A=84=E5=BE=85=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84=E3=80=90=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E3=80=91=E6=8C=89=E9=92=AE=E4=BB=8D=E7=84=B6?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=80=E6=AC=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/OrderDetails/index.vue | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 3cba9e9..ea32a0e 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -10,7 +10,7 @@ {{ getStatus(orderInfo) }} {{ orderInfo._status._msg }} - 驳回原因: {{ orderInfo.refundReasonWap }} + 驳回原因: {{ orderInfo.refundReasonWap }} 需支付{{ orderInfo.payPrice }}元， @@ -347,7 +347,7 @@ 联系商家 - 更多 + 更多 延长收货 申请退款 @@ -549,7 +549,7 @@ export default { copyClipboard, handleBody() { this.showMore = false - this.$forceUpdate() + // this.$forceUpdate() }, getExpressInfo() { let params = { @@ -729,12 +729,21 @@ export default { }) }, goGoodsReturn(orderInfo) { - this.$yrouter.push({ - path: "/pages/order/GoodsReturn/index", - query: { - id: orderInfo.orderId - } - }); + if(orderInfo.refundSystemStatus === 0) { + uni.showToast({ + title: '订单已收货，如需退款请联系商家', + mask: false, + icon: 'none', + duration: 3000 + }) + } else { + this.$yrouter.push({ + path: "/pages/order/GoodsReturn/index", + query: { + id: orderInfo.orderId + } + }); + } }, goGroupRule(orderInfo) { this.$yrouter.push({ From 848307944ce2eb30377605d588ad2410dd70b050 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 21:50:47 +0800 Subject: [PATCH 032/174] =?UTF-8?q?Fix=EF=BC=9A2445=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=9C=AA=E6=89=93?= =?UTF-8?q?=E5=BC=80=E5=94=AE=E5=90=8E=E7=9A=84=E5=BE=85=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84=E3=80=90=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E3=80=91=E6=8C=89=E9=92=AE=E4=BB=8D=E7=84=B6?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=80=E6=AC=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/OrderDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index ea32a0e..e457510 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -366,7 +366,7 @@ 联系商家 - 更多 + 更多 申请退款 From fb23c8fccf1e2857e1ecafd7bd8fe7a9b868b620 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 21:54:37 +0800 Subject: [PATCH 033/174] =?UTF-8?q?Fix=EF=BC=9A2446=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BE=85=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E5=BE=85=E8=AF=84=E4=BB=B7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E2=80=94=E7=82=B9=E5=87=BB=E3=80=90?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E3=80=91=E4=B8=8B=E7=9A=84=E3=80=90=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=80=80=E6=AC=BE=E3=80=91=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E8=B7=B3=E8=BD=AC=E5=BE=85=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E6=9C=AA=E5=8F=91=E8=B4=A7=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/OrderDetails/index.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index e457510..c17d9be 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -737,12 +737,15 @@ export default { duration: 3000 }) } else { - this.$yrouter.push({ - path: "/pages/order/GoodsReturn/index", - query: { - id: orderInfo.orderId - } - }); + // this.$yrouter.push({ + // path: `/pkg_orders/views/refund?id=${orderInfo.orderId}`, + // query: { + // id: orderInfo.orderId + // } + // }); + uni.navigateTo({ + url: `/pkg_orders/views/refund?id=${orderInfo.orderId}` + }) } }, goGroupRule(orderInfo) { From 58e29a98c84b505ef47532f5fd5453b3403d9d1c Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 22:33:39 +0800 Subject: [PATCH 034/174] =?UTF-8?q?Fix=EF=BC=9A2448=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BE=85=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E5=86=85?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E3=80=90=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E3=80=91=EF=BC=8C=E9=87=8D=E5=A4=8D=E5=BC=B9=E5=87=BA=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E4=BF=AE=E6=94=B9=E7=9A=84=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/MyOrder/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index b825034..1f2e0af 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -248,6 +248,7 @@ export default { keyword: '', _orderId: '', addressId: '', + currentRoute: '' }; }, components: { @@ -263,7 +264,10 @@ export default { this.getOrderListReq(); uni.$on('chooseAddress', (res) => { this.addressId = res.id + }) + const pages = getCurrentPages() // 获取栈实例 + this.currentRoute = pages[pages.length - 1].route; }, onHide() { this.orderList = []; @@ -274,7 +278,9 @@ export default { }, watch: { addressId(val) { - if(val) { + const pages = getCurrentPages() // 获取栈实例 + let currentRoute = pages[pages.length - 2].route; + if(val && this.currentRoute === currentRoute) { const params = { addressId: this.addressId, orderId: this._orderId From 2c6c7e82a9ce1c7e1c83875de3685c4e06ec644d Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 22:42:19 +0800 Subject: [PATCH 035/174] =?UTF-8?q?Fix=EF=BC=9A2451=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=AF=BB=E8=B6=A3?= =?UTF-8?q?=E5=91=B3--=E7=82=B9=E5=87=BB=E8=BD=AE=E6=92=AD=E5=9B=BE?= =?UTF-8?q?=E6=88=96=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=90=8E=E9=A1=B5=E9=9D=A2=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E4=BC=9A=E5=9B=9E=E5=88=B0=E7=AC=AC=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cloud/haveFun.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue index d2e856c..559cdc6 100644 --- a/pages/cloud/haveFun.vue +++ b/pages/cloud/haveFun.vue @@ -165,7 +165,7 @@ export default { const memCityName = uni.getStorageSync('cityName') this.page = 1 this.currType = {} - this.typeIndex = 0 + // this.typeIndex = 0 this.name = '' getHotelTypeList().then(({data}) => { this.typeList = data From 194a51ee19b4cceeb1604c720b47695423b43414 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 22:42:38 +0800 Subject: [PATCH 036/174] =?UTF-8?q?Fix=EF=BC=9A2467=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=A8=E5=9B=BD?= =?UTF-8?q?=E7=89=B9=E4=BA=A7--=E5=9F=8E=E5=B8=82=E5=86=85=E7=9A=84?= =?UTF-8?q?=E7=89=B9=E4=BA=A7=E5=95=86=E5=93=81=E8=BF=87=E5=A4=9A=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=BA=95=E9=83=A8=E7=9A=84=E5=95=86=E5=93=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/nativeList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_product/views/nativeList.vue b/pkg_product/views/nativeList.vue index eed2b71..c86e77d 100644 --- a/pkg_product/views/nativeList.vue +++ b/pkg_product/views/nativeList.vue @@ -187,7 +187,7 @@ export default { .article-box { width: 100%; .list { - padding: 0 0 20rpx 0; + padding: 0 0 40rpx 0; } .item { width: 345rpx; From f3e036b9bea8f1bdac2141ed4209bdbc32727d70 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 11 Oct 2024 22:47:49 +0800 Subject: [PATCH 037/174] =?UTF-8?q?Fix=EF=BC=9A2419=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B6=E9=83=A8=E5=9B=BE=E7=89=87=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E8=87=AA=E5=8A=A8=E8=BD=AE=E6=92=AD=EF=BC=8C?= =?UTF-8?q?2=E7=A7=92=E8=BD=AE=E6=92=AD=E4=B8=80=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ProductConSwiper.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/ProductConSwiper.vue b/components/ProductConSwiper.vue index bcb0fe9..14d8ccc 100644 --- a/components/ProductConSwiper.vue +++ b/components/ProductConSwiper.vue @@ -1,6 +1,6 @@