From c33e46071e5f4ca3e14444421126ea219d02bd8a Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 22 Oct 2018 14:25:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BC=96=E8=BE=91=E5=AE=8C=E5=96=84][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E7=BC=96=E8=BE=91=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/edit/edit.wxml | 19 +------------------ pages/edit/edit.wxss | 1 + pages/user/index.js | 10 ++++++++-- pages/user/index.wxml | 10 ++++++---- pages/user/index.wxss | 4 ++++ 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index ed55656..10957b8 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -19,27 +19,10 @@ - - 职业 - - - {{array[index]}} - - - - - 生活半径 - - - {{array1[index1]}} - - - - 地址 + 住址 - \ No newline at end of file diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss index 7f795db..8cd2873 100644 --- a/pages/edit/edit.wxss +++ b/pages/edit/edit.wxss @@ -24,6 +24,7 @@ input { .section__title, .picker, picker { display: inline-block; font-size: 32rpx; + color: #999; } radio { diff --git a/pages/user/index.js b/pages/user/index.js index 0943a58..2a86b2a 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -11,7 +11,8 @@ Page({ score:'0', name:"", birthdate:"", - sex:"" + sex:"", + showEdit:false }, /** * 跳转到成长值的页面 @@ -103,7 +104,12 @@ Page({ url: config.api.getScore, data: {} }).then(res=>{ - console.log(res); + console.log(res); + if (res.data.address && res.data.name && res.data.sex && res.data.birthdate){ + that.setData({ + showEdit:true + }) + } that.setData({ score: res.data.score, levelName: res.data.levelName diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 266c206..139a0f5 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -8,14 +8,16 @@ - {{levelName}} + {{levelName}} 成长值{{score}} - + - 编辑 - + + 编辑 + + diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 5cb7fcc..5a8ebe7 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -238,4 +238,8 @@ bottom: 0; right: 0; z-index: 10000; +} +.edit{ + width: 26rpx; + vertical-align: middle; } \ No newline at end of file