From 30b4f6d6ac4b10167b8feb3d4c35697c61d52c40 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 17 Dec 2018 13:16:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=9A=84=E5=A4=84=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/tab/index.wxml | 4 ++-- pages/couponorder/index/index.js | 22 ++++++++++++++-------- pages/couponorder/index/index.wxml | 2 +- pages/passCar/passCar.js | 11 +++++------ pages/rushToBuy/index.js | 25 +++++++++++++------------ pages/rushToBuy/index.wxml | 2 +- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/dist/tab/index.wxml b/dist/tab/index.wxml index c7079c2..47e2a57 100644 --- a/dist/tab/index.wxml +++ b/dist/tab/index.wxml @@ -1,6 +1,6 @@ - + - + {{ title }} {{ title }} diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index ff78930..08ccbaa 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -28,7 +28,8 @@ Page({ allow_load: true, loading: true, //"上拉加载"的变量,默认false,隐藏 content: "", - mystatus: '' + mystatus: '', + showPage:false }, onLoad() { this.getList(0, 1); @@ -69,7 +70,13 @@ Page({ pageSize: 6, couponOrderStatus: key } - }).then(res => { + }) + .then(res => { + if(res.code == 200){ + that.setData({ + showPage:true + }) + } res.data.list.map(file => { file.expiredTime = util.fmtDate(file.expiredTime); }); @@ -95,12 +102,11 @@ Page({ }) }) .catch(err => { - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); + wx.showModal({ + title: '提示', + content: err.errMsg, + showCancel:false + }) }) } else { that.setData({ diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index 873e410..15ef3f7 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index f6d624e..1b89fed 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -205,12 +205,11 @@ Page({ url: "/pages/getuserinfo/index" }); }else{ - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); + wx.showModal({ + title: '提示', + content: err.errMsg, + showCancel:false + }) } }); } diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js index 72f3e0b..f3280a4 100644 --- a/pages/rushToBuy/index.js +++ b/pages/rushToBuy/index.js @@ -15,12 +15,8 @@ Page({ minute: "", loading: true, //"上拉加载"的变量,默认false,隐藏 content: "", + showPage:false }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) {}, //列表 getList: function (page) { let that = this; @@ -41,7 +37,13 @@ Page({ pageSize: 5, targetAd: 2 } - }).then(res => { + }) + .then(res => { + if(res.code == 200){ + that.setData({ + showPage:true + }) + } if (page >= res.data.pages) { that.setData({ allow_load: false @@ -91,12 +93,11 @@ Page({ }) .catch(err => { - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); + wx.showModal({ + title: '提示', + content: err.errMsg, + showCancel:false + }) }) } else { that.setData({ diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml index 7ddb4be..3148eb6 100644 --- a/pages/rushToBuy/index.wxml +++ b/pages/rushToBuy/index.wxml @@ -1,5 +1,5 @@ - +