diff --git a/app.js b/app.js
index 1188526..803dea3 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest60? true : false;
+ data.isTest = data.isTest62? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 0fcd33d..33e2454 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -351,6 +351,24 @@ Page({
path: 'pages/index/index'
})
return;
+ }else if (e.currentTarget.dataset.event == 'kunshan_click') {
+ wx.navigateToMiniProgram({
+ appId: 'wx8888a3fd0862b4c8',
+ path: 'pages/index/index'
+ })
+ return;
+ }else if (e.currentTarget.dataset.event == 'taicang_click') {
+ wx.navigateToMiniProgram({
+ appId: 'wx8853b0d93cbca75e',
+ path: 'pages/home/home'
+ })
+ return;
+ }else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
+ wx.navigateToMiniProgram({
+ appId: 'wxd323e63a10aa6865',
+ path: 'pages/home/index'
+ })
+ return;
}
wx.navigateTo({
url: e.currentTarget.dataset.path,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 193659b..5bf0986 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,16 +179,16 @@
数字博物馆
-
-
+
@@ -117,7 +117,7 @@
- {{skuIndex||skuIndex==0?tool.toFix(skuList[skuIndex].price):tool.toFix(skuList[0].price)}}
+ {{skuIndex||skuIndex==0?skuList[skuIndex].price/100:skuList[0].price/100}}
补贴价:¥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 7fc61dd..68718d7 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -86,7 +86,7 @@
- 已结束
+ 已结束
{{item.from_platform}}
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 7d1b16a..22a5544 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -3,7 +3,7 @@
-
+
{{item.garden_flag_text}}
@@ -12,27 +12,19 @@
电话:{{item.tel}}
点击预约
-
+
{{item.title}}
-
+
博物馆本馆
-
+ 预约
博物馆西馆
- 不含探索体验馆
-
+ 预约
-
diff --git a/pages/list/museum/index.wxss b/pages/list/museum/index.wxss
index a3564c8..88ee367 100644
--- a/pages/list/museum/index.wxss
+++ b/pages/list/museum/index.wxss
@@ -28,6 +28,10 @@ page {
font-size: 19rpx;
color: #666;
align-items: center;
+
+}
+.border{
+
}
.item:nth-child(2n) .info {
border-radius: 17rpx 0 0 17rpx;
@@ -56,14 +60,25 @@ page {
width: 240rpx;
height: 67rpx;
background: #FFFFFF;
- box-shadow: 0px 0px 6rpx 0px rgba(108, 74, 33, 0.35);
+ /* box-shadow: 0px 0px 6rpx 0px rgba(108, 74, 33, 0.35); */
border-radius: 33rpx;
justify-content: center;
font-size: 28rpx;
color: #333333;
font-weight: bold;
- margin: 0 auto;
- margin-bottom: 13rpx;
+ margin: 18rpx auto;
+
+}
+.btn-yy{
+
+background: #CA2A28;
+border-radius: 36rpx;
+font-size: 27rpx;
+font-family: PingFangSC;
+font-weight: 500;
+color: #FFFFFF;
+padding: 6rpx 18rpx;
+margin-left:16rpx ;
}
.info .com-flex .iconfont {
width: 27rpx;
@@ -76,13 +91,14 @@ page {
margin-left: 10rpx;
}
.info .tip-box {
- height: 180rpx;
- background: #FBECDC;
+ /* height: 180rpx; */
+ /* background: #FBECDC; */
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
+ border-top:1rpx solid rgba(216, 216, 216, 1) ;
}
.info .tip-box .com-flex {
height: 71rpx;
diff --git a/pages/list/six/index.js b/pages/list/six/index.js
index 22781a5..b2c94be 100644
--- a/pages/list/six/index.js
+++ b/pages/list/six/index.js
@@ -38,6 +38,7 @@ Page({
})
},
gotoPath:function(e){
+ console.log(e);
if(e.currentTarget.dataset.event.area_key == 'taicang'){
wx.navigateToMiniProgram({
appId: 'wx8853b0d93cbca75e',
@@ -48,7 +49,12 @@ Page({
appId: 'wxd323e63a10aa6865',
path: 'pages/home/index'
})
- }
+ }else if (e.currentTarget.dataset.event.area_key == 'kunshan') {
+ wx.navigateToMiniProgram({
+ appId: 'wx8888a3fd0862b4c8',
+ path: 'pages/index/index'
+ })
+ }
},
goH5(e){
let url = e.currentTarget.dataset.url;
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 8beacd3..c571922 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -55,10 +55,10 @@
文物查询
-->
-
+
周边推荐
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index ae70777..849b02e 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -15,7 +15,7 @@
{{item.subtitle?item.subtitle:""}}
{{item}}
- ¥{{item.price?tool.toFix(item.price):0}}起
+ ¥{{item.price?item.price/100:0}}起