diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 1bb59d9..3791421 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -69,11 +69,11 @@ Component({
})
}
}
- else if (pages[pages.length-1].route.indexOf('cartlist') != -1){
- wx.switchTab({
- url: '/pages/user/user'
- })
- }
+ // else if (pages[pages.length-1].route.indexOf('cartlist') != -1){
+ // wx.switchTab({
+ // url: '/pages/user/user'
+ // })
+ // }
else if (pages[pages.length-1].route.indexOf('orderList') != -1){
console.log(11111);
wx.navigateTo({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9a6d415..5bf0986 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,11 +179,21 @@
数字博物馆
-
+
+ 云上文博会
+
+
+
+ 投资导引图
+
+
@@ -194,21 +204,22 @@
团体预约
-->
-
-
- 投资导引图
-
+
-
-
- 云上文博会
+
+ 书香借阅
+
+
+
+ 文化配送
@@ -225,16 +236,7 @@
视觉中心
-
-
- 书香借阅
-
-
-
- 文化配送
-
+
@@ -360,9 +362,9 @@
{{item.title}}
-
+
¥{{item.ext.price/100}}起
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 959a2ef..80f2505 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -376,6 +376,8 @@
.hot-price {
color: #D62828;
font-size: 24rpx;
+ margin-top:28rpx;
+
}
.hot-price text:nth-child(2){
font-size: 33rpx;
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index f3ae26e..a094d64 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -108,6 +108,7 @@ Page({
pageNo:1,
total:1,
moreFlag:true,
+ selectDay:null
})
this.getList()
},
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 0157b4b..7d1b16a 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -26,13 +26,13 @@
-
+
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index 7b1dbeb..eb9e183 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -70,7 +70,8 @@ Page({
item.tags = item.display_tags?item.display_tags.split(","):[];
item.tags = item.tags.splice(0,2);
if(item.distance && item.distance>=1000){
- item.distance = item.distance/1000 + "km"
+ item.distance = item.distance/1000
+ item.distance = item.distance.toFixed(1) + "km"
}
else if(item.distance){
item.distance = item.distance + "m"
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 075a0fc..e3e1e40 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -32,10 +32,10 @@
酒店住宿
-
+
公共服务
diff --git a/pages/list/six/index.wxss b/pages/list/six/index.wxss
index 01e1376..a8ad548 100644
--- a/pages/list/six/index.wxss
+++ b/pages/list/six/index.wxss
@@ -95,7 +95,7 @@
}
.new-icons {
display: flex;
- justify-content: space-between;
+ /* justify-content: space-between; */
text-align: center;
margin: 0 25rpx;
font-size: 27rpx;
@@ -113,6 +113,7 @@
.new-icon {
width: 131rpx;
margin-bottom: 20rpx;
+ margin-right: 15rpx;
}
.new-icon image.green-shadow {
box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(41, 176, 100, 0.24);
diff --git a/pages/list/strategy/index.js b/pages/list/strategy/index.js
index 723c474..a69bf5b 100644
--- a/pages/list/strategy/index.js
+++ b/pages/list/strategy/index.js
@@ -19,7 +19,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.getList()
},
changeType:function(e){
let type = e.currentTarget.dataset.type;
@@ -116,7 +115,12 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ this.setData({
+ list:[],
+ page_no:1,
+ total:1,
+ })
+ this.getList()
},
/**
diff --git a/pages/pbService/appreciate/index.js b/pages/pbService/appreciate/index.js
index 7857825..5703e2d 100644
--- a/pages/pbService/appreciate/index.js
+++ b/pages/pbService/appreciate/index.js
@@ -103,6 +103,7 @@ Page({
},
gotoDetail:function(e){
let info = e.currentTarget.dataset.info;
+ console.log(this.data.type);
if(this.data.type==2) {
if(this.data.isIos==false){
this.setData({
diff --git a/pages/pbService/appreciate/index.wxml b/pages/pbService/appreciate/index.wxml
index 1850f03..7cecc02 100644
--- a/pages/pbService/appreciate/index.wxml
+++ b/pages/pbService/appreciate/index.wxml
@@ -19,7 +19,7 @@
{{item.CatalogName || item.Tag}}
-
+
\ No newline at end of file
diff --git a/pages/user/service/index.js b/pages/user/service/index.js
index 214336e..4b01b44 100644
--- a/pages/user/service/index.js
+++ b/pages/user/service/index.js
@@ -53,7 +53,7 @@ Page({
commonApi._post("ics/getQuestionByTypeId",{
type_id:this.data.typeId,
page_no:1,
- page_num:10
+ page_num:5
}).then(res=>{
this.setData({
list:res.data.rows,