diff --git a/api/activity.js b/api/activity.js index 949e487..e931e85 100644 --- a/api/activity.js +++ b/api/activity.js @@ -151,3 +151,13 @@ export function getBargainUserList(data) { export function getBargainUserCancel(data) { return request.post("/bargain/user/cancel", data); } + +/** + * 新品专区 + * @param {*} data + * @returns + */ + +export function queryNewZone() { + return request.get("/newGoods"); +} diff --git a/api/farmer.js b/api/farmer.js new file mode 100644 index 0000000..324d8c5 --- /dev/null +++ b/api/farmer.js @@ -0,0 +1,24 @@ +import request from "@/utils/request"; + +export function getFarmerShop(id) { + return request.get("/countyFamous/farmerShop/" + id) +} + +export function setFarmerShopZan(data) { + return request.post("/countyFamous/farmerShop/zan", data) +} + +export function getFarmerShopNews(data) { + return request.get("/countyFamous/farmerShop/news", data) +} + + +export function getFarmerShopQualification(data) { + return request.get("/countyFamous/farmerShop/qualification", data) +} + +export function setFarmerShopCollection(data) { + return request.post("/collection/farmerShop/add", data) +} + + diff --git a/api/health.js b/api/health.js new file mode 100644 index 0000000..ad8c63a --- /dev/null +++ b/api/health.js @@ -0,0 +1,81 @@ +import request from "@/utils/request"; + + +/** + * 康养生活-养生圣地分类列表 + * @returns + */ +export function getCategory() { + return request.get("/wellness/place/category") +} + +/** + * 康养生活-养生圣地列表 + * @param {*} params + * @returns + */ +export function getWellnessPlace(params) { + return request.get("/wellness/place", params) +} + +/** + * 康养生活-展会列表 + * @param {*} params + * @returns + */ +export function getWellnessExhibition(params) { + return request.get("/wellness/exhibition", params) +} + +/** + * 康养生活-展会详情 + * @param {*} id + * @returns + */ +export function getWellnessExhibitionDetails(id) { + return request.get("/wellness/exhibition/" + id) +} + +/** + * 康养生活-养生榜单 + * @param {*} params + * @returns + */ +export function getRank(params) { + return request.get("/wellness/place/ranking", params) +} + +/** + * 康养生活-养生食材列表 + * @param {*} params + * @returns + */ +export function getFoods(params) { + return request.get("/wellness/place/food", params) +} + +/** + * 康养生活-配方详情 + * @param {*} id + * @returns + */ +export function getFoodDetails(id) { + return request.get("/wellness/recipe/" + id) +} + +/** + * 康养生活-配方列表 + * @param {*} params + * @returns + */ +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/api/heritage.js b/api/heritage.js new file mode 100644 index 0000000..26c1870 --- /dev/null +++ b/api/heritage.js @@ -0,0 +1,29 @@ +import request from "@/utils/request"; + + +/** + * 省份非遗数据 + * @param {*} id + * @returns + */ +export function getIch(id) { + return request.get("/ich/v2/" + id); +} + +/** + * 省份非遗专题数据 + * @param {*} id + * @returns + */ +export function getIchContent(id) { + return request.get("/ich/v2/content/" + id); +} + +/** + * 获取省份非遗推荐数据 + * @param {*} params + * @returns + */ +export function getIchRecommend(params) { + return request.get("/ich/v2/recommend", params); +} \ No newline at end of file diff --git a/api/inn.js b/api/inn.js index 18429b5..9af877d 100644 --- a/api/inn.js +++ b/api/inn.js @@ -236,3 +236,8 @@ export function getHotelShareBackgroundImage(id) { export function hotelNewsView(data) { return request.post("/api/hotelNews/view", data, {login: true}) } + + +export function getFarmerShop(id) { + return request.get("/api/countyFamous/farmerShop/" + id) +} diff --git a/api/product.js b/api/product.js index dd0886b..1268d51 100644 --- a/api/product.js +++ b/api/product.js @@ -131,4 +131,32 @@ export function getProvince(id) { export function getProvinceGoods(parentId, keyword, page) { const params = `?parentId=${parentId}&keyword=${keyword}&page=${page}&limit=10`; return request.get('/landmarkGoods/productList' + params, {}, {login: false}) +} + +export function getPorjectRecommend(params) { + return request.get('/landmarkGoods/hotelList', params, {login: false}) +} + +export function getPorjectPolicyFiles(params) { + return request.get('/landmarkGoods/policyFiles', params, {login: false}) +} + +export function getCulture(params) { + return request.get('/landmarkGoods/culture', params, {login: false}) +} + +export function getNews(params) { + return request.get('/landmarkGoods/news', params, {login: false}) +} + +export function hadLike(data) { + return request.post('/landmarkGoods/news/zan', data, {login: false}) +} + +export function hadView(data) { + return request.post('/landmarkGoods/news/view', data, {login: false}) +} + +export function getShareImg(id) { + return request.get('/landmarkGoods/poster/' + id, {}, {login: false}) } \ No newline at end of file diff --git a/api/qianxian.js b/api/qianxian.js index bbe592d..8dab74b 100644 --- a/api/qianxian.js +++ b/api/qianxian.js @@ -94,3 +94,8 @@ export function getCountyFamousVillageDetail(id) { export function getCountyFamousVillageNews(param) { return request.get('/countyFamous/village/news', param, { login: true }) } + +// 获取千县分享图 +export function getShareImg(id) { + return request.get('/countyFamous/poster/' + id, {login: true}) +} diff --git a/assets/css/store.less b/assets/css/store.less index cf22ce0..3351917 100644 --- a/assets/css/store.less +++ b/assets/css/store.less @@ -11,8 +11,8 @@ .box-share { .box-img { position: relative; - width: 500rpx; - height: 632rpx; + width: 600rpx; + height: 832rpx; border-radius: 40rpx; overflow: hidden; } @@ -26,14 +26,14 @@ } .main-img { - width: 500rpx; - height: 632rpx; + width: 600rpx; + height: 832rpx; border-radius: 40rpx; } .btn { - width: 500rpx; - height: 100rpx; + width: 600rpx; + height: 120rpx; margin-top: 20rpx; } } \ No newline at end of file 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/components/ProductConSwiper.vue b/components/ProductConSwiper.vue index bcb0fe9..ac1c282 100644 --- a/components/ProductConSwiper.vue +++ b/components/ProductConSwiper.vue @@ -1,10 +1,10 @@