From 9f6cca53c84f8eadfd8e76ff321a22f5ec580e72 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 2 Aug 2019 14:32:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A2=9E=E5=8A=A0]:[=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8C=89=E9=92=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/czdetail/czdetail.js | 2 ++ pages/czdetail/czdetail.json | 5 ++++- pages/czdetail/czdetail.wxml | 3 ++- pages/czdetail/czdetail.wxss | 1 + pages/grade/grade.js | 20 ++++---------------- pages/grade/grade.json | 4 +++- pages/grade/grade.wxml | 25 ++++++++++++++++++++----- pages/grade/grade.wxss | 19 +++++++++++++++---- pages/radetail/index.wxml | 2 +- 9 files changed, 52 insertions(+), 29 deletions(-) diff --git a/pages/czdetail/czdetail.js b/pages/czdetail/czdetail.js index 053a8ec..7c8a0a8 100644 --- a/pages/czdetail/czdetail.js +++ b/pages/czdetail/czdetail.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' var config = require("../../config/config.js"); var app = getApp(); const Http = require("../../utils/HttpBasics"); @@ -9,6 +10,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, score: 10, pageNum:1, list:[], diff --git a/pages/czdetail/czdetail.json b/pages/czdetail/czdetail.json index 067d648..1dbe9fa 100644 --- a/pages/czdetail/czdetail.json +++ b/pages/czdetail/czdetail.json @@ -1,4 +1,7 @@ { "navigationBarTitleText": "成长值", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "usingComponents": { + "navbar": "../../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/czdetail/czdetail.wxml b/pages/czdetail/czdetail.wxml index fb44006..d9e4241 100644 --- a/pages/czdetail/czdetail.wxml +++ b/pages/czdetail/czdetail.wxml @@ -1,4 +1,5 @@ - + + 当前 {{score}} 规则 diff --git a/pages/czdetail/czdetail.wxss b/pages/czdetail/czdetail.wxss index 339bdb6..aba46cc 100644 --- a/pages/czdetail/czdetail.wxss +++ b/pages/czdetail/czdetail.wxss @@ -35,6 +35,7 @@ font-family: PingFang-SC-Regular; font-weight: 400; color: rgba(255, 255, 255, 1); + padding-top: 25rpx; } .head text:nth-of-type(2) { diff --git a/pages/grade/grade.js b/pages/grade/grade.js index 544e3fe..c40239f 100644 --- a/pages/grade/grade.js +++ b/pages/grade/grade.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); let app = getApp(); @@ -8,6 +9,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, src: imgurl.grade.url, actUrl: imgurl.act.url, gradeUrl: imgurl.grade.url, @@ -16,21 +18,6 @@ Page({ grade3Url: imgurl.grade3.url, growthbgUrl: imgurl.growthbg.url, }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function() { - - }, - /** * 生命周期函数--监听页面显示 */ @@ -43,7 +30,8 @@ Page({ .then(res=>{ that.setData({ flags: 'have', - rules: JSON.parse(res.data.score.rules).concat(JSON.parse(res.data.score.rules)[1].childs), + rules: JSON.parse(res.data.score.rules), + rules1: JSON.parse(res.data.score.rules)[1].childs, levelList: res.data.levelList }) console.log(that.data.rules) diff --git a/pages/grade/grade.json b/pages/grade/grade.json index 5e86e17..d82a6ce 100644 --- a/pages/grade/grade.json +++ b/pages/grade/grade.json @@ -1,3 +1,5 @@ { - "navigationBarTitleText": "我的成长值" + "usingComponents": { + "navbar": "../../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml index 29eb63f..592c8d8 100644 --- a/pages/grade/grade.wxml +++ b/pages/grade/grade.wxml @@ -1,14 +1,29 @@ - + + + 成长值增长规则 - - + + {{item.title}}{{item.desc}} - {{item.score}}成长值 + {{item.score}}成长值 + + + + 交易规则 + + + + + + {{item.title}}{{item.desc}} + + + {{item.score}}成长值 @@ -36,7 +51,7 @@ - + 暂无配置信息 diff --git a/pages/grade/grade.wxss b/pages/grade/grade.wxss index 1094f6d..c9eb966 100644 --- a/pages/grade/grade.wxss +++ b/pages/grade/grade.wxss @@ -16,7 +16,9 @@ border-radius: 50%; margin-right: 46rpx; } - +.thin_circle1 { + border: 1px solid #4e9efe; +} .page { height: auto; font-weight: 400; @@ -57,6 +59,9 @@ padding-left: 3rpx; margin-right: 30rpx; } +.scroll-view-item1,.scroll-view-item2 { + margin-right: 0; +} .scroll-view-item:nth-of-type(1){ margin-right: 0; } @@ -71,7 +76,9 @@ margin: 0 auto; white-space: normal; } - +.view1 text { + color: #4e9efe; +} .scroll-view-item > text { display: block; width: 132rpx; @@ -80,7 +87,9 @@ color: rgba(253, 150, 67, 1); line-height: 29rpx; } - +.scroll-view-item1 > text { + color:#4e9efe; +} .view { position: absolute; display: flex; @@ -96,7 +105,9 @@ border: 3px solid #f69948; border-radius: 50%; } - +.view1 { + border: 3px solid #4e9efe; +} .last { margin-right: 0; } diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml index 2cd9042..9e1be09 100644 --- a/pages/radetail/index.wxml +++ b/pages/radetail/index.wxml @@ -31,7 +31,7 @@ - +