diff --git a/pages/index/index.js b/pages/index/index.js index 49f6d81..e473655 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -10,6 +10,7 @@ import https from "../../utils/https.js" Page({ data: { + bannerInterver: 1000*60, banner: [], xiaobanner: [], height: 0, @@ -73,6 +74,8 @@ Page({ imageSourceList:imageSource, }, onLoad: function(options) { + console.log('onload') + wx.getLocation({type: 'gcj02'}) console.log('options',options) @@ -247,7 +250,8 @@ Page({ }, changeBannerIndex: function(e) { this.setData({ - activeBannerIndex: e.detail.current + activeBannerIndex: e.detail.current, + bannerInterver: 5000 }) }, changeSmBannerIndex: function(e) { @@ -983,6 +987,7 @@ Page({ util.pagePoint(e, type) }, onShow: function() { + if (app.globalData.loadIndexSeason) { this.getIndexSeason() } else { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index cc29437..1142f10 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -26,7 +26,7 @@ - + @@ -160,7 +160,7 @@ - + 倒计时 {{djs.h}} : @@ -504,7 +504,7 @@ - + diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml index 1dd7ea4..70d9ad4 100644 --- a/pages/order/pay/index.wxml +++ b/pages/order/pay/index.wxml @@ -77,7 +77,7 @@ {{item.sku_name}} - 可用时间:{{item.sku_model.expired_range_start}}至{{item.sku_model.expired_range_end}} + 可用时间:{{item.sku_model.expired_range_start}}至{{item.sku_model.expired_range_end}} diff --git a/pages/user/service/index.wxss b/pages/user/service/index.wxss index 795f383..d2e177f 100644 --- a/pages/user/service/index.wxss +++ b/pages/user/service/index.wxss @@ -99,7 +99,9 @@ } .more-btn { text-align: center; - width: 300rpx; + min-width: 300rpx; + width: fit-content; + padding: 0 40rpx; line-height: 60rpx; background: rgba(11, 137, 142, 0); border: 1rpx solid #D8D8D8; diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js index aa5bb40..41a4182 100644 --- a/pages/user/service/info/index.js +++ b/pages/user/service/info/index.js @@ -9,7 +9,10 @@ Page({ */ data: { info:null, - linkData:[] + linkData:[], + + phoneList: ["0512-66555111","17625172834","18114363097","13245079618"], + showPhoneMask: false }, /** @@ -91,20 +94,32 @@ Page({ id: this.data.info.id } },1) - wx.showModal({ - title: '提示', - content: '呼叫人工客服\n0512-66555111', - confirmColor:"#0B898E", - success (res) { - if (res.confirm) { - wx.makePhoneCall({ - phoneNumber: '0512-66555111', - }) - } else if (res.cancel) { - } - } + // wx.showModal({ + // title: '提示', + // content: '呼叫人工客服\n0512-66555111', + // confirmColor:"#0B898E", + // success (res) { + // if (res.confirm) { + // wx.makePhoneCall({ + // phoneNumber: '0512-66555111', + // }) + // } else if (res.cancel) { + // } + // } + // }) + this.setData({showPhoneMask: true}) + }, + + callPhone (e) { + let item = e.currentTarget.dataset.item; + wx.makePhoneCall({ + phoneNumber: item, }) }, + closePhoneMask () { + this.setData({showPhoneMask: false}) + }, + zan:function(){ let info = this.data.info; commonApi.user_post("ics/useful",{ diff --git a/pages/user/service/info/index.wxml b/pages/user/service/info/index.wxml index 73623a1..4de9a47 100644 --- a/pages/user/service/info/index.wxml +++ b/pages/user/service/info/index.wxml @@ -18,4 +18,19 @@ 没找到想要的答案?一键呼唤人工客服 + + + + + + + + 热线电话 + 点击号码拨打 + + + {{item}} + + + \ No newline at end of file diff --git a/pages/user/service/info/index.wxss b/pages/user/service/info/index.wxss index 8b5e6ef..3a27766 100644 --- a/pages/user/service/info/index.wxss +++ b/pages/user/service/info/index.wxss @@ -64,4 +64,10 @@ page { } .icon-zan.zhuan { transform: rotate(180deg); +} +.phone-item{ + height: 100rpx; + line-height: 100rpx; + color: #409EFF; + border-bottom: 2rpx solid #ccc; } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 025c1bb..ad31315 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -6,6 +6,20 @@ "condition": { "miniprogram": { "list": [ + { + "name": "首页", + "pathName": "subPackages/indexGQ/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "pages/user/order/showOrderInfo/index", + "pathName": "pages/user/order/showOrderInfo/index", + "query": "id=46022501041743498343", + "launchMode": "default", + "scene": null + }, { "name": "pages/pbService/web/index", "pathName": "pages/pbService/web/index", @@ -41,13 +55,6 @@ "launchMode": "default", "scene": null }, - { - "name": "首页", - "pathName": "pages/list/six/index", - "query": "", - "launchMode": "default", - "scene": null - }, { "name": "景点购物车5447", "pathName": "pages/info/sceneProductInfoNew/index",