diff --git a/api/inn.js b/api/inn.js
index 9af877d..089c259 100644
--- a/api/inn.js
+++ b/api/inn.js
@@ -241,3 +241,21 @@ export function hotelNewsView(data) {
export function getFarmerShop(id) {
return request.get("/api/countyFamous/farmerShop/" + id)
}
+
+export function getAncientTownIcon() {
+ return request.get("/ancientTown/icon")
+}
+
+export function getAncientTownList(params) {
+ return request.get("/ancientTown", params)
+}
+
+export function getAncientTownInfo(id) {
+ return request.get("/ancientTown/" + id)
+}
+
+export function getAncientTownActive(params) {
+ return request.get("/ancientTown/activity", params)
+}
+
+
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index 3191b86..a27ff1f 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -169,7 +169,9 @@ each(@colors, {
display: grid;
grid-template-columns: 1fr 1fr;
}
-
+.v12-gap-10{
+ grid-gap: 20rpx 20rpx;
+}
.v12-text-right{
text-align: right;
diff --git a/pages.json b/pages.json
index c5c74ee..b27049c 100644
--- a/pages.json
+++ b/pages.json
@@ -106,6 +106,13 @@
"navigationBarTitleText": "探索生活好去处"
}
},
+ {
+ "path": "pages/town/index",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "探索生活好去处"
+ }
+ },
{
"path": "pages/user/User/index",
"style": {
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index dee9ee6..49f1d9a 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -26,20 +26,39 @@
-
-
-
- {{ item.name }}
-
-
+
+
+
+
+
+
+
+ {{ townConfig.label }}
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
@@ -71,7 +90,16 @@
-
+
+
+ {{ town.name }}
+
+ 点击进入
+
+
+
+
+
推荐
@@ -114,7 +142,7 @@
\ No newline at end of file
diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
new file mode 100644
index 0000000..47e2551
--- /dev/null
+++ b/pages/town/components/information.vue
@@ -0,0 +1,254 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ item.createTime
+ ? item.createTime.replace(/-/g, ".").substr(0, 10)
+ : ""
+ }}
+
+
+
+
+ {{ item.pv }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/town/components/projects.vue b/pages/town/components/projects.vue
new file mode 100644
index 0000000..b21985d
--- /dev/null
+++ b/pages/town/components/projects.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ 昆明小吃
+
+
+
+
+ 刘欢小吃
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/town/components/service.vue b/pages/town/components/service.vue
new file mode 100644
index 0000000..2fb34de
--- /dev/null
+++ b/pages/town/components/service.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+ {{ info.name || '' }}
+
+
+ {{ info.openTime || '' }}
+ {{ info.address || '' }}
+ {{ info.announcement || '' }}
+
+
+
+
+
+
+ 导航
+
+
+
+
+
+ 咨询
+
+
+
+
+
+
+ 简介
+
+
+ {{ info.desc || '' }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/town/index.vue b/pages/town/index.vue
new file mode 100644
index 0000000..21b14ba
--- /dev/null
+++ b/pages/town/index.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+ {{ townInfo.name }}
+
+ 4A
+
+
+
+
+ {{ townInfo.intro }}
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file