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 12076da..a40aabc 100644
--- a/api/qianxian.js
+++ b/api/qianxian.js
@@ -20,6 +20,31 @@ 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 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 })
+}
+
+// 千县名品资讯被浏览
+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 +55,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 d01db26..6a8584a 100644
--- a/pages.json
+++ b/pages.json
@@ -583,6 +583,26 @@
"navigationBarTitleText": "千县名品"
}
},
+ {
+ "path": "views/famousQianxianShop",
+ "style": {
+ "navigationBarTitleText": "千县名品",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "views/famousQianxianTheme",
+ "style": {
+ "navigationBarTitleText": "千县名品",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "views/famousQianxianInvestment",
+ "style": {
+ "navigationBarTitleText": "招商政策"
+ }
+ },
{
"path": "views/famousStory",
"style": {
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({
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 @@
+
+
+
+
+
+
+
+
+
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
new file mode 100644
index 0000000..0333000
--- /dev/null
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -0,0 +1,1485 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ inn.cityName }}
+
+
+
+
+
+
+
+
+
+ {{ inn.name }}
+
+
+
+
+ {{ inn.zan }}
+
+
+
+ {{ inn.zan }}
+
+
+
+
+
+ {{ favoriteCount }}
+
+
+
+
+
+
+
+
+ {{ inn.shopIntro }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ inn.address }}
+
+
+
+
+ 导航
+
+
+
+ 客服
+
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.createTime ? item.createTime.replace(/-/g, '.').substr(0, 10) : '' }}
+
+
+
+
+ {{ item.pv }}
+
+
+
+
+ {{ item.zan }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 县城介绍
+
+ {{ toggleCountyIntroStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+ 图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.createTime }}
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ tab.name }}
+
+
+
+
+
+ 重点项目
+
+
+
+
+
+ · {{ file.title }}
+
+
+
+
+
+ 暂无重点项目
+
+
+
+
+
+
+ 产业项目
+
+
+
+
+
+
+ 暂无产业项目
+
+
+
+
+
+
+
+
+
+ {{ tab.name }}
+
+
+
+
+
+
+
+ · {{ file.title }}
+
+
+
+
+
+ 暂无招商政策
+
+
+
+
+
+ 更多政策
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg_product/views/famousQianxianTheme.vue b/pkg_product/views/famousQianxianTheme.vue
new file mode 100644
index 0000000..9b4717e
--- /dev/null
+++ b/pkg_product/views/famousQianxianTheme.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue
index 192149d..7b05c69 100644
--- a/pkg_user/views/myFavorite.vue
+++ b/pkg_user/views/myFavorite.vue
@@ -1,46 +1,88 @@
-
-
+
-
+
{{ item.label }}
-
-
-
- 管理
+
+
+
+ 管理
+
+
+
+ 退出管理
-
-
- 退出管理
-
-
-
+
+
+
-
-
-
-
-
+
+
+
- {{ item['storeName'] }}
+ {{ item['storeName'] }}
规格:{{ item['sku'] }}
@@ -56,62 +98,178 @@
-
-
-
+
+
+
-
-
+
-
-
+
+
-
{{ item['name'] }}
{{ item['time'] === '刚刚' ? '刚刚' : item['time'] + '收藏' }}
- 进店逛逛
-
+
+ 进店逛逛
+
-
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
-
+
{{ item['favoriteCount'] }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.shopIntro }}
+
+
+
+
+
-
+
全选({{ selectCount }})
@@ -123,22 +281,27 @@
\ No newline at end of file