diff --git a/assets/img/growthbg.png b/assets/img/growthbg.png new file mode 100644 index 0000000..fe24210 Binary files /dev/null and b/assets/img/growthbg.png differ diff --git a/assets/img/myspeacial.jpg b/assets/img/myspeacial.jpg new file mode 100644 index 0000000..464cf0f Binary files /dev/null and b/assets/img/myspeacial.jpg differ diff --git a/assets/img/telicon.png b/assets/img/telicon.png new file mode 100644 index 0000000..85808bc7 Binary files /dev/null and b/assets/img/telicon.png differ diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 64b4089..b7a71c4 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -2,6 +2,7 @@ const util = require("../../utils/util.js"); const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); Page({ + /** * 页面的初始数据 */ diff --git a/pages/grade/grade.js b/pages/grade/grade.js index cee3682..20d3b2c 100644 --- a/pages/grade/grade.js +++ b/pages/grade/grade.js @@ -49,39 +49,10 @@ Page({ }) }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { - + // 点击跳转到我的特享优惠 + gotospecialcourtesy:function(){ + wx.navigateTo({ + url: '/pages/specialcourtesy/specialcourtesy', + }) } }) \ No newline at end of file diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml index 5fd8f99..e63933a 100644 --- a/pages/grade/grade.wxml +++ b/pages/grade/grade.wxml @@ -39,4 +39,7 @@ 暂无配置信息 + + + \ No newline at end of file diff --git a/pages/grade/grade.wxss b/pages/grade/grade.wxss index 9686066..53a0388 100644 --- a/pages/grade/grade.wxss +++ b/pages/grade/grade.wxss @@ -18,7 +18,7 @@ } .page { - height: 100%; + height: auto; font-weight: 400; } @@ -189,4 +189,12 @@ visibility: hidden; color: #999; font-size: 26rpx; margin-left: 10rpx; +} +.growthbg{ + margin-top: 40rpx; + padding: 0 30rpx; +} +.growthbg image{ + display: block; + width: 100%; } \ No newline at end of file diff --git a/pages/specialcourtesy/specialcourtesy.json b/pages/specialcourtesy/specialcourtesy.json index 85ee6d8..28b8826 100644 --- a/pages/specialcourtesy/specialcourtesy.json +++ b/pages/specialcourtesy/specialcourtesy.json @@ -1,3 +1,5 @@ { - "navigationBarTitleText": "特享礼遇" -} \ No newline at end of file + "navigationBarTitleText": "我的特权", + "navigationBarBackgroundColor": "#CD223C", + "navigationBarTextStyle": "white" +} diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml index 24f3e0d..303e3f0 100644 --- a/pages/specialcourtesy/specialcourtesy.wxml +++ b/pages/specialcourtesy/specialcourtesy.wxml @@ -1,40 +1,68 @@ + + + - 注意:德胡的黑虎度的核武i好的害得我iu会丢额打黑u我会的u还得u和iu打黑u好的打黑ihdiu打黑i文化的打黑 + 以下为商城会员对应门店的优惠折扣 - - - - 美车堂9折(缤纷卡) + + + + + > + + + 7.9 + 缤纷卡 + 美车堂 + + A座1012号 + + + - - BM-1003 - 5255-1003 + + + + > + + + 7.9 + 缤纷卡 + 美车堂 + + A座1012号 + + + - - - - 美车堂9折(缤纷卡) + + + + > + + + 7.9 + 缤纷卡 + 美车堂 + + A座1012号 + + + - - BM-1003 - 5255-1003 + + + + > + + + 7.9 + 缤纷卡 + 美车堂 + + A座1012号 + + + - - - 美车堂9折(缤纷卡) - - - BM-1003 - 5255-1003 - - - - - 美车堂9折(缤纷卡) - - - BM-1003 - 5255-1003 - - \ No newline at end of file diff --git a/pages/specialcourtesy/specialcourtesy.wxss b/pages/specialcourtesy/specialcourtesy.wxss index ea17f66..5d8728f 100644 --- a/pages/specialcourtesy/specialcourtesy.wxss +++ b/pages/specialcourtesy/specialcourtesy.wxss @@ -1,3 +1,10 @@ +Page{ + background: #C8223C; +} +.headerbg image{ + display: block; + width: 100%; +} .fl{ float: left; } @@ -5,44 +12,76 @@ float: right; } .title{ - font-size: 28rpx; - padding: 20rpx 40rpx; - color: #999; + padding: 20rpx 40rpx 30rpx; + color: #fff; + text-align: center; + font-size:26rpx; } .card{ - width: 670rpx; - margin: 0 auto 40rpx; + position: relative; + width: 335rpx; + margin: 0 auto 18rpx; border-radius:16rpx; overflow: hidden; - box-shadow:1px 4px 20px #C4C4C4; + padding-bottom: 20rpx; + background: #fff; } -.header{ - background: #75b6f7; - padding: 30rpx 0 60rpx; - +.txt01 text{ + display: block; + text-align: center; } -.txt01{ - color: #fff; - font-size: 28rpx; +.cards{ + padding: 0 33rpx; +} +.cards>view:nth-of-type(2n){ + float: right; } -.text02{ - margin-top: 20rpx; +.cards>view:nth-of-type(2n+1){ + float: left; +} +.tit{ + font-size:36rpx; + color:rgba(51,51,51,1); + margin-top: -40rpx; +} +.cardtype{ + position: absolute; + right: 28rpx; + top: 20rpx; + font-size: 24rpx; + color:rgba(99,188,230,1); +} +.footer{ + margin-top: 26rpx; + font-size:26rpx; + font-weight:500; + color:rgba(153,153,153,1); } -.txt01 .fl{ - margin-left: 20rpx; - font-size: 35rpx; +.footer text{ + text-indent: 33rpx; } -.txt01 .fr{ - margin-right: 20rpx; +.footer image{ + width: 24rpx; + margin-right: 33rpx; } -.bottom{ - font-size: 26rpx; - color: #999; - height: 60rpx; - line-height: 60rpx; - text-indent: 1em; + .triangle { + width: 0px; + height: 0px; + border-color: transparent #DAB055; + border-width: 0 0 110rpx 110rpx; + border-style: solid; +} +.discount{ + position: absolute; + color: #fff; + width: 110rpx; + height: 100rpx; + font-size: 20rpx; + left:13rpx; + top:-11rpx; + z-index: 10; + transform:rotate(315deg); +} +.discount text{ + font-size: 28rpx; } -.number{ - font-size: 40rpx; - -} \ No newline at end of file diff --git a/pages/user/index.js b/pages/user/index.js index d123414..b28942d 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -86,14 +86,6 @@ Page({ */ onShow: function() { let that = this; - wx.getScreenBrightness({ - success: function (res) { - console.log(res) - that.setData({ - ScreenBrightness: res.value - }) - } - }) let num = wx.getStorageSync('couponNum'); wx.hideTabBarRedDot({ index: 2 @@ -150,9 +142,6 @@ Page({ let that = this; that.setData({ showQrcode: false - }), - wx.setScreenBrightness({ - value: that.data.ScreenBrightness }) }, //适配不同屏幕大小的canvas @@ -187,15 +176,6 @@ Page({ }, qrcode: function (e) { var that = this; - // if (that.data.ScreenBrightness>0.8){ - // wx.setScreenBrightness({ - // value: that.data.ScreenBrightness - // }) - // }else{ - // wx.setScreenBrightness({ - // value: 0.8 - // }) - // } that.setData({ showQrcode:true }) @@ -214,15 +194,11 @@ Page({ }); clearTimeout(st); }, 1000) + }, - // onUnload:function(){ - // wx.setScreenBrightness({ - // value: that.data.ScreenBrightness - // }) - // }, - // onHide:function(){ - // wx.setScreenBrightness({ - // value: that.data.ScreenBrightness - // }) - // } + close: function () { + this.setData({ + showmemberqrcode: false, + }) + } }); \ No newline at end of file diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 1ee2be9..63c977d 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -1,4 +1,4 @@ - + @@ -99,4 +99,3 @@ 会员号:{{memberId}} - \ No newline at end of file diff --git a/pages/user/index.wxss b/pages/user/index.wxss index b53c6c7..008b826 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -253,7 +253,7 @@ page{ } .qrcode image { - width: 60rpx; + width: 70rpx; margin-right: 20rpx; } @@ -363,7 +363,6 @@ page{ margin: auto; background: #fff; border-radius: 16rpx; - } .showQrcode text{ display: block;