From 60ed19ed921e2860bc4c42b8023f080ec7ab9d19 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 11 Oct 2018 18:48:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=90=E9=95=BF=E5=80=BC][=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0]:=E6=88=90=E9=95=BF=E5=80=BC=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 4 + assets/img/grade.png | Bin 0 -> 1432 bytes assets/img/grade1.png | Bin 0 -> 1292 bytes assets/img/grade2.png | Bin 0 -> 1501 bytes assets/img/grade3.png | Bin 0 -> 1584 bytes assets/img/shang.png | Bin 274 -> 5742 bytes config/config.js | 3 +- pages/grade/grade.js | 94 ++++++++++++++++++++ pages/grade/grade.json | 3 + pages/grade/grade.wxml | 81 ++++++++++++++++++ pages/grade/grade.wxss | 171 +++++++++++++++++++++++++++++++++++++ pages/passCar/passCar.js | 14 ++- pages/passCar/passCar.wxml | 3 +- pages/passCar/passCar.wxss | 5 +- pages/user/index.js | 8 ++ pages/user/index.wxml | 4 +- pages/user/index.wxss | 5 +- 17 files changed, 385 insertions(+), 10 deletions(-) create mode 100644 assets/img/grade.png create mode 100644 assets/img/grade1.png create mode 100644 assets/img/grade2.png create mode 100644 assets/img/grade3.png create mode 100644 pages/grade/grade.js create mode 100644 pages/grade/grade.json create mode 100644 pages/grade/grade.wxml create mode 100644 pages/grade/grade.wxss diff --git a/app.json b/app.json index ac57f7a..11cfc49 100644 --- a/app.json +++ b/app.json @@ -29,7 +29,11 @@ "pages/passCar/couponDetail/couponDetail", "pages/managelicenseplate/managelicenseplate", "pages/payrule/payrule", +<<<<<<< HEAD "pages/game/index" +======= + "pages/grade/grade" +>>>>>>> [成长值][增加]:成长值增加 ], "tabBar": { "color": "#9F9F9F", diff --git a/assets/img/grade.png b/assets/img/grade.png new file mode 100644 index 0000000000000000000000000000000000000000..a170886b0b6269f82964a905a9282b793454b406 GIT binary patch literal 1432 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 DFQ37z literal 0 HcmV?d00001 diff --git a/assets/img/grade3.png b/assets/img/grade3.png new file mode 100644 index 0000000000000000000000000000000000000000..e79e36a586a2bfe1844bbe2ee4089a256bd408ae GIT binary patch literal 1584 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 + console.log(res); + + that.setData({ + flags: 'have', + logincount: res.data.score.loginCount, + loginscoreNumber: res.data.score.loginScoreNumber, + personscoreNumber: res.data.score.personScoreNumber, + phonescoreNumber: res.data.score.phoneScoreNumber, + wifiscoreNumber: res.data.score.wifiScoreNumber, + wifinumber: res.data.score.wifiNumber, + levelList: res.data.levelList + }) + }) + .catch(res=>{ + that.setData({ + flags: 'nothave' + }) + }) + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function() { + + } +}) \ No newline at end of file diff --git a/pages/grade/grade.json b/pages/grade/grade.json new file mode 100644 index 0000000..5e86e17 --- /dev/null +++ b/pages/grade/grade.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "我的成长值" +} \ No newline at end of file diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml new file mode 100644 index 0000000..e9b0ab5 --- /dev/null +++ b/pages/grade/grade.wxml @@ -0,0 +1,81 @@ + + 生成规则 + + + + + + 访问 + 登陆 + + + {{logincount}}成长值 + + + + + 线上 + 交易 + + + {{loginscoreNumber}}成长值 + + + + + 授权 + 个人信息 + + + {{personscoreNumber}}成长值 + + + + + 授权 + 手机号 + + + {{phonescoreNumber}}成长值 + + + + + 链接 + 系统WIFI + + + {{wifiscoreNumber}}成长值 + + + + + 补充 + 个人信息 + + + {{wifinumber}}成长值 + + + + 成长值权益 + + + + + + + + + + {{item.level}} + + + {{item.description}} + + + + + + 暂无配置信息 + \ No newline at end of file diff --git a/pages/grade/grade.wxss b/pages/grade/grade.wxss new file mode 100644 index 0000000..52e67af --- /dev/null +++ b/pages/grade/grade.wxss @@ -0,0 +1,171 @@ +.scroll-header { + display: flex; + white-space: nowrap; +} + +.thin_circle { + position: relative; + height: 132rpx; + width: 132rpx; + border: 1px solid #f69948; + display: inline-block; + border-radius: 50%; + margin-right: 46rpx; +} + +.page { + height: 100%; + font-weight: 400; +} + +.scroll { + padding: 0 56rpx 20rpx; + margin-top: 22rpx; +} + +.title { + border-top: 20rpx solid #fafafa; + font-size: 34rpx; + font-weight: bold; + color: rgba(85, 85, 85, 1); + padding: 30rpx 0 10rpx; + line-height: 34rpx; + text-indent: 1em; +} + +.img { + width: 320rpx; + display: block; + margin: 160rpx auto 0; +} + +.txt { + display: block; + text-align: center; + font-size: 30rpx; + color: #ccc; +} + +.scroll-view-item { + position: relative; + text-align: center; + display: inline-block; + padding-left: 3rpx; +} + +.view text { + font-size: 23rpx; + display: block; + text-align: center; + color: #fd9643; + line-height: 32rpx; +} + +.scroll-view-item > text { + display: block; + width: 132rpx; + font-size: 21rpx; + font-weight: 400; + color: rgba(253, 150, 67, 1); + line-height: 29rpx; +} + +.view { + position: absolute; + display: flex; + justify-content: center; + flex-direction: column; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + width: 108rpx !important; + height: 108rpx !important; + border: 3px solid #f69948; + border-radius: 50%; +} + +.last { + margin-right: 0; +} +.quanyi{ + margin-top:20rpx; +} +.fl{ + float: left; +} +.fr{ + float: right; +} +.clearfix:after { +content: "."; +display: block; +height: 0; +clear: both; +visibility: hidden; +} +.grade { + width: 30rpx!important; +} + +.quanyi > view .titles { + display: inline-block; + font-size: 30rpx; + font-family: PingFang-SC-Bold; + font-weight: bold; + line-height: 30rpx; + padding: 0 0 0 10rpx; +} + +.quanyi > view:nth-of-type(1) .titles { + color: #fd9643; +} + +.quanyi > view:nth-of-type(2) .titles { + color: #ffba00; +} + +.quanyi > view:nth-of-type(3) .titles { + color: #6cb043; +} + +.quanyi > view:nth-of-type(4) .titles { + color: #2ac19c; +} + +.quanyi > view:nth-of-type(5) .titles { + color: #fd9643; +} + +.part { + padding: 0 34rpx; + margin-top: 20rpx; +} + +.des { + padding-left: 25rpx; + font-size: 26rpx; + font-weight: 400; + color: rgba(153, 153, 153, 1); + line-height: 40rpx; + margin-left: 12rpx; + padding-top: 10rpx; + padding-bottom: 10rpx; + margin-top: 10rpx; +} +.quanyi > view:nth-of-type(1) .des{ + border-left:6rpx dotted #fd9643; +} +.quanyi > view:nth-of-type(2) .des{ + border-left:6rpx dotted #ffba00; +} +.quanyi > view:nth-of-type(3) .des{ + border-left:6rpx dotted #6cb043; +} +.quanyi > view:nth-of-type(4) .des{ + border-left:6rpx dotted #2ac19c; +} +.quanyi > view:nth-of-type(5) .des{ + border-left:6rpx dotted #fd9643; +} diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index dc27566..21e8cd4 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -19,6 +19,7 @@ Page({ duration: 1000, current: 0, stopFees: {}, + canIUse: wx.canIUse("navigator") }, /** * 车牌轮播滑动 @@ -43,6 +44,13 @@ Page({ url: '/pages/managelicenseplate/managelicenseplate', }) }, + gotoetcp:function(){ + wx.navigateToMiniProgram({ + appId:'wx192b7d2e8dcbefd0', + extraData: this.data.extraData, + envVersion:'release' + }) + }, showquan: function() { wx.navigateTo({ url: '/pages/passCar/couponList/couponList', @@ -53,8 +61,10 @@ Page({ */ gotodetail: function(e) { console.log(e.target.dataset.rule); - wx.navigateTo({ - url: `/pages/payrule/payrule?rule=${e.target.dataset.rule}`, + wx.showModal({ + title: '缴费规则', + content: e.target.dataset.rule, + showCancel: false, }) }, onShow: function(options) { diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index f5549d9..ca96566 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -61,9 +61,10 @@ - + 立即支付 + 立即支付 diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss index 2eb5ecf..feeb69f 100644 --- a/pages/passCar/passCar.wxss +++ b/pages/passCar/passCar.wxss @@ -173,6 +173,9 @@ page { margin-bottom: 80rpx; border-top: 16rpx #f8f8f8 solid; } +.bottonBox view:nth-of-type(1) image{ + height: 45rpx; +} .textStyle { background-color: white; @@ -189,7 +192,7 @@ page { .textStyle image { width: 40rpx; height: 40rpx; - top: 27rpx; + top: 24rpx; left: 27rpx; position: absolute; } diff --git a/pages/user/index.js b/pages/user/index.js index 99426b8..7500564 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -10,6 +10,14 @@ Page({ flag: 'hidden', score:'0' }, + /** + * 跳转到成长值的页面 + */ + gotograde:function(){ + wx.navigateTo({ + url: '/pages/grade/grade', + }) + }, navigateTo() { wx.navigateTo({ url: `/pages/login/index` diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 3aa4ff2..805d751 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -10,7 +10,7 @@ 等级:{{levelName}} - + {{score}} @@ -67,7 +67,7 @@ - 版本号:2.1.2 + 版本号:2.1.4 diff --git a/pages/user/index.wxss b/pages/user/index.wxss index db12ac1..7f1a750 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -104,10 +104,9 @@ } .chengzhang1 image { - width: 24rpx; - height: 24rpx; + width: 30rpx; + height: 30rpx; vertical-align: top; - margin-top: 10rpx; } .chengzhang1 .view {