From d40ccc3c225fda5b196645687860bbcde43b28d0 Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Thu, 17 Sep 2020 10:03:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=20=E4=BF=AE=E6=94=B9=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E6=A0=B7=E5=BC=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index/index.js | 10 ++++++---- pages/getphoneInfo/index.js | 2 +- pages/passCar/couponList/couponList.wxss | 2 +- pages2/live/livelist/index.js | 6 ++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/index/index.js b/index/index.js index 5b76684..af1bae9 100644 --- a/index/index.js +++ b/index/index.js @@ -291,10 +291,12 @@ Page({ }, onShow: function() { this.ifShowSqare(); - var temp = wx.getStorageSync("squareList").filter(item => item.tenantId == wx.getStorageSync("selectedMall"))[0].name - this.setData({ - squareName: temp - }) + if (wx.getStorageSync("squareList")) { + var temp = wx.getStorageSync("squareList").filter(item => item.tenantId == wx.getStorageSync("selectedMall"))[0].name + this.setData({ + squareName: temp + }) + } if (typeof this.getTabBar === 'function' && this.getTabBar()) { this.getTabBar().setData({ diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index a6a3e08..db063a5 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -182,7 +182,7 @@ Page({ }) .catch(err => { wx.showToast({ - title: "请授权手机号", + title: err.message, icon: 'none', duration: 2000, mask: false diff --git a/pages/passCar/couponList/couponList.wxss b/pages/passCar/couponList/couponList.wxss index 42be190..fe7e380 100644 --- a/pages/passCar/couponList/couponList.wxss +++ b/pages/passCar/couponList/couponList.wxss @@ -201,7 +201,7 @@ .nav { position: absolute; - bottom: -70%; + bottom: -130%; left: 0; right: 0; margin: auto; diff --git a/pages2/live/livelist/index.js b/pages2/live/livelist/index.js index bd8aa6f..633e317 100644 --- a/pages2/live/livelist/index.js +++ b/pages2/live/livelist/index.js @@ -103,12 +103,14 @@ Page({ loading: false, }) res.data.roomInfos.map((item,index)=>{ + console.log(parseInt(item.startTime)) + item.startTimeStr = format.formatTime( - item.startTime, + parseInt(item.startTime+"000"), "MM-dd hh:mm" ); item.endTimeStr = format.formatTime( - item.endTime, + parseInt(item.endTime+"000"), "MM-dd hh:mm" ); this.data.liveStatusList.map((item02,index02)=>{