From 3331093654010987840e2a8869e1bfb38417351b Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Fri, 19 Apr 2019 11:58:07 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5][=E4=BF=AE=E6=94=B9]:[?=
=?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9=E6=88=90=E9=95=BF=E5=80=BC?=
=?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dist/tab/index.wxss | 4 ++--
pages/main/index.js | 7 +++++++
pages/main/index.wxml | 13 +++++++++----
pages/main/index.wxss | 13 +++++++++++++
4 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/dist/tab/index.wxss b/dist/tab/index.wxss
index aefd529..50ee10a 100644
--- a/dist/tab/index.wxss
+++ b/dist/tab/index.wxss
@@ -15,12 +15,12 @@
.i-tabs-tab-bar {
display: block;
- width: 50%;
+ width: 72%;
height: 6rpx;
background: 0 0;
position: absolute;
bottom: 0;
- left: 25%;
+ left: 15%;
background: #af6e34;
border-radius: 100px;
}
diff --git a/pages/main/index.js b/pages/main/index.js
index 5fcbc13..bbf96db 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -314,6 +314,8 @@ Page({
console.log(res)
that.setData({
levelName: res.data.levelName,
+ upgradePercent: res.data.upgradePercent,
+ upgradeScore: res.data.upgradeScore,
score: res.data.score
})
if (res.data.nickName) {
@@ -336,6 +338,11 @@ Page({
})
})
},
+ gotoChengzhangzhi:function(){
+ wx.navigateTo({
+ url: '/pages/czdetail/czdetail',
+ })
+ },
/**
*
* @param {code,page}
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index 9870ed1..2b10342 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -7,18 +7,23 @@
-
+
{{levelName}}
- 成长值{{score}}
+ 还需{{upgradeScore}}成长值可升级
+
+
+
+
+
-
+
积分
5000
-
+
diff --git a/pages/main/index.wxss b/pages/main/index.wxss
index 2eaf5c8..126a2a1 100644
--- a/pages/main/index.wxss
+++ b/pages/main/index.wxss
@@ -306,4 +306,17 @@ height:100%;
}
.business{
margin-top: 40rpx;
+}
+.remainchengzhangzhi{
+ display: block;
+ color: #b2743d;
+ font-size: 12rpx;
+ margin-top: 5rpx;
+ line-height: 14rpx;
+}
+progress{
+ display:inline-block;
+ width:180rpx;
+ border-radius:60rpx;
+ overflow:hidden;
}
\ No newline at end of file