diff --git a/app.json b/app.json index 2b54b22..c1b1e8d 100644 --- a/app.json +++ b/app.json @@ -32,7 +32,8 @@ "pages/payrule/payrule", "pages/grade/grade", "pages/game/index", - "pages/index/gameentry/gentry" + "pages/index/gameentry/gentry", + "pages/specialcourtesy/specialcourtesy" ], "navigateToMiniProgramAppIdList": [ "wx192b7d2e8dcbefd0", diff --git a/assets/img/gift.png b/assets/img/gift.png new file mode 100644 index 0000000..2a7aeb8 Binary files /dev/null and b/assets/img/gift.png differ diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js new file mode 100644 index 0000000..252e8b0 --- /dev/null +++ b/pages/specialcourtesy/specialcourtesy.js @@ -0,0 +1,66 @@ +// pages/specialcourtesy/specialcourtesy.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/specialcourtesy/specialcourtesy.json b/pages/specialcourtesy/specialcourtesy.json new file mode 100644 index 0000000..85ee6d8 --- /dev/null +++ b/pages/specialcourtesy/specialcourtesy.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "特享礼遇" +} \ No newline at end of file diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml new file mode 100644 index 0000000..4ad9336 --- /dev/null +++ b/pages/specialcourtesy/specialcourtesy.wxml @@ -0,0 +1,40 @@ + + 注意:德胡的黑虎度的核武i好的害得我iu会丢额打黑u我会的u还得u和iu打黑u好的打黑ihdiu打黑i文化的打黑 + + + + + 美车堂9折(缤纷卡) + + + BM-1003 + 5255-1003 + + + + + 美车堂9折(缤纷卡) + + + BM-1003 + 5255-1003 + + + + + 美车堂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 new file mode 100644 index 0000000..65f03cb --- /dev/null +++ b/pages/specialcourtesy/specialcourtesy.wxss @@ -0,0 +1,44 @@ +.fl{ + float: left; +} +.fr{ + float: right; +} +.title{ + font-size: 28rpx; + padding: 20rpx 40rpx; + color: #999; +} +.card{ + width: 670rpx; + margin: 0 auto 40rpx; + border-radius:16rpx; + overflow: hidden; + box-shadow:1px 4px 20px #C4C4C4; +} +.header{ + background: #75b6f7; + padding: 30rpx 0 60rpx; + +} +.txt01{ + color: #fff; + font-size: 28rpx; +} +.text02{ + margin-top: 20rpx; +} +.txt01 .fl{ + margin-left: 20rpx; + font-size: 35rpx; +} +.txt01 .fr{ + margin-right: 20rpx; +} +.bottom{ + font-size: 26rpx; + color: #999; + height: 60rpx; + line-height: 60rpx; + text-indent: 1em; +} \ No newline at end of file diff --git a/pages/user/index.js b/pages/user/index.js index a33cfed..d123414 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -86,6 +86,14 @@ 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 @@ -142,6 +150,9 @@ Page({ let that = this; that.setData({ showQrcode: false + }), + wx.setScreenBrightness({ + value: that.data.ScreenBrightness }) }, //适配不同屏幕大小的canvas @@ -165,24 +176,6 @@ Page({ QR.api.draw(url, canvasId, cavW, cavH); // setTimeout(() => { this.canvasToTempImage(); }, 1000); }, - //获取临时缓存照片路径,存入data中 - // canvasToTempImage: function () { - // var that = this; - // wx.canvasToTempFilePath({ - // canvasId: 'mycanvas1', - // success: function (res) { - // var tempFilePath = res.tempFilePath; - // console.log(tempFilePath); - // that.setData({ - // imagePath: tempFilePath, - // // canvasHidden:true - // }); - // }, - // fail: function (res) { - // console.log(res); - // } - // }); - // }, //点击图片进行预览,长按保存分享图片 previewImg: function (e) { var img = this.data.imagePath; @@ -194,6 +187,15 @@ 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 }) @@ -212,11 +214,15 @@ Page({ }); clearTimeout(st); }, 1000) - }, - close: function () { - this.setData({ - showmemberqrcode: false, - }) - } + // onUnload:function(){ + // wx.setScreenBrightness({ + // value: that.data.ScreenBrightness + // }) + // }, + // onHide:function(){ + // wx.setScreenBrightness({ + // value: that.data.ScreenBrightness + // }) + // } }); \ No newline at end of file diff --git a/pages/user/index.json b/pages/user/index.json index f034544..53fccaa 100644 --- a/pages/user/index.json +++ b/pages/user/index.json @@ -2,5 +2,6 @@ "usingComponents": { "i-button": "../../dist/button/index" }, - "navigationBarTitleText": "我的" + "navigationBarTitleText": "我的", + "disableScroll": true } \ No newline at end of file diff --git a/pages/user/index.wxml b/pages/user/index.wxml index dfc2e7d..1ee2be9 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -1,91 +1,102 @@ - - - - - - - + + + + - - - {{levelName}} - 成长值{{score}} - + + + - - - - + + + {{levelName}} + 成长值{{score}} + + - - - 编辑 + + + + + + + 编辑 + + - - - - - - - 我的订单 - - 查看全部 - + + + + + 我的订单 + + 查看全部 + + - - - - - 待付款 - - + + + + 待付款 + + + - - - - - 已完成 - - + + + + 已完成 + + + - - - - - - 券包 - - - + + + + + 券包 + + + + - - - - - - 智能停车 - - + + + + + 智能停车 + + + - - - - - - - 版本号:3.1.1 - + + + + + 特享礼遇 + + + + + + + + + + 版本号:3.1.1 + + - - - - + + + - - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/user/index.wxss b/pages/user/index.wxss index df8a328..b53c6c7 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -1,3 +1,7 @@ +page{ + height: 100%; + overflow: hidden; +} .icons { width: 40rpx; margin-right: 20rpx; @@ -249,7 +253,7 @@ } .qrcode image { - width: 70rpx; + width: 60rpx; margin-right: 20rpx; } @@ -359,6 +363,7 @@ margin: auto; background: #fff; border-radius: 16rpx; + } .showQrcode text{ display: block;