diff --git a/index/index.wxml b/index/index.wxml index e6f4993..e3dbb4e 100644 --- a/index/index.wxml +++ b/index/index.wxml @@ -16,8 +16,8 @@ - - + + diff --git a/index/index.wxss b/index/index.wxss index c6fe748..682f584 100644 --- a/index/index.wxss +++ b/index/index.wxss @@ -417,6 +417,7 @@ page { color: rgba(255, 255, 255, 1); float: left; margin-top: 8rpx; + margin-left: 10rpx; } .chengzhang { diff --git a/index/user.wxml b/index/user.wxml index a09fa8d..96a5973 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -15,8 +15,8 @@ - - + + diff --git a/pages/theme/index1/index.wxml b/pages/theme/index1/index.wxml index 00de489..ff64681 100644 --- a/pages/theme/index1/index.wxml +++ b/pages/theme/index1/index.wxml @@ -15,7 +15,7 @@ - + diff --git a/pages/theme/index1/index.wxss b/pages/theme/index1/index.wxss index 7be9ba4..7ae83d6 100644 --- a/pages/theme/index1/index.wxss +++ b/pages/theme/index1/index.wxss @@ -88,7 +88,7 @@ page { line-height: 26rpx; font-size: 24rpx; padding: 4rpx 10rpx; - margin-left: 20rpx; + margin-left: 10rpx; } .integralNum { diff --git a/pages3/setUserInfo/index.js b/pages3/setUserInfo/index.js index 1e25b12..643bc7d 100644 --- a/pages3/setUserInfo/index.js +++ b/pages3/setUserInfo/index.js @@ -61,17 +61,20 @@ Page({ console.log(res, 'res') let avatarUrl = null - if (res.data.avatarUrl || 1 * res.data.avatarUrl) { + if (res.data.avatarUrl.length > 1) { avatarUrl = res.data.avatarUrl } else { avatarUrl = defaultAvatarUrl } let gender = null + let sexFlag = null if (1 * res.data.sex) { gender = res.data.sex - 1 + sexFlag = 2 } else { gender = res.data.sex + sexFlag = 1 } let adress = null @@ -85,7 +88,7 @@ Page({ nickName: res.data.nickName, username: res.data.name, gender: gender, - sexFlag: 2, + sexFlag: sexFlag, date: util.fmtDate(parseInt(res.data.birthdate)), dateFlag: res.data.birthdate ? 2 : 1, height: res.data.height, diff --git a/pages3/setUserInfo/index.wxml b/pages3/setUserInfo/index.wxml index c3179a3..94115eb 100644 --- a/pages3/setUserInfo/index.wxml +++ b/pages3/setUserInfo/index.wxml @@ -1,6 +1,6 @@ - + 我的头像 diff --git a/pages3/setUserInfo/index.wxss b/pages3/setUserInfo/index.wxss index 9ca9021..3141215 100644 --- a/pages3/setUserInfo/index.wxss +++ b/pages3/setUserInfo/index.wxss @@ -1,7 +1,7 @@ @import "../../app.wxss"; .container { - margin-top: 30rpx; + margin-top: 210rpx; padding: 0 40rpx 0 40rpx; }