diff --git a/assets/images/avatar2.png b/assets/images/avatar2.png new file mode 100644 index 0000000..aee99aa Binary files /dev/null and b/assets/images/avatar2.png differ diff --git a/assets/images/avatar3.png b/assets/images/avatar3.png new file mode 100644 index 0000000..1c7b19a Binary files /dev/null and b/assets/images/avatar3.png differ diff --git a/assets/images/avatar8.png b/assets/images/avatar8.png new file mode 100644 index 0000000..d8907d4 Binary files /dev/null and b/assets/images/avatar8.png differ diff --git a/assets/images/avatar9.png b/assets/images/avatar9.png new file mode 100644 index 0000000..90f7d97 Binary files /dev/null and b/assets/images/avatar9.png differ diff --git a/pages/setUserInfo/index.js b/pages/setUserInfo/index.js index 891c8cf..6448f04 100644 --- a/pages/setUserInfo/index.js +++ b/pages/setUserInfo/index.js @@ -59,15 +59,32 @@ Page({ } }).then(res => { console.log(res, 'res') + + let avatarUrl = null + if (res.data.avatarUrl) { + avatarUrl = res.data.avatarUrl + } else { + avatarUrl = defaultAvatarUrl + } + + let gender = null + if (1 * res.data.sex) { + gender = res.data.sex - 1 + } else { + gender = res.data.sex + } + let adress = null if (res.data.address) { adress = JSON.parse(res.data.address) } + + this.setData({ - avatarUrl: res.data.avatarUrl, + avatarUrl: avatarUrl, nickName: res.data.nickName, username: res.data.name, - gender: res.data.sex, + gender: gender, sexFlag: 2, date: util.fmtDate(parseInt(res.data.birthdate)), dateFlag: res.data.birthdate ? 2 : 1, @@ -136,7 +153,7 @@ Page({ avatarUrl: that.data.avatarUrl, nickName: e.detail.value.nickname, name: e.detail.value.username, - sex: that.data.gender, + sex: 1 * that.data.gender + 1, birthdate: birthdate, height: e.detail.value.height ? e.detail.value.height : that.data.height, weight: e.detail.value.weight ? e.detail.value.weight : that.data.weight, @@ -162,14 +179,13 @@ Page({ }).then(res => { if (res.code == 200) { wx.showToast({ - title: "信息提交成功,将在3分钟内生效", - icon: 'none', - duration: 2000, - mask: false + title: "信息提交成功", + icon: 'success', + duration: 1500, }) setTimeout(() => { wx.navigateBack() - }, 2000) + }, 1500) } }).catch(err => { console.log(err); @@ -237,9 +253,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage() { + // onShareAppMessage() { - }, + // }, onChooseAvatar(e) { const that = this @@ -255,6 +271,7 @@ Page({ that.setData({ avatarUrl: JSON.parse(res.data).data.url }) + console.log(that.data.avatarUrl); } }) diff --git a/pages/setUserInfo/index.wxml b/pages/setUserInfo/index.wxml index 19909b7..c3179a3 100644 --- a/pages/setUserInfo/index.wxml +++ b/pages/setUserInfo/index.wxml @@ -1,5 +1,5 @@ - + @@ -97,6 +97,7 @@ + \ No newline at end of file diff --git a/pages/setUserInfo/index.wxss b/pages/setUserInfo/index.wxss index a284d72..9ca9021 100644 --- a/pages/setUserInfo/index.wxss +++ b/pages/setUserInfo/index.wxss @@ -61,6 +61,9 @@ text-align: right; padding-left: 20rpx; width: 400rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .greyFont { diff --git a/pages/theme/index1/index.wxml b/pages/theme/index1/index.wxml index c5dc242..e8c8590 100644 --- a/pages/theme/index1/index.wxml +++ b/pages/theme/index1/index.wxml @@ -15,8 +15,8 @@ - - + + diff --git a/pages/theme/index1/index.wxss b/pages/theme/index1/index.wxss index 5e9dc97..f452fd7 100644 --- a/pages/theme/index1/index.wxss +++ b/pages/theme/index1/index.wxss @@ -3,11 +3,13 @@ page { background: #f4f5f9; } -.temp{ + +.temp { width: 100rpx; height: 100rpx; background-color: darkcyan } + .xia { width: 24rpx; height: 14rpx; @@ -18,7 +20,7 @@ page { left: 0; right: 0; bottom: 0; - + /* margin: auto; */ } @@ -26,21 +28,22 @@ page { display: flex; justify-content: space-around; } + .goSqunar1 { display: flex; justify-content: center; - + } .title { font-size: 32rpx; font-family: OPPOSans; font-weight: bold; - + } .title1 { - max-width:320rpx; + max-width: 320rpx; font-size: 32rpx; font-family: OPPOSans; font-weight: bold; @@ -53,9 +56,9 @@ page { width: 24rpx; /* height: 15rpx; */ } -.marketName{ -} +.marketName {} + .f { float: left; } @@ -75,6 +78,7 @@ page { line-height: 26rpx; font-size: 24rpx; padding: 4rpx 10rpx; + margin-left: 20rpx; } .integralNum { @@ -95,7 +99,8 @@ page { } .color_box { - /* padding-top: 20rpx; *//* background-image: linear-gradient(#DC143C, #F4F5F9); */ + /* padding-top: 20rpx; */ + /* background-image: linear-gradient(#DC143C, #F4F5F9); */ background-color: #f4f5f9; } @@ -209,18 +214,20 @@ page { padding: 0 38rpx; } -.section >view, .sellsection>view { +.section>view, +.sellsection>view { width: 25%; display: inline-block; position: relative; } -.section >view image, .sellsection>view image { +.section>view image, +.sellsection>view image { display: block; margin: 0 auto; } -.section >view image { +.section>view image { width: 55rpx; height: 55rpx; margin-top: 20rpx; @@ -360,12 +367,14 @@ page { width: 100%; height: 100%; } -.noAccredit{ - text-align: center; - height: 80rpx; - font-size: 20rpx; - background-color: rgba(0, 0, 0, 0.3) + +.noAccredit { + text-align: center; + height: 80rpx; + font-size: 20rpx; + background-color: rgba(0, 0, 0, 0.3) } + .user-data { letter-spacing: 0.64rpx; line-height: 46rpx; @@ -828,4 +837,4 @@ i-tabs i-tabs-scroll { right: 20rpx; position: fixed; z-index: 1000000; -} +} \ No newline at end of file