diff --git a/pages/index/index.js b/pages/index/index.js
index 59ba94d..6b75438 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -278,7 +278,7 @@ Page({
item.ext.display_tags = []
}
})
- if(res.data.length<10) {
+ if(res.data.length<15) {
this.setData({
listMore:false
})
@@ -286,7 +286,6 @@ Page({
this.setData({
list:this.data.list.concat(res.data)
})
- console.log(res)
})
},
onReachBottom:function(){
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5a3933f..62f9538 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -73,25 +73,15 @@
特惠新品超值商品限时抢购
-
+
-
-
-
- {{saleProduct.sku.product.title+saleProduct.sku.sku_name}}
- ￥{{saleProduct.price/100}}起
-
-
-
-
-
+
限时特惠
新品推荐
- 敬请期待
@@ -99,12 +89,13 @@
精品线路四季苏州最是江南
-
-
+
- {{roadProduct.title}}
- ￥{{roadProduct.price/100}}起
+
+ 四季苏州
+ 最是江南
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index eaf9c84..ae805ac 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -139,6 +139,8 @@
top: 20rpx;
bottom: 20rpx;
width: 140rpx;
+ display: flex;
+ align-items: center;
}
.sale-product-title {
font-size: 28rpx;
@@ -467,10 +469,13 @@
}
.more-btn-text {
text-align: center;
- line-height: 40rpx;
color: #999;
- font-size: 24rpx;
- margin-bottom: 20rpx;
+ font-size: 27rpx;
+ width: 200rpx;
+ line-height: 65rpx;
+ border: 1px solid #999999;
+ border-radius: 33rpx;
+ margin: 20rpx auto;
}
.scroll-line {
height: 6rpx;
diff --git a/pages/list/sale/index.js b/pages/list/sale/index.js
index 67548f1..afd00fe 100644
--- a/pages/list/sale/index.js
+++ b/pages/list/sale/index.js
@@ -96,8 +96,13 @@ Page({
gotoDetail:function(e){
// if(this.data.type!=0) return;
let item = e.currentTarget.dataset.item;
- if(item.sku.product){
- util.gotoDetail(item.sku.product)
+ if(this.data.type==0){
+ if(item.sku.product){
+ util.gotoDetail(item.sku.product)
+ }
+ }
+ else {
+ util.gotoDetail(item)
}
console.log(item);
},
diff --git a/pages/map/index.js b/pages/map/index.js
index 8435a69..9e1fd4e 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -415,7 +415,7 @@ Page({
},
getList:function(){
this.mapCtx = wx.createMapContext("map");
- let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','units'],that = this;
+ let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','red_map'],that = this;
this.mapCtx.getRegion({
type: 'gcj02',
success: function(res) {
@@ -436,7 +436,12 @@ Page({
mapItem.longitude = Number(item.lon);
mapItem.id = index;
mapItem.info = item;
- mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
+ if(item.type=='red_map'){
+ mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20211022/4bb3b753c625e89e1214105c03390e54.png";
+ }
+ else {
+ mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
+ }
mapItem.width = 20;
mapItem.height=23;
if(mapItem.latitude<40){
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index e767152..23aafcd 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -42,6 +42,10 @@
江南小书场
+
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index 8a8edfb..bfa04b5 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -85,9 +85,13 @@
background: #9d6b00;
border-color: #9d6b00;
}
-.right-menus .right-menu-item:nth-child(9).active {
+/* .right-menus .right-menu-item:nth-child(9).active {
background: rgb(160, 248, 248);
border-color: rgb(160, 248, 248);
+} */
+.right-menus .right-menu-item:nth-child(9).active {
+ background: #F60C1C;
+ border-color: #F60C1C;
}
.right-menu-item.active .iconfont {
diff --git a/pages/pbService/feiyi/info/index.wxml b/pages/pbService/feiyi/info/index.wxml
index 8339a1b..9581fbc 100644
--- a/pages/pbService/feiyi/info/index.wxml
+++ b/pages/pbService/feiyi/info/index.wxml
@@ -1,7 +1,15 @@
-
+
+
+
+ {{info.title}}
+ {{info.protect_office}}
+
+
+
+
\ No newline at end of file
diff --git a/pages/pbService/feiyi/info/index.wxss b/pages/pbService/feiyi/info/index.wxss
index 3946716..ce91927 100644
--- a/pages/pbService/feiyi/info/index.wxss
+++ b/pages/pbService/feiyi/info/index.wxss
@@ -1,5 +1,17 @@
/* pages/pbService/museum/info/index.wxss */
-.bg {
+.info {
+ margin: 30rpx;
+ color: #333;
+ font-size: 26rpx;
+}
+.title {
+ font-size: 30rpx;
+ margin-bottom: 22rpx;
+}
+page {
+ font-size: 28rpx;
+}
+/* .bg {
background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
background-size: 100% 100%;
position: absolute;
@@ -80,4 +92,4 @@
font-size: 36rpx;
height: 126rpx;
margin-bottom: 0;
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/pages/pbService/gym/info/index.wxml b/pages/pbService/gym/info/index.wxml
index 5cecb28..5edf245 100644
--- a/pages/pbService/gym/info/index.wxml
+++ b/pages/pbService/gym/info/index.wxml
@@ -1,6 +1,22 @@
-
+
+
+
+
+
+
+
+
+
+ {{info.name}}
+ 开放时间：{{info.open_time}}
+ 联系方式：{{info.telephone}}
+ 地址：{{info.address}}
+
+
+
\ No newline at end of file
diff --git a/pages/pbService/gym/info/index.wxss b/pages/pbService/gym/info/index.wxss
index 3946716..37ae6c2 100644
--- a/pages/pbService/gym/info/index.wxss
+++ b/pages/pbService/gym/info/index.wxss
@@ -1,5 +1,29 @@
/* pages/pbService/museum/info/index.wxss */
-.bg {
+.swiper,.swiper image {
+ height: 360rpx;
+ width: 100%;
+ display: block;
+
+}
+.info {
+ font-size: 26rpx;
+ padding: 20rpx 30rpx;
+ color: #333;
+}
+.info .title {
+ font-size: 30rpx;
+}
+.info-tip {
+ display: flex;
+ color: #888;
+ margin-top: 20rpx;
+}
+.info-tip text {
+ width: 130rpx;
+ color: #333;
+ flex-shrink: 0;
+}
+/* .bg {
background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
background-size: 100% 100%;
position: absolute;
@@ -80,4 +104,4 @@
font-size: 36rpx;
height: 126rpx;
margin-bottom: 0;
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/pages/pbService/museum/info/index.wxml b/pages/pbService/museum/info/index.wxml
index 748f3db..c9836f2 100644
--- a/pages/pbService/museum/info/index.wxml
+++ b/pages/pbService/museum/info/index.wxml
@@ -1,7 +1,31 @@
-
+
+
+
+
+
+
+
+
+ {{info.name}}
+
+
+ {{info.phone}}
+
+
+
+ {{info.address}}
+
+ 场馆详情
+
+ 接待时间
+
+ 交通路线
+
+
+
\ No newline at end of file
diff --git a/pages/pbService/museum/info/index.wxss b/pages/pbService/museum/info/index.wxss
index 675868e..1d07d20 100644
--- a/pages/pbService/museum/info/index.wxss
+++ b/pages/pbService/museum/info/index.wxss
@@ -1,5 +1,52 @@
/* pages/pbService/museum/info/index.wxss */
-.bg {
+.mainimg {
+ display: block;
+ width: 100%;
+ height: 300rpx;
+
+}
+
+.swiper {
+ height: 300rpx;
+ margin-bottom: 30rpx;
+
+}
+.content {
+ padding: 20rpx;
+ color: #666666;
+ font-size: 28rpx;
+}
+page {
+ background: white;
+}
+.title {
+ font-size: 36rpx;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 10rpx;
+}
+.tips {
+ display: flex;
+ align-items: center;
+ height: 50rpx;
+}
+.tips .iconfont {
+ flex-shrink: 0;
+ margin-right: 10rpx;
+ color: #999;
+}
+.subtitle {
+ padding-left: 20rpx;
+ border-left: 6rpx solid #0F9095;
+ line-height: 30rpx;
+ color: #333;
+ font-size: 30rpx;
+ font-weight: bold;
+ margin-top: 40rpx;
+ margin-bottom: 20rpx;
+}
+
+/* .bg {
background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
background-size: 100% 100%;
position: absolute;
@@ -80,4 +127,4 @@
font-size: 36rpx;
height: 126rpx;
margin-bottom: 0;
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/pages/pbService/wwcx/info/index.wxml b/pages/pbService/wwcx/info/index.wxml
index ee9b686..2070dd0 100644
--- a/pages/pbService/wwcx/info/index.wxml
+++ b/pages/pbService/wwcx/info/index.wxml
@@ -1,7 +1,18 @@
-
+
+
+ {{info.name}}
+ 藏于：{{info.collection_name}}
+ 等级：{{info.level_name}}
+ 历史年代：{{info.age}}
+
+ 文物介绍
+ {{info.introduction}}
+
+
+
\ No newline at end of file
diff --git a/pages/pbService/wwcx/info/index.wxss b/pages/pbService/wwcx/info/index.wxss
index 3946716..3f15aa5 100644
--- a/pages/pbService/wwcx/info/index.wxss
+++ b/pages/pbService/wwcx/info/index.wxss
@@ -1,5 +1,24 @@
/* pages/pbService/museum/info/index.wxss */
-.bg {
+.main-img {
+ display: block;
+ width: 100%;
+
+}
+.content {
+ margin: 30rpx;
+ color: #333;
+ font-size: 30rpx;
+}
+.subtitle {
+ margin-bottom: 10rpx;
+ font-size: 26rpx;
+
+}
+.detail {
+ margin-top: 40rpx;
+ font-size: 26rpx;
+}
+/* .bg {
background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
background-size: 100% 100%;
position: absolute;
@@ -80,4 +99,4 @@
font-size: 36rpx;
height: 126rpx;
margin-bottom: 0;
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 7c3c1aa..8d42876 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -13,9 +13,9 @@
"miniprogram": {
"list": [
{
- "name": "pages/pbService/feiyi/info/index",
- "pathName": "pages/pbService/feiyi/info/index",
- "query": "id=24",
+ "name": "pages/pbService/gym/info/index",
+ "pathName": "pages/pbService/gym/info/index",
+ "query": "id=1001",
"scene": null
},
{