From 986485e4cce4e8f7fd5bb482b3b264e782f2f499 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 5 Jul 2019 19:00:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:[=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=81=9C=E8=BD=A6=E7=9A=84=E8=B4=B9?= =?UTF-8?q?=E7=94=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/searchbar/index.wxss | 4 ++-- pages/passCar/passCar.js | 29 +++++++++++++++++++---------- pages/user/myactivity/index.js | 8 +++++++- pages/user/myactivity/index.wxml | 6 +++--- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/pages/index/searchbar/index.wxss b/pages/index/searchbar/index.wxss index 0190fe8..4f4244c 100644 --- a/pages/index/searchbar/index.wxss +++ b/pages/index/searchbar/index.wxss @@ -12,8 +12,8 @@ .text-style { position: relative; width: 139rpx; - height: 96rpx; - line-height: 96rpx; + height: 100rpx; + line-height: 100rpx; text-align: center; font-size: 34rpx; font-family: PingFangSC-Semibold; diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index e7f50bf..133f79b 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -503,16 +503,25 @@ Page({ * flag ==flags * 表示从首页onShow进来的 */ - if (flag == "flags" && res.data.length > 0) { - var listCardNum = res.data[0].carNumber; - that.setData({ - listCardNum: listCardNum - }) - /** - * 获得停车费用 - */ - that.getStopFee(listCardNum); - } + // if (flag == "flags" && res.data.length > 0) { + // var listCardNum = res.data[0].carNumber; + // that.setData({ + // listCardNum: listCardNum + // }) + // /** + // * 获得停车费用 + // */ + // that.getStopFee(listCardNum); + // } + var listCardNum = res.data[0].carNumber; + that.setData({ + listCardNum: listCardNum, + current:0 + }) + /** + * 获得停车费用 + */ + that.getStopFee(listCardNum); }) .catch(err => { wx.showToast({ diff --git a/pages/user/myactivity/index.js b/pages/user/myactivity/index.js index e55ed37..baca3d7 100644 --- a/pages/user/myactivity/index.js +++ b/pages/user/myactivity/index.js @@ -10,6 +10,7 @@ Page({ wmhome: imgurl.wmhome.url, wmdiscount: imgurl.wmdiscount.url, wmgive: imgurl.wmgive.url, + key:0, tabs: [ { key: 0, @@ -54,12 +55,18 @@ Page({ let that = this; let variable; if(key == 0){ + that.setData({ + key:0 + }) variable = { pageNum: pageNum, pageSize: 15, statusStr:"0,1,2" }; }else if(key == 1){ + that.setData({ + key: 1 + }) variable = { pageNum: pageNum, pageSize: 15, @@ -100,7 +107,6 @@ Page({ var tmpArr = that.data.list; tmpArr.push.apply(tmpArr, res.data.list); // 将砍价的状态过滤出来 - console.log(tmpArr) that.setData({ list: tmpArr }) diff --git a/pages/user/myactivity/index.wxml b/pages/user/myactivity/index.wxml index 701f651..2566369 100644 --- a/pages/user/myactivity/index.wxml +++ b/pages/user/myactivity/index.wxml @@ -11,9 +11,9 @@ {{item.title}} - 报名中 - 报名成功 - 报名失败 + 报名中 + 报名成功 + 报名失败 活动开始日期:{{item.activityStartTime}} 活动结束日期:{{item.activityEndTime}}