From 05b6075df319d42ba51ca522b7c367c2280a5ee6 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 19 Aug 2024 22:44:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Feat(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81):?= =?UTF-8?q?=E5=8E=BF=E5=BA=97=E9=93=BA=E9=A6=96=E9=A1=B5=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 7 + pkg_product/views/famousQianxianShop.vue | 1115 ++++++++++++++++++++++ 2 files changed, 1122 insertions(+) create mode 100644 pkg_product/views/famousQianxianShop.vue diff --git a/pages.json b/pages.json index d01db26..dd16445 100644 --- a/pages.json +++ b/pages.json @@ -583,6 +583,13 @@ "navigationBarTitleText": "千县名品" } }, + { + "path": "views/famousQianxianShop", + "style": { + "navigationBarTitleText": "千县名品", + "navigationStyle": "custom" + } + }, { "path": "views/famousStory", "style": { diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue new file mode 100644 index 0000000..3b645d6 --- /dev/null +++ b/pkg_product/views/famousQianxianShop.vue @@ -0,0 +1,1115 @@ + + + + + From 74c5c2b7683a64316057e09e83ce91eaf0e4fc3d Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Tue, 20 Aug 2024 17:56:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Feat(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81):?= =?UTF-8?q?=E5=8E=BF=E5=BA=97=E9=93=BA=E9=A6=96=E9=A1=B5=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/qianxian.js | 37 +- pages.json | 13 + pkg_product/views/famousList.vue | 22 +- pkg_product/views/famousQianxian.vue | 12 +- .../views/famousQianxianInvestment.vue | 113 +++++ pkg_product/views/famousQianxianShop.vue | 452 ++++++++++++++++-- pkg_product/views/famousQianxianTheme.vue | 181 +++++++ 7 files changed, 786 insertions(+), 44 deletions(-) create mode 100644 pkg_product/views/famousQianxianInvestment.vue create mode 100644 pkg_product/views/famousQianxianTheme.vue diff --git a/api/qianxian.js b/api/qianxian.js index 12076da..bb13f13 100644 --- a/api/qianxian.js +++ b/api/qianxian.js @@ -20,6 +20,21 @@ export function getCountyFamousCityShop(param) { return request.get('/countyFamous/shop', param, { login: true }) } +// 千县名品店铺点赞/取消赞 +export function postCountyFamousShopZan(data) { + return request.post('/countyFamous/shop/zan', data, { login: true }) +} + +// 千县名品资讯点赞/取消赞 +export function postCountyFamousNewsZan(data) { + return request.post('/countyFamous/news/zan', data, { login: true }) +} + +// 千县名品资讯被浏览 +export function postCountyFamousNewsView(data) { + return request.post('/countyFamous/news/view', data, { login: true }) +} + // 获取千县名品县城资讯数据 export function getCountyFamousCityNews(param) { return request.get('/countyFamous/news', param, { login: true }) @@ -30,7 +45,27 @@ export function getCountyFamousCityGuide(param) { return request.get('/countyFamous/guide', param, { login: true }) } -// 获取千县名品县城攻略数据 +// 获取千县名品县城攻略专题页 export function getCountyFamousCityGuideContent(param) { return request.get('/countyFamous/guide/content', param, { login: true }) } + +// 获取千县名品县城重点产业列表 +export function getCountyFamousIndustry(param) { + return request.get('/countyFamous/industry', param, { login: true }) +} + +// 获取千县名品县城产业项目列表 +export function getCountyFamousIndustryProject(param) { + return request.get('/countyFamous/industryProject', param, { login: true }) +} + +// 获取千县名品县城产业项目文件列表 +export function getCountyFamousIndustryProjectFile(param) { + return request.get('/countyFamous/industryProject/file', param, { login: true }) +} + +// 获取千县名品县城招商政策文件列表 +export function getCountyFamousInvestmentFile(param) { + return request.get('/countyFamous/investmentFile', param, { login: true }) +} diff --git a/pages.json b/pages.json index dd16445..6a8584a 100644 --- a/pages.json +++ b/pages.json @@ -590,6 +590,19 @@ "navigationStyle": "custom" } }, + { + "path": "views/famousQianxianTheme", + "style": { + "navigationBarTitleText": "千县名品", + "navigationStyle": "custom" + } + }, + { + "path": "views/famousQianxianInvestment", + "style": { + "navigationBarTitleText": "招商政策" + } + }, { "path": "views/famousStory", "style": { diff --git a/pkg_product/views/famousList.vue b/pkg_product/views/famousList.vue index 45fe45a..d871896 100644 --- a/pkg_product/views/famousList.vue +++ b/pkg_product/views/famousList.vue @@ -57,6 +57,10 @@ 收 起 + @@ -148,6 +152,11 @@ + + + + + + + ·  {{ file.title }} + + + + + + + + + + + \ No newline at end of file diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue index 3b645d6..8c42d7f 100644 --- a/pkg_product/views/famousQianxianShop.vue +++ b/pkg_product/views/famousQianxianShop.vue @@ -110,18 +110,18 @@ - + {{ inn.address }} - + 导航 - + 客服 @@ -131,14 +131,15 @@ - + {{ item.text }} - - + @@ -193,20 +194,20 @@ {{ item.zan }} @@ -228,6 +229,7 @@ 县城介绍 {{ toggleCountyIntroStatus ? '收起' : '展开' }} + - 产业 + + + + + + + + {{ tab.name }} + + + + + + 重点项目 + + + + + + ·  {{ file.title }} + + + + + + 暂无重点项目 + + + + + + + 产业项目 + + + + + + + 暂无产业项目 + + + + + + + + + + {{ tab.name }} + + + + + + + + ·  {{ file.title }} + + + + + + 暂无招商政策 + + + + + + 更多政策 + + + @@ -321,15 +450,18 @@ + + \ No newline at end of file From e08f597f5880dc99584038533a56a69155327617 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Wed, 21 Aug 2024 11:31:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Style(=E4=B8=93=E9=A2=98=E9=A1=B5):?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF2=E7=9A=84=E8=BD=AE=E6=92=AD=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/components/ThemePageTemplate1.vue | 5 +- pkg_product/components/ThemePageTemplate2.vue | 16 ++- pkg_product/components/ThemePageTemplate4.vue | 3 + .../vear-carousel/vear-carousel.vue | 112 ++++++++++++++++++ 4 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 pkg_product/components/vear-carousel/vear-carousel.vue diff --git a/pkg_product/components/ThemePageTemplate1.vue b/pkg_product/components/ThemePageTemplate1.vue index 770eac7..1896239 100644 --- a/pkg_product/components/ThemePageTemplate1.vue +++ b/pkg_product/components/ThemePageTemplate1.vue @@ -141,7 +141,10 @@ export default { display: block; width: 330rpx; height: 540rpx; - margin: 0 30rpx 30rpx 0; + margin: 0 20rpx 30rpx 0; + &:nth-child(2n + 1) { + margin-right: 0; + } } } } diff --git a/pkg_product/components/ThemePageTemplate2.vue b/pkg_product/components/ThemePageTemplate2.vue index eef970e..9815de5 100644 --- a/pkg_product/components/ThemePageTemplate2.vue +++ b/pkg_product/components/ThemePageTemplate2.vue @@ -7,7 +7,7 @@ /> - - + --> + @@ -94,8 +99,12 @@ * 模板2 */ import { themeTemplateMixins } from '../mixins/themeTemplateMixins' +import carousel from './vear-carousel/vear-carousel' export default { name: 'ThemePageTemplate2', + components: { + carousel + }, mixins: [themeTemplateMixins] } @@ -155,6 +164,9 @@ export default { width: 330rpx; height: 540rpx; margin: 0 30rpx 25rpx 0; + &:nth-child(2n) { + margin-right: 0; + } } } } diff --git a/pkg_product/components/ThemePageTemplate4.vue b/pkg_product/components/ThemePageTemplate4.vue index a494abe..ce3cd24 100644 --- a/pkg_product/components/ThemePageTemplate4.vue +++ b/pkg_product/components/ThemePageTemplate4.vue @@ -133,6 +133,9 @@ export default { width: 330rpx; height: 540rpx; margin: 0 22rpx 22rpx 0; + &:nth-child(2n) { + margin-right: 0; + } } } } diff --git a/pkg_product/components/vear-carousel/vear-carousel.vue b/pkg_product/components/vear-carousel/vear-carousel.vue new file mode 100644 index 0000000..6a5025d --- /dev/null +++ b/pkg_product/components/vear-carousel/vear-carousel.vue @@ -0,0 +1,112 @@ + + + From 0528865e7b59581b3f6d7d754a80bb8fddbf1bc6 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Wed, 21 Aug 2024 15:22:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Fix(=E5=BA=97=E9=93=BA):[#2199]=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=BA=97=E9=93=BA=E8=B5=84=E8=B4=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=BC=9A=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesInn/inn/innProfileEdit.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pagesInn/inn/innProfileEdit.vue b/pagesInn/inn/innProfileEdit.vue index e5e126b..2a520e2 100644 --- a/pagesInn/inn/innProfileEdit.vue +++ b/pagesInn/inn/innProfileEdit.vue @@ -375,14 +375,14 @@ export default { uni.showLoading() postHotelInfoEdit(param).then((res) => { uni.hideLoading() - uni.showToast({ - title: '修改成功!', - mask: false, - duration: 1500 + uni.showModal({ + title: '提示', + content: '修改成功!', + showCancel: false, + success: () => { + uni.navigateBack() + } }) - setTimeout(function () { - uni.navigateBack() - }, 1000) }).catch((err) => { uni.hideLoading() uni.showToast({ From 99dd695553cf45b7cf4f406c58f5274604823d1b Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 23 Aug 2024 10:55:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?Feat(=E5=8D=83=E5=8E=BF=E5=BA=97=E9=93=BA):?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=8A=9F=E8=83=BD=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/favorite.js | 7 + api/qianxian.js | 10 + pkg_product/views/famousQianxianShop.vue | 24 +- pkg_user/views/myFavorite.vue | 463 +++++++++++++++++------ 4 files changed, 382 insertions(+), 122 deletions(-) diff --git a/api/favorite.js b/api/favorite.js index 81fe382..4260ba5 100644 --- a/api/favorite.js +++ b/api/favorite.js @@ -68,4 +68,11 @@ export function getVideoList(page = 1, limit = 10) { * */ export function removeFavorite(ids) { return request.post('/collection/delete', ids) +} + +/** + * 收藏千县名品县城列表 + * */ +export function getCountyFamousList(page = 1, limit = 10) { + return request.get('/collection/countyFamous/list', {page, limit}) } \ No newline at end of file diff --git a/api/qianxian.js b/api/qianxian.js index bb13f13..a40aabc 100644 --- a/api/qianxian.js +++ b/api/qianxian.js @@ -25,6 +25,16 @@ export function postCountyFamousShopZan(data) { return request.post('/countyFamous/shop/zan', data, { login: true }) } +// 千县名品店铺点赞/取消赞 +export function postCountyFamousShopAddFavorite(data) { + return request.post('/collection/countyFamous/add', data, { login: true }) +} + +// 千县名品店铺点赞/取消赞 +export function postCountyFamousShopRemoveFavorite(data) { + return request.post('/collection/countyFamous/remove', data, { login: true }) +} + // 千县名品资讯点赞/取消赞 export function postCountyFamousNewsZan(data) { return request.post('/countyFamous/news/zan', data, { login: true }) diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue index 8c42d7f..0333000 100644 --- a/pkg_product/views/famousQianxianShop.vue +++ b/pkg_product/views/famousQianxianShop.vue @@ -69,20 +69,18 @@ {{ inn.zan }} - + {{ favoriteCount }} @@ -95,9 +93,9 @@ {{ inn.shopIntro }} - @@ -449,25 +447,23 @@ \ No newline at end of file