From 0839bc8628f65c182125420c26e4d6ed9066f4ec Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 24 Jan 2019 15:52:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=90=E9=95=BF=E5=80=BC=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=81=9C=E8=BD=A6=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=88=91=E7=9A=84=E7=89=B9=E6=9D=83?= =?UTF-8?q?=EF=BC=8C=E7=A0=8D=E4=BB=B7=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js | 6 +-- pages/bargain/bargain.js | 52 +++++++++++++++++++--- pages/bargain/bargain.json | 1 + pages/bargain/bargain.wxml | 3 +- pages/bargain/bargain.wxss | 2 +- pages/czdetail/czdetail.js | 8 +--- pages/czdetail/czdetail.wxml | 3 -- pages/czdetail/czdetail.wxss | 11 ++++- pages/passCar/passCar.js | 7 +++ pages/specialcourtesy/specialcourtesy.js | 29 +++++------- pages/specialcourtesy/specialcourtesy.wxml | 2 +- pages/specialcourtesy/specialcourtesy.wxss | 2 +- pages/user/index.wxml | 2 +- project.config.json | 2 +- 14 files changed, 86 insertions(+), 44 deletions(-) diff --git a/config/config.js b/config/config.js index 916e7e9..9562f71 100755 --- a/config/config.js +++ b/config/config.js @@ -1,9 +1,9 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; var appId = extConfig.appId; var config = { - // url: "https://ciformall.youlane.cn/C/api", + url: "https://ciformall.youlane.cn/C/api", // url:"https://c.malls.iformall.com/C/api", - url:'https://ctest.malls.iformall.com/C/api', + // url:'https://ctest.malls.iformall.com/C/api', // url:'http://10.100.33.68:7000/C/api', // url: 'http://202.165.179.86:4000/C/api', api: { @@ -219,7 +219,7 @@ var config = { }, weapp: { - AppId: "wx649b3be73c1afe47" + AppId: "wxea71200db93d756b" }, ErrorCode: { diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js index b0be2fb..9b4a3fd 100644 --- a/pages/bargain/bargain.js +++ b/pages/bargain/bargain.js @@ -114,11 +114,27 @@ Page({ lists: [], }) } - var tmpArr = that.data.lists; - tmpArr.push.apply(tmpArr, res.data.list); - that.setData({ - lists: tmpArr - }) + if (flag == 'bargaingoods'){ + var tmpArr = that.data.lists; + tmpArr.push.apply(tmpArr, res.data.list); + that.setData({ + lists: tmpArr + }) + } else if (flag == 'mybargain'){ + console.log(res.data.list) + var tmpArr = that.data.lists; + tmpArr.push.apply(tmpArr, res.data.list); + console.log(tmpArr) + let lists = []; + tmpArr.map(file => { + if (file.orderStatus != 0) { + lists.push(file); + } + }) + that.setData({ + lists: lists + }) + } }) .catch(err => { wx.showToast({ @@ -241,4 +257,30 @@ Page({ }); that.getList(that.data.page, that.data.flag); }, + /** +* 刷新 +*/ + onPullDownRefresh: function (e) { + let that = this; + if (that.data.flag == 'bargaingoods'){ + that.getBannerlist(); + var todayDate = new Date().getTime(); + that.setData({ + todayDate: todayDate + }) + that.getList(1, "bargaingoods"); + that.setData({ + flag: "bargaingoods", + bargaingoods: true, + mybargain: false + }) + } else if (that.data.flag == 'mybargain'){ + that.getList(1, "mybargain"); + that.setData({ + flag: "mybargain", + bargaingoods: false, + mybargain: true + }) + } + }, }) \ No newline at end of file diff --git a/pages/bargain/bargain.json b/pages/bargain/bargain.json index 8cd1569..e3bbdb7 100644 --- a/pages/bargain/bargain.json +++ b/pages/bargain/bargain.json @@ -1,5 +1,6 @@ { "navigationBarTitleText": "砍价专场", + "enablePullDownRefresh": true, "usingComponents": { "c-banner": "../../components/banner/index", "i-tab": "../../../dist/tab/index", diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml index 9bce1ee..14eb59b 100644 --- a/pages/bargain/bargain.wxml +++ b/pages/bargain/bargain.wxml @@ -54,8 +54,7 @@ - 请您敬请期待 - 我们正在筹备一大波优惠活动 + 暂无数据 砍价商品 diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss index 026a04a..fac10f6 100644 --- a/pages/bargain/bargain.wxss +++ b/pages/bargain/bargain.wxss @@ -110,7 +110,7 @@ page{ position: absolute; right: 0; text-align: center; - bottom: 31rpx; + bottom: 8rpx; border-radius:24rpx; font-size:26rpx; line-height:48rpx; diff --git a/pages/czdetail/czdetail.js b/pages/czdetail/czdetail.js index 967e42a..69531e3 100644 --- a/pages/czdetail/czdetail.js +++ b/pages/czdetail/czdetail.js @@ -13,7 +13,6 @@ Page({ pageNum:1, list:[], showcontent:false, - loading:"", loadingUrl: imgurl.loading.url, allow_load: true }, @@ -39,7 +38,6 @@ Page({ }, record(pageNum) { var that = this; - console if (that.data.allow_load) { Http.get({ url: config.api.scoreHistory, @@ -56,7 +54,7 @@ Page({ }); if (pageNum >= res.data.pages) { that.setData({ - allow_load: false + allow_load: false, }); } that.data.list = that.data.list.concat(res.data.list); @@ -90,10 +88,6 @@ Page({ }, onReachBottom: function () { var that = this; - wx.showLoading({ - title: '', - mask:true - }) that.data.pageNum++; that.setData({ pageNum: that.data.pageNum diff --git a/pages/czdetail/czdetail.wxml b/pages/czdetail/czdetail.wxml index d909b38..a712ea3 100644 --- a/pages/czdetail/czdetail.wxml +++ b/pages/czdetail/czdetail.wxml @@ -25,7 +25,4 @@ {{item.scoreAmount}}分 - - - {{content}} \ No newline at end of file diff --git a/pages/czdetail/czdetail.wxss b/pages/czdetail/czdetail.wxss index 0bf9d0c..eb0acb4 100644 --- a/pages/czdetail/czdetail.wxss +++ b/pages/czdetail/czdetail.wxss @@ -103,10 +103,17 @@ .fr text{ color: #FF3535; } -.loading{ +.loading { text-align: center; height: 80rpx; line-height: 80rpx; - color: #999; font-size: 26rpx; + color: #999; +} + +.loading image { + width: 60rpx; + height: 60rpx; + vertical-align: middle; + margin-right: 10rpx; } \ No newline at end of file diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 6f3c594..ee23c33 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -301,6 +301,7 @@ Page({ that.initUsrCarList(); }) .catch(err => { + console.log(err) wx.showToast({ title: err.message, icon: 'none', @@ -482,8 +483,14 @@ Page({ url: config.api.getParkStatus, }) .then(res => { + console.log(res) }) .catch(err => { + console.log(err) + wx.showToast({ + title: err.message, + icon:"none" + }) }) }, diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js index e3e2414..71700e3 100644 --- a/pages/specialcourtesy/specialcourtesy.js +++ b/pages/specialcourtesy/specialcourtesy.js @@ -10,20 +10,6 @@ Page({ myspeacialUrl: imgurl.myspeacial.url, teliconUrl: imgurl.telicon.url, }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, phone: function (e) { console.log(e) let that = this; @@ -41,10 +27,19 @@ Page({ data: {} }) .then(res=>{ - console.log(res) that.setData({ - discountMerchantList: res.data.levelMerchantList, - level: res.data.level ? res.data.level:'' + level: res.data.level ? res.data.level : '' + }) + console.log(res.data.levelMerchantList) + let discountMerchantList = []; + res.data.levelMerchantList.map(file=>{ + if (file.discount != 100){ + discountMerchantList.push(file); + } + }) + console.log(discountMerchantList) + that.setData({ + discountMerchantList: discountMerchantList, }) }) }, diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml index 1b4848a..9abc819 100644 --- a/pages/specialcourtesy/specialcourtesy.wxml +++ b/pages/specialcourtesy/specialcourtesy.wxml @@ -5,7 +5,7 @@ 以下为商城{{level}}对应门店的优惠折扣 - + > diff --git a/pages/specialcourtesy/specialcourtesy.wxss b/pages/specialcourtesy/specialcourtesy.wxss index 5bd5ee7..3d0bd60 100644 --- a/pages/specialcourtesy/specialcourtesy.wxss +++ b/pages/specialcourtesy/specialcourtesy.wxss @@ -5,7 +5,7 @@ Page{ font-size: 28rpx; text-align: center; margin-top: 30rpx; - color: #fff; + color: #000; float:none!important; } .headerbg image{ diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 6a41bdc..b85c788 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -76,7 +76,7 @@ - 版本号:3.3.1 + 版本号:3.3.2 diff --git a/project.config.json b/project.config.json index 2970aaf..4e30ca0 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx649b3be73c1afe47", + "appid": "wxea71200db93d756b", "projectname": "C", "isGameTourist": false, "condition": {