diff --git a/pages/index/index.js b/pages/index/index.js
index 79b0978..8c339b2 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -136,7 +136,7 @@ Page({
list3:[], //非看-剧场演出
list4:[], //非买-文创
-
+ nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)]
},
onLoad: function(options) {
@@ -287,7 +287,7 @@ Page({
})
// 非买不可--文创
commonApi._post('product/get_product_by_tag',{
- tag_id: 326,
+ product_model: 'post',
offset: 0,
limit: 6,
}).then(res=>{
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 410f917..ed9f76b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -30,11 +30,17 @@
-
+
-
-
+
+
更多 >
+
+ {{nowDate[0]}}
+ 月
+ {{nowDate[1]}}
+ 日
+
@@ -152,26 +158,32 @@
-
-
+
+
高峰预警
+
+
+ 实时路况
+
行李寄存
-
-
- 实时路况
+
+
+
+ 找厕所
+
+
+
+
+
+
+
+
+
+
+
+
+ 景点门票
+
+
+
+ 夜游苏州
+
+
+
+
+ 剧场演出
+
+
+
+
+ 场馆预约
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+ 电子社保卡
+
+
+
+ 高峰预警
+
+
+
+ 行李寄存
+
+
+
+ 实时路况
+
+
+
+
+
+
+ 查看更多 >
+
+
+
+
+
+
+
+
+
+
+
+
+
{{time}}s跳过
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 3f8a88e..d9479c5 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1449,4 +1449,37 @@ page {
}
.one::-webkit-scrollbar{
display:none;
+}
+
+
+.date-container{
+ position: relative;
+}
+.nowDate{
+ display: flex;
+ position: absolute;
+ left: 228.77rpx;
+ bottom: 7.33rpx;
+}
+
+.nowDate>view{
+
+ width: 44rpx;
+ height: 44rpx;
+ border-radius: 7rpx;
+ text-align: center;
+ line-height: 44rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ font-size: 29rpx;
+ color: #FFFFFF;
+}
+.nowDate .num{
+ background: #FFEBD5;
+ color: #111111;
+
+ font-family: PingFang SC;
+ /* font-weight: bold; */
+ font-size: 29rpx;
+ color: #111111;
}
\ No newline at end of file
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index fd88ffb..3afaff8 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -76,15 +76,18 @@ Page({
let resData = res.data
if (resData.product_data) {
- if (resData.product_data["住"]) {
- resData.product_data["住"] = JSON.parse(resData.product_data["住"])
- }
- if (resData.product_data["游"]) {
- resData.product_data["游"] = JSON.parse(resData.product_data["游"])
- }
- if (resData.product_data["食"]) {
- resData.product_data["食"] = JSON.parse(resData.product_data["食"])
+ for(let key in resData.product_data) {
+ resData.product_data[key] = JSON.parse(resData.product_data[key])
}
+ // if (resData.product_data["住"]) {
+ // resData.product_data["住"] = JSON.parse(resData.product_data["住"])
+ // }
+ // if (resData.product_data["游"]) {
+ // resData.product_data["游"] = JSON.parse(resData.product_data["游"])
+ // }
+ // if (resData.product_data["食"]) {
+ // resData.product_data["食"] = JSON.parse(resData.product_data["食"])
+ // }
}
this.setData({
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index b9cea87..4b41d22 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -345,6 +345,8 @@ Page({
},
order: function (e) {
+ console.log(this.data.skuList)
+
commonApi.user_post("/product/checkStock", {
sku_id: this.data.skuList[this.data.skuIndex].id,
}).then(res => {
@@ -793,8 +795,11 @@ Page({
showPrice:e.currentTarget.dataset.sku.price
})
}else {
+ let skuIndex = this.data.skuList.findIndex(v=>v.id == sku.sku.id)
+
this.setData({
- skuFlag: 'order'
+ skuFlag: 'order',
+ skuIndex: skuIndex,
})
this.order()
}
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index b4c5987..02470b1 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -35,7 +35,7 @@
{{item.title}}
-
+
{{sku.sku_name}}
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 7177e64..c21a591 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -24,6 +24,11 @@
找厕所
+
+
+ Suzhou Tour
+
diff --git a/pages/search/list/index.js b/pages/search/list/index.js
index 5cd8b5e..bc6bd62 100644
--- a/pages/search/list/index.js
+++ b/pages/search/list/index.js
@@ -94,6 +94,15 @@ Page({
},
type:item.genre
},1)
+ // 苏州博物馆跳小程序
+ if([1063163,1062298].includes(item.id)) {
+ wx.navigateToMiniProgram({
+ appId: 'wxfef80ee1ab7e58a2',
+ path: 'pages/index/index'
+ })
+ return
+ }
+
if(item.type=='travels'){
// 游记做特殊处理 其他都按照原来的来
wx.navigateTo({