diff --git a/pages/line/line.vue b/pages/line/line.vue
index 5cbc91d..b755905 100644
--- a/pages/line/line.vue
+++ b/pages/line/line.vue
@@ -73,7 +73,7 @@
return {
navBarTop: 0,
listLine: [],
- colorList: ['#dbd0ba','#666d95','#82818e','#6d7c4c'],
+ colorList: ['#dbd0ba','#ad6e46','#666d95','#6d7c4c'],
}
},
diff --git a/pages/me/me.vue b/pages/me/me.vue
index 879a84e..0455594 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -3,7 +3,7 @@
-
+
{{info.name?info.name:''}}
@@ -19,14 +19,16 @@
- {{done}}/{{answerTotal}}
+ {{done}}/{{answerTotal}}
0
-
+
-
+
{{done>0 && answerTotal>0 && done >= answerTotal ? '生成证书' : '未完成打卡'}}
@@ -37,7 +39,7 @@
-
+
x
@@ -46,7 +48,7 @@
:src="require('../../static/toast.png')">
-
+
@@ -55,23 +57,34 @@
-
+
+
+
+
+ 行走红色苏州申请
+
+
+
+ 获取你的头像、昵称
+
+
+ 记录与展示活动情况
+
+
+
+
- 头像：
-
+ 上传头像
-
- 姓名：
-
-
-
+
+
@@ -105,7 +118,7 @@
headReplace: '',
showform: false,
maskClose: false,
- imgurl: '',
+ imgurl: require('@/static/me-head.png'),
form: {
name: ''
},
@@ -145,10 +158,10 @@
const MenuButton = uni.getMenuButtonBoundingClientRect()
this.navBarTop = MenuButton.top //左侧文字与右侧胶囊对齐
this.getConfig()
- },
- onShow() {
- this.getInitUser()
- this.getDone()
+ },
+ onShow() {
+ this.getInitUser()
+ this.getDone()
},
methods: {
onChooseAvatar(e) {
@@ -186,30 +199,32 @@
this.$u.vuex('vuex_user', res)
console.log(this.vuex_user)
this.form = res
- this.imgurl = res.headimgurl ? res.headimgurl : ''
+ if (res.headimgurl) {
+ this.imgurl = res.headimgurl
+ }
this.info = this.$u.deepClone(res);
if (isNull(res.name)) {
this.showform = true
}
},
async getDone() {
- const res = await this.$u.api.getPoints()
+ const res = await this.$u.api.getPoints()
// this.done = res.point_answer_total
this.done = res.point_answer_total > this.answerTotal ? this.answerTotal : res.point_answer_total
},
async getConfig() {
- await this.$u.api.getAppId().then(res=>{
- res.config.map(item => {
- if (item.key === 'tips') {
- this.tips = item.value
- }
- if (item.key === 'answer_total') {
- this.answerTotal = parseInt(item.value)
- }
-
- })
- })
-
+ await this.$u.api.getAppId().then(res => {
+ res.config.map(item => {
+ if (item.key === 'tips') {
+ this.tips = item.value
+ }
+ if (item.key === 'answer_total') {
+ this.answerTotal = parseInt(item.value)
+ }
+
+ })
+ })
+
},
submit() {
if (isNull(this.form.name)) {
@@ -371,27 +386,76 @@
}
.login {
+ .u-drawer-content-visible {
+ border-radius: 25rpx 25rpx 0 0;
+ }
+
+ &-top {
+ font-size: 30rpx;
+ color: #000000;
+ margin: 40rpx 50rpx;
+ border-bottom: 1px solid #eaeaea;
+ padding-bottom: 40rpx;
+
+ >view {
+
+ &:first-child {
+ padding-bottom: 50rpx;
+ }
+
+ >view {
+ color: #666666;
+
+ &:first-child {
+ font-size: 36rpx;
+ color: #000000;
+ padding-bottom: 30rpx;
+ }
+ }
+ }
+
+ image {
+ width: 53rpx;
+ height: 53rpx;
+ vertical-align: middle;
+ }
+
+ text {
+ margin-left: 30rpx;
+ }
+ }
+
&-form {
- padding: 20rpx 60rpx;
+ padding: 30rpx 40rpx;
margin-top: 20rpx;
- padding-bottom: 120rpx;
+ padding-bottom: 60rpx;
+ display: flex;
>view {
- margin-bottom: 30rpx;
- background-color: #fff;
- padding: 20rpx 40rpx;
- border-radius: 20rpx;
- display: flex;
- align-items: center;
+ // margin-bottom: 30rpx;
+ // background-color: #fff;
+ // padding: 20rpx 40rpx;
+ // border-radius: 20rpx;
+ // display: flex;
+ // align-items: center;
+ width: 140rpx;
- span {
- width: 120rpx;
- text-align: right;
+ >view {
+ width: 140rpx;
+ text-align: center;
+ color: #666666;
}
button {
width: 100rpx;
height: 100rpx;
+ border-radius: 100rpx;
+ border: none;
+ background-color: #fff;
+ color: #fff;
+ font-size: 0;
+ margin: 0 auto !important;
+ margin-bottom: 10rpx!important;
image {
width: 100%;
@@ -399,29 +463,31 @@
}
}
- >view {
- border: 1px solid #999;
- border-radius: 10rpx;
- display: flex;
- width: calc(100% - 120rpx);
- padding: 10rpx 20rpx;
+ }
- input {
- width: 100%;
- }
- }
+ &-input {
+ border: 1px solid #eaeaea;
+ border-radius: 10rpx;
+ padding: 10rpx 20rpx;
+ margin-top: 10rpx;
+ width: calc(100% - 140rpx) !important;
+ height: 80rpx;
+ input {
+ width: 100%;
+ height: 100%;
+ }
}
}
&-btn {
padding: 30rpx 60rpx;
padding-top: 0;
-
+ padding-bottom:90rpx;
&-btn {
box-shadow: 0.5px 3px 9px 0px rgba(235, 107, 85, 0.3);
background: #960909;
- border-radius: 44rpx;
+ border-radius: 16rpx;
text-align: center;
height: 88rpx;
color: #fff;
diff --git a/static/me-head.png b/static/me-head.png
new file mode 100644
index 0000000..d202baf
Binary files /dev/null and b/static/me-head.png differ
diff --git a/static/me-icon0.png b/static/me-icon0.png
new file mode 100644
index 0000000..4775cc4
Binary files /dev/null and b/static/me-icon0.png differ