diff --git a/common/config.js b/common/config.js
index 3dce3cc..8ec1744 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,9 +1,9 @@
// const REAUEST_ROOTPATH = "https://hdyjy.jiangongtong.cn/";
// const REAUEST_ROOTPATH = "https://app.xawl.gov.cn/";
// const ROOTPATH = "https://app.xawl.gov.cn/";
-const REAUEST_ROOTPATH = "http://192.168.110.113:8083";
+const REAUEST_ROOTPATH = "http://192.168.130.205:8083";
// const REAUEST_ROOTPATH = "http://192.168.0.181:8083/";
-const ROOTPATH = "http://192.168.110.113:8083";
+const ROOTPATH = "http://192.168.130.205:8083";
//票务根
const PWPATH = "http://192.168.130.157:48080/app-api";
//手绘图项目名称
diff --git a/components/gaoyia-parse/components/wxParseTemplate1.vue b/components/gaoyia-parse/components/wxParseTemplate1.vue
index fa8053f..2bac4e0 100644
--- a/components/gaoyia-parse/components/wxParseTemplate1.vue
+++ b/components/gaoyia-parse/components/wxParseTemplate1.vue
@@ -42,7 +42,7 @@
-
+ {{ node }}
@@ -71,6 +71,9 @@
wxParseAudio,
wxParseTable
},
+ mounted() {
+ console.log(this.node,'node----')
+ },
methods: {
wxParseATap(attr,e) {
const {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ce19e4d..701d17e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -88,40 +88,35 @@
-
+
-
-
-
+
+
+
大美鹿泉
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
{{ item.sname }}
-
+
-
+
酒店
@@ -142,89 +137,32 @@
-
+
鹿泉味道
-
-
-
-
-
-
-
-
- {{ item.title }}
- {{ item.content }}
-
-
-
-
-
-
-
-
- 非遗
-
+
-
+
+ {{ item.title }}
+
+
-
-
-
- 旅游线路
-
-
-
-
-
-
- {{ lineOneList.lname }}
-
-
-
-
-
-
- {{ item.lname }}
- {{ item.lspecial }}
-
-
-
-
-
-
+
-
-
-
- 特产
-
-
-
-
-
-
-
- {{ item.title }}
- {{ item.content }}
-
-
-
-
+
@@ -239,7 +177,7 @@ export default {
data() {
return {
currIndex: 0,
- slideNav: ["热门推荐", "怎么玩", "吃什么", "住哪里", "去哪买"],
+ slideNav: ["怎么玩", "吃什么", "住哪里"],
trueVcal: true,
falseDots: false,
@@ -414,7 +352,8 @@ export default {
this.image3 = this.images[0];
//景区
var scenicList = initData.scenicList;
- var scLength = scenicList.length > 4 ? 4 : scenicList.length;
+ // var scLength = scenicList.length > 4 ? 4 : scenicList.length;
+ var scLength = scenicList.length;
var scdata = [];
for (let i = 0; i < scLength; i++) {
scenicList[i].slogo = this.$config.ROOTPATH + scenicList[i].slogo;
@@ -423,7 +362,8 @@ export default {
this.scenicList = scdata;
//美食
var foodList = initData.foodList;
- var foodLength = foodList.length > 4 ? 4 : foodList.length;
+ // var foodLength = foodList.length > 4 ? 4 : foodList.length;
+ var foodLength = foodList.length;
for (var i = 0; i < foodLength; i++) {
var item = {
logo: this.$config.ROOTPATH + foodList[i].logo,
@@ -436,7 +376,8 @@ export default {
}
//线路
var lineList = initData.lineList;
- var lineLength = lineList.length > 4 ? 4 : lineList.length;
+ // var lineLength = lineList.length > 4 ? 4 : lineList.length;
+ var lineLength = lineList.length;
var list = [];
for (var i = 0; i < lineLength; i++) {
lineList[i].llogo = this.$config.ROOTPATH + lineList[i].llogo;
@@ -455,7 +396,8 @@ export default {
//酒店
debugger
var hotelList = initData.hotelList;
- var hotelLength = hotelList.length > 4 ? 4 : hotelList.length;
+ // var hotelLength = hotelList.length > 4 ? 4 : hotelList.length;
+ var hotelLength = hotelList.length;
var list1 = [];
for (var i = 0; i < hotelLength; i++) {
hotelList[i].hlogo = this.$config.ROOTPATH + hotelList[i].hlogo;
@@ -465,7 +407,8 @@ export default {
//特产
var specialtyList = initData.specialtyList;
- var specialltyLength = specialtyList.length > 4 ? 4 : specialtyList.length;
+ // var specialltyLength = specialtyList.length > 4 ? 4 : specialtyList.length;
+ var specialltyLength = specialtyList.length;
var list2 = [];
for (var i = 0; i < specialltyLength; i++) {
specialtyList[i].slogo = this.$config.ROOTPATH + specialtyList[i].slogo;
@@ -475,7 +418,8 @@ export default {
this.specialtyList = list2;
//非遗
var feiyiList = initData.feiyiList;
- var feiyiLength = feiyiList.length > 4 ? 4 : feiyiList.length;
+ // var feiyiLength = feiyiList.length > 4 ? 4 : feiyiList.length;
+ var feiyiLength = feiyiList.length;
var list3 = [];
for (var i = 0; i < feiyiLength; i++) {
feiyiList[i].logo = this.$config.ROOTPATH + feiyiList[i].logo;
@@ -859,7 +803,7 @@ export default {
margin-top: 20rpx;
.m-slide-item {
- width: 20%;
+ width: 33%;
font-family: Source Han Sans SC;
font-weight: 400;
font-size: 30rpx;
@@ -868,17 +812,18 @@ export default {
transition: all ease-in-out 0.2s;
z-index: 1;
background-repeat: no-repeat;
- background-size: 50%;
- background-position: 0 15px;
+ background-size: 25%;
+ background-position: 50% 15px;
padding-bottom: 10px;
+ text-align: center;
}
.curr {
scale: 1.1;
background-image: url("@/static/animg/index/active-nav-bg.png");
background-repeat: no-repeat;
- background-size: 50%;
- background-position: 10px 15px;
+ background-size: 30%;
+ background-position: 50% 15px;
padding-bottom: 10px;
}
}
diff --git a/pages/personcenter/personcenter.1vue b/pages/personcenter/personcenter.1vue
deleted file mode 100644
index 27d13dd..0000000
--- a/pages/personcenter/personcenter.1vue
+++ /dev/null
@@ -1,618 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hi
-
- {{ nickname }}
-
- 退出
-
-
-
-
-
-
-
-
- 我的应用
-
-
-
- 我的评价
-
-
-
-
- 我的订单
-
-
-
- 在线投诉
-
-
-
- 留言投诉
-
-
-
-
- 关于我们
-
-
-
- 系统更新
-
-
-
- 注销账号
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/personcenter/personcenter.vue b/pages/personcenter/personcenter.vue
index b839776..ad1a71e 100644
--- a/pages/personcenter/personcenter.vue
+++ b/pages/personcenter/personcenter.vue
@@ -34,12 +34,20 @@
-
-
- 我的订单
- 立即查看
+
+
+
+ 景区订单
+
+
+
+
+
+
+ 酒店订单
+
+
-
@@ -776,7 +776,7 @@ map {
right: 15px;
width: 55px;
z-index: 5;
- bottom: 35%;
+ bottom: 55%;
}
.rightChoose_2 {
diff --git a/static/animg/personCenter/hotelDd.png b/static/animg/personCenter/hotelDd.png
new file mode 100755
index 0000000..514795d
Binary files /dev/null and b/static/animg/personCenter/hotelDd.png differ
diff --git a/static/animg/personCenter/senceDd.png b/static/animg/personCenter/senceDd.png
new file mode 100755
index 0000000..744a4a2
Binary files /dev/null and b/static/animg/personCenter/senceDd.png differ
diff --git a/subPageA/food/fooddetial/fooddetial.vue b/subPageA/food/fooddetial/fooddetial.vue
index f1ea7a9..03fcd3f 100644
--- a/subPageA/food/fooddetial/fooddetial.vue
+++ b/subPageA/food/fooddetial/fooddetial.vue
@@ -9,7 +9,7 @@
+ 查看详细
-
+
diff --git a/subPageA/travelroute/travelroutelist/travelroutelist.vue b/subPageA/travelroute/travelroutelist/travelroutelist.vue
index 85f5ed9..3fe9dfa 100644
--- a/subPageA/travelroute/travelroutelist/travelroutelist.vue
+++ b/subPageA/travelroute/travelroutelist/travelroutelist.vue
@@ -41,7 +41,7 @@