From 5d05fc72e5164d486bf8dbcde4a0346df93c5419 Mon Sep 17 00:00:00 2001 From: hurui Date: Tue, 30 Jul 2019 19:23:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BA=95=E9=83=A8nav][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/home-b.png | Bin 0 -> 2511 bytes assets/images/mendian-b.png | Bin 0 -> 2816 bytes assets/images/park-b.png | Bin 0 -> 3295 bytes assets/images/user-b.png | Bin 0 -> 2616 bytes components/hot/index.js | 116 +++++++++++++----------- ext.json | 10 +- pages/coupon/detail/index.js | 18 +--- pages/coupon/detail/index.wxml | 7 +- pages/index/searchbar/detail/index.wxss | 8 +- pages/integralmall/index.js | 52 ++++++++++- pages/main/index.js | 8 +- pages/main/index.wxml | 2 +- pages/order/detail/index.wxss | 9 +- pages/spellGroup/spellGroup.js | 1 + pages/spellGroup/spellGroup.wxml | 7 +- pages/spellGroup/spellGroup.wxss | 2 +- 16 files changed, 146 insertions(+), 94 deletions(-) create mode 100644 assets/images/home-b.png create mode 100644 assets/images/mendian-b.png create mode 100644 assets/images/park-b.png create mode 100644 assets/images/user-b.png diff --git a/assets/images/home-b.png b/assets/images/home-b.png new file mode 100644 index 0000000000000000000000000000000000000000..5afa798255fd28e935e9dacbc33b5e9cdca7e726 GIT binary patch literal 2511 zcmV;=2{87FP)Px;iAh93RA>e5SzU--)fGPbj85>ERw()qTCucg5nFIdOGVJc+L9C>`e23PU%?*) z39(>o8WRG^gAbPeA+$AZBnE{Bq^l4a6@pp*Wwu4L+Be52oK$vwA_x$qA?Cdq^?!!ly zOKRDK@&^HmylNtUt5v&h*uTjR~jUmrN)h*m!O;fBdo3 z=Bt?bLI8m^=JwH3E8aig(OFkstXP*DvmxPFGft4C7$-fEs`|Qg{~z9&PN%AtwBIfD<)tku93&+qa0k+Q8+8Uawvgk_{HO^no&EQbJ`{E0r zncAjSC?EL3CGCm9lfbezvKVjt0AyRvDr0~Vm*Dw9mifdBn*v<Vu(9%|aOoY3r$? zZ>3ysNiM9)~rnae`)q>7#jL^*2e{*v^Q-3<0 zQ+<(Olp*x`URInkIKe7_#@ZGH$&Y#;b4@f3bs2ey-3Q4jajuWJB8@eMg%-Io*QpFt~%a3R%DiF3|WrWZ=2p$8G~- zuMl)3z-`ST^|&IDjBVrLHxpFgSlavMnOMGPJ8e-Zg>QR+;uOvy4syx_bOgkpBJOKN zj6S5N(#Pt9C_MPLaG3`gE%jKiC-)#2J>5)dV_R-yVE}Z%CF7V!g{-Gw7}$uAkIBsr z<5D3+AyRhuUZ<*PMzPJU=Yj=3IPYnbD+D7|gbsWg6krfVg{(SQ>|ov{=A5W?4wv~Wn@BoH7*0(wyDJ)3->@JXhre7LNhRRS7Bt9bQ zYvbWU)>eI`QA8rK(JxNLr2Q50tT4V+!+?}(IamQ8S^D&~93mmVPpN*Ws+u>dtn_>w z`WxFe&rvU;+LBfQkz@$^>h=IIavo_sq4g4?Qwzd@jU$+VLsUqRwbrx8m8$#Fhfmv? zZvXAPZ0+`R{@Jw;R4={0qi*v~fK+h}eAkzeGJi^p`G!EmIt~{OdkN8@-r|ul02Kjx zVb)w84+Qp<)hQjUcmHnN!eE^H&*@#wmQP-Y^*31z^V^Lj28!@xLvav; zgjLKO6G&806=5Kkr9692Ur_20cpLoc%Z>~ImiBQmF^UfnOhQGHIHc?-aeMmL36^t{W8iU&ur1cOCqOSDfu}Jtq(}_FF&n!gr(RM6;lpWNIX`}m>_v+p z_*eqXuPO(olr5`51UW1}a^qhpjR@c}o%q;=fe22^VTYzyAmXqO(A{qz<-EfGH1E9? zB49ai;LJ|RoWKVuCnl_9xYXu$oj6J$%3y8R}eJor}zT+?ayVr9HKA-BMN;TGt4P~da;;EDGQW$~?` zyVbP?A79{QWZF;YTdzHbpJrR|UkBTIB0zHRflI%KoRqSu@reK43I0t|d<}^)aqunw zxJA<72{HbHEI-iaR5|dcu8vnTu$qC@3@ny` Z_W*7tr1{UU$x8qL002ovPDHLkV1g{*)7Ah0 literal 0 HcmV?d00001 diff --git a/assets/images/mendian-b.png b/assets/images/mendian-b.png new file mode 100644 index 0000000000000000000000000000000000000000..62d22bd6807dbb8e99df5dcd11368e1d511cd0a0 GIT binary patch literal 2816 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 az<&Wbjj0h=*TQ@N0000 { - that.setData({ - kData:res.data + if(res.data){ + that.setData({ + kData:res.data, + couponId: res.data.couponId + }); + } + }) + .catch(err => { + console.log(err) + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false }); }) - .catch(err => { - console.log(err) - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); - }) }, //获取拼团列表 getptList() { @@ -63,38 +66,41 @@ Component({ url: config.api.change, data: param1, }).then(res => { - this.setData({ - pData:res.data, - couponId: res.data.couponId - }); - console.log( this.data.couponId) - }) - .catch(err => { - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false + if(res.data){ + this.setData({ + pData:res.data, + couponId1: res.data.couponId }); - }) - + } + }) + .catch(err => { + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false + }); + }) }, // 换一换 getChange(){ - let param1 = { - targetAd: 7, - couponId: this.data.couponId1 - } - Http.get({ - url: config.api.change, - data: param1, - }).then(res => { - this.setData({ - pData: res.data, - couponId1: res.data.couponId - }); - }) + if(this.data.couponId){ + let that = this; + let param = { + targetAd: 6, + couponid:this.data.couponId + } + Http.get({ + url: config.api.change, + data:param, + }).then(res => { + that.setData({ + kData:res.data, + couponId: res.data.couponId + }); + }) .catch(err => { + console.log(err) wx.showToast({ title: err.errMsg, icon: 'none', @@ -102,28 +108,31 @@ Component({ mask: false }); }) - let param = { - targetAd: 6, - couponId: this.data.couponId } - Http.get({ - url: config.api.change, - data: param, - }).then(res => { - this.setData({ - kData: res.data, - couponId: res.data.couponId - }); - }) + if(this.data.couponId1){ + let param1 = { + targetAd: 7, + couponid1:this.data.couponId1 + } + Http.get({ + url: config.api.change, + data: param1, + }).then(res => { + this.setData({ + pData:res.data, + couponId1: res.data.couponId + }); + }) .catch(err => { - console.log(err) wx.showToast({ title: err.errMsg, icon: 'none', duration: 2000, mask: false }); - }) + }) + } + }, //跳转砍价详情 gotokjdetail: function (e) { @@ -155,6 +164,7 @@ Component({ Http.setToken(token); this.getList(); this.getptList(); + // this.getChange(); }; if (app.globalData.token && app.globalData.token != null) { app.couponChannelListCallback(app.globalData.token); diff --git a/ext.json b/ext.json index 6b64b8c..63ccd43 100644 --- a/ext.json +++ b/ext.json @@ -34,29 +34,29 @@ "text": "首页", "iconPath": "assets/images/home.png", "pagePath": "pages/main/index", - "selectedIconPath": "assets/images/home-a.png" + "selectedIconPath": "assets/images/home-b.png" }, { "text": "门店", "iconPath": "assets/images/mendian.png", "pagePath": "pages/index/searchbar/index", - "selectedIconPath": "assets/images/mendian-a.png" + "selectedIconPath": "assets/images/mendian-b.png" }, { "text": "停车", "iconPath": "assets/images/park.png", "pagePath": "pages/passCar/passCar", - "selectedIconPath": "assets/images/park-a.png" + "selectedIconPath": "assets/images/park-b.png" }, { "text": "我的", "iconPath": "assets/images/user.png", "pagePath": "pages/user/index", - "selectedIconPath": "assets/images/user-a.png" + "selectedIconPath": "assets/images/user-b.png" } ], "color": "#abb1be", - "selectedColor": "#b2743d" + "selectedColor": "#FD832D" }, "window": { "backgroundTextStyle": "dark", diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index e2f35ff..f881eaf 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -5,7 +5,6 @@ const util = require("../../../utils/util"); const imgurl = require("../../../utils/imgurl"); Page({ data: { - isshowposter1: true,//是否显示发起砍价 isshowposter:false,//是否显示分享弹框 fenxiangUrl: imgurl.fenxiang.url, clockUrl: imgurl.clock.url, @@ -101,22 +100,7 @@ Page({ isshowposter: false, }) }, - /** - * 显示发起砍价 - */ - showshare1: function () { - this.setData({ - isshowposter1: true, - }) - }, - /** - * 隐藏发起砍价 - */ - hidemodal1: function () { - this.setData({ - isshowposter1: false, - }) - }, + /** * 跳转到门店列表的详情页面 */ diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 6ccd833..3678fdb 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -151,11 +151,11 @@ 立即购买 - +
- +
@@ -219,6 +219,5 @@ - - + \ No newline at end of file diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss index 6fefe80..2b0d238 100644 --- a/pages/index/searchbar/detail/index.wxss +++ b/pages/index/searchbar/detail/index.wxss @@ -1,4 +1,7 @@ @import "../../../../app.wxss"; +page{ + background: #F4F5F9; +} .index-slide, swiper-item .index-slide-image { display: block; @@ -136,7 +139,7 @@ } .merchant-phones { - border-top:8px solid #efefef; + /* border-top:8px solid #efefef; */ padding: 20rpx 0; display: block; font-size: 30rpx; @@ -198,7 +201,7 @@ .merchant-brand { border: none !important; width: 92%; - margin: 20rpx auto 20rpx; + margin: 0 auto 20rpx; } .merchant-brand view:nth-child(2) text:nth-child(1) { margin-top: 20rpx; @@ -345,6 +348,7 @@ /* margin: 30rpx auto 0; */ display:block; text-align:center; + color: #999; } .modal { width: 100%; diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index f46dd4e..8b0fc28 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -1,6 +1,7 @@ var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); +const QR = require("../../utils/memberqrcode.js"); Page({ /** * 页面的初始数据 @@ -92,11 +93,60 @@ Page({ .catch(err => { wx.showModal({ title: '提示', - content: err.errMsg, + content: err.message, showCancel: false }) }) }, + //适配不同屏幕大小的canvas + setCanvasSize: function () { + var size = {}; + try { + var res = wx.getSystemInfoSync(); + var scale = 750 / 500; + //不同屏幕下canvas的适配比例;设计稿是750宽 + var width = res.windowWidth / scale; + var height = width; + //canvas画布为正方形 + size.w = width; + size.h = height; + } catch (e) { + // Do something when catch error + console.log("获取设备信息失败" + e); + } + return size; + }, + createQrCode: function (url, canvasId, cavW, cavH) { + //调用插件中的draw方法,绘制二维码图片 + QR.api.draw(url, canvasId, cavW, cavH); + }, + qrcode: function (e) { + var that = this; + that.setData({ + showQrcode: true + }) + wx.showToast({ + title: '生成中...', + icon: 'loading', + duration: 2000 + }); + var st = setTimeout(function () { + wx.hideToast() + var size = that.setCanvasSize(); + var url = JSON.stringify({ + END: "C", + TYPE: "memberCode", + ID: that.data.memberId, + }) + that.createQrCode(url, "mycanvas1", size.w, size.h); + that.setData({ + maskHidden: true + }); + clearTimeout(st); + }, 1000) + }, + + // 获得积分,渲染页面 getPoints(){ let that = this; diff --git a/pages/main/index.js b/pages/main/index.js index 39e408b..3632f46 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -578,9 +578,11 @@ Page({ wx.stopPullDownRefresh(); }; // 砍价下拉刷新 - that.selectComponent("#bargain").getList(); - that.selectComponent("#spellGroup").getList(); - that.selectComponent("#rushtobyCard").getList(); + that.selectComponent("#hot").getList(); + that.selectComponent("#hot").getptList(); + // that.selectComponent("#bargain").getList(); + // that.selectComponent("#spellGroup").getList(); + // that.selectComponent("#rushtobyCard").getList(); wx.stopPullDownRefresh(); }, //加载更多 diff --git a/pages/main/index.wxml b/pages/main/index.wxml index ee21450..c395418 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -49,7 +49,7 @@ 消费卡 - + 幸运卡牌 diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index a070f10..ab88068 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -210,7 +210,7 @@ page { display: block; } .classif > view:nth-child(3) view text:nth-child(2) { - padding-left: 15rpx; + /* padding-left: 15rpx; */ } .classif > view:nth-child(6) text:nth-child(2) { @@ -435,6 +435,7 @@ radio { font-size: 36rpx !important; font-weight: 400 !important; float: right; + margin-left: 10rpx; } .jine1 { @@ -444,7 +445,7 @@ radio { } .buy-view { - background: #fff; + /* background: #fff; */ position: fixed; padding-top: 30rpx; height: 94rpx; @@ -456,12 +457,12 @@ radio { } .buy { - background: #00c0ff; + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); height: 94rpx; width: 670rpx; margin: 0 auto; color: #fff; - font-size: 36rpx; + font-size: 32rpx; line-height: 94rpx; border-radius: 61rpx; } diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index 40f3361..85a8d84 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -7,6 +7,7 @@ Page({ * 页面的初始数据 */ data: { + noCoupon: imgurl.noCoupon.url, bannerUrl: imgurl.banner.url, loadingUrl: imgurl.loading.url, nodata: imgurl.nodata.url, diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml index 9938bc1..f5a38f2 100644 --- a/pages/spellGroup/spellGroup.wxml +++ b/pages/spellGroup/spellGroup.wxml @@ -5,12 +5,13 @@ --> - - + + + 暂无数据 - + 暂无数据 diff --git a/pages/spellGroup/spellGroup.wxss b/pages/spellGroup/spellGroup.wxss index 79ff158..85d8e42 100644 --- a/pages/spellGroup/spellGroup.wxss +++ b/pages/spellGroup/spellGroup.wxss @@ -279,7 +279,7 @@ image{ margin: 0 auto; border-radius:15rpx; box-sizing: border-box; - margin-top: 320rpx; + margin-top: 20rpx; } .no-data{ width: 690rpx;