Skip to content

Commit

Permalink
m添加部分注释
Browse files Browse the repository at this point in the history
  • Loading branch information
@suvvm
suvvm committed Dec 1, 2019
1 parent 63cd08f commit 8d60cfc
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 81 deletions.
89 changes: 24 additions & 65 deletions pages/user/mdfUser.vue
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,50 @@
<template>
<view>
<van-cell-group>
<van-field
v-model="username"
label="用户名"
left-icon="contact"
placeholder="请输入用户名"
/>
<van-field
v-model="name"
label="姓名"
left-icon="user-circle-o"
placeholder="请输入真实姓名"
/>
<van-field
v-model="email"
label="邮箱"
left-icon="free-postage"
disabled
placeholder="请输入电子邮箱"
/>
<van-field
v-model="pnum"
label="手机号"
left-icon="phone-o"
placeholder="请输入手机号"
disabled
:error-message="errpnum"
/>
<van-field
v-model="password"
label="密码"
type="password"
left-icon="label-o"
placeholder="请输入6-20位密码"
maxlength="20"

/>
<van-field
v-model="password1"
type="password"
label="确认密码"
left-icon="label-o"
placeholder="请再次输入密码"
input="onPswChanged"
maxlength="20"
:error-message="err"
@blur="onPswChanged"
/>
<van-field v-model="username" label="用户名" left-icon="contact" placeholder="请输入用户名"/>
<van-field v-model="name" label="姓名" left-icon="user-circle-o" placeholder="请输入真实姓名"/>
<van-field v-model="email" label="邮箱" left-icon="free-postage" disabled placeholder="请输入电子邮箱"/>
<van-field v-model="pnum" label="手机号" left-icon="phone-o" placeholder="请输入手机号" disabled :error-message="errpnum"/>
<van-field v-model="password" label="密码" type="password" left-icon="label-o" placeholder="请输入6-20位密码" maxlength="20"/>
<van-field v-model="password1" type="password" label="确认密码" left-icon="label-o" placeholder="请再次输入密码" input="onPswChanged" maxlength="20" :error-message="err" @blur="onPswChanged"/>
</van-cell-group>
<!-- 性别选择 -->
<van-cell-group>
<van-radio-group v-model="gender">
<van-cell-group>
<van-cell title="我是男性" clickable @click="gender = '0'">
<van-radio slot="right-icon" name="0" />
</van-cell>
<van-cell title="我是女性" clickable @click="gender = '1'">
<van-radio slot="right-icon" name="1" />
</van-cell>
</van-cell-group>
<van-cell-group>
<van-cell title="我是男性" clickable @click="gender = '0'">
<van-radio slot="right-icon" name="0" />
</van-cell>
<van-cell title="我是女性" clickable @click="gender = '1'">
<van-radio slot="right-icon" name="1" />
</van-cell>
</van-cell-group>
</van-radio-group>
</van-cell-group>
<!-- 发送验证码，间隔60秒 -->
<van-cell-group>
<van-field
v-model="sms"
center
clearable
label="短信验证码"
left-icon="chat-o"
placeholder="请输入短信验证码">
<van-field v-model="sms" center clearable label="短信验证码" left-icon="chat-o" placeholder="请输入短信验证码">
<van-button slot="button" size="small" :disabled="disabled" @click="sentIdentify" type="primary">
<block v-if="count == 60">发送验证码</block>
<block v-else>
{{count}}
</block>
</van-button>
</van-button>
</van-field>
</van-cell-group>
<text v-if="imgfile != avatar">两张图片不同</text>
<!-- <text v-if="imgfile != avatar">两张图片不同</text> -->
<!-- 上传头像 -->
<van-cell-group>
<label>上传头像</label>
<van-uploader :after-read="afterReadAvatar" capture="camera" multiple :max-count="1"/>
<!-- 根据base64码显示图片 -->
<img :src="'data:image/png;base64,'+avatar" class='innerImg'/>
</van-cell-group>
<!-- 上传人脸图 -->
<van-cell-group>
<label>人脸数据</label>
<van-uploader :after-read="afterReadFace" capture="camera" multiple :max-count="1"/>
<!-- 根据base64码显示图片 -->
<img :src="'data:image/png;base64,'+imgfile" class='innerImg2'/>
</van-cell-group>
<van-button size="large" class="submit" type="info" @click="handleClick">提交修改</van-button>
Expand Down Expand Up @@ -119,7 +78,7 @@
},
onLoad() {
var rp = require('request-promise');
var options = {
var options = { // 根据id获取用户信息
method: 'POST',
uri: 'http://localhost:8080/getUserById',
form: {
Expand Down
34 changes: 18 additions & 16 deletions pages/user/user.vue
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<template>
<view class=''>

<!-- 以头像作为底部背景，在上方加遮罩层来美化界面 -->
<view class='detail-container' :style ="'background:url(data:image/png;base64,'+userInfo.avatar + ') no-repeat center/cover'"></view>
<!--style='background: url(/testUserInfo/imgs/avatar.jpg) no-repeat top/cover' -->
<view class='detail-mask'></view>
<!-- 显示用户基本信息 -->
<view class='detail-info'>
<img :src="'data:image/png;base64,'+userInfo.avatar" class='detail-img'/>
<!-- <img :src="'data:image/png;base64,'+imgfile" class="avatar"/> -->
Expand All @@ -17,32 +18,33 @@
</view>
</view>

<!-- 判断公司用户 管理员 普通用户后再做具体实现 -->
<!-- 判断公司用户 管理员 普通用户后具体实现 -->
<!-- 管理员用户 -->
<van-cell-group v-if="userInfo.power == 2">
<van-cell title="审核调查" icon="todo-list-o" is-link />
<van-cell title="管理公司" icon="friends-o" is-link />
<van-cell title="管理用户" icon="user-o" is-link />
</van-cell-group>

<!-- 公司用户 -->
<van-cell-group v-if="userInfo.power == 1">
<van-cell title="发布调查" icon="todo-list-o" is-link @click="toCreateInv()" />
<van-cell title="我的公司" icon="friends-o" is-link @click="toMyCmp()"/>
<van-cell title="管理调查" icon="orders-o" is-link @click="toCmpInv()"/>
</van-cell-group>

<!-- 普通用户 -->
<van-cell-group v-if="userInfo.power == 0">
<van-cell title="我的调查" icon="description" is-link />
</van-cell-group>

<!-- 全体用户通用 -->
<van-cell-group>
<van-cell title="修改个人信息" icon="records" is-link @click="toMdfUserInf()"/>
</van-cell-group>

<!-- 全体用户通用 -->
<van-cell-group v-if="userInfo.power != 2">
<van-cell title="关于我们" icon="chat-o" is-link @click="toAboutUs()"/>
<van-cell title="退出登录" icon="down" is-link @click="logout()"/>
</van-cell-group>

<!-- 底部导航栏 -->
<van-tabbar route>
<van-tabbar-item icon="home-o" to="/home">首页</van-tabbar-item>
<van-tabbar-item icon="search" to="/home">检索</van-tabbar-item>
Expand All @@ -61,14 +63,14 @@
},
onLoad() {
var rp = require('request-promise');
var options = {
var options = { // 根据id获取用户包括头像与人脸数据的全部信息
method: 'POST',
uri: 'http://localhost:8080/getUserById',
form: {
id: this.$cookies.get("userInfo").id,
}
};
rp(options).then(res => {
rp(options).then(res => { // 请求成功
this.$toast.clear();
if(res == "error") {
this.$toast.fail('获取用户信息识别，未找到用户信息');
Expand All @@ -77,39 +79,39 @@
this.$toast.success('获取用户信息成功');
}
// console.log(this.note.backgroundImage)
}).catch(err => {
}).catch(err => { // 请求失败
this.$toast.clear();
this.$toast.fail('获取用户信息, 请检查网络连接');
console.log(err);
});
},
methods: {
toCreateInv() {
toCreateInv() { // 路由至发布调查页
this.$router.push({
path: '/pages/investigates/addInvestigates',
});
},
toMyCmp() {
toMyCmp() { // 路由至我的公司页
this.$router.push({
path: '/pages/Company/userCompany',
});
},
toMdfUserInf() {
toMdfUserInf() { // 路由至修改个人信息页
this.$router.push({
path: '/pages/user/mdfUser',
});
},
toCmpInv() {
toCmpInv() { // 路由至管理调查页
this.$router.push({
path: '/pages/investigates/allCmpInv',
});
},
toAboutUs() {
toAboutUs() { // 路由至关于我们页
this.$router.push({
path: '/pages/AboutUs/AboutUs',
});
},
logout() {
logout() { // 推出登录方法
this.$cookies.remove("userInfo");
this.$router.push({
path: '/pages/index/index',
Expand Down

0 comments on commit 8d60cfc

Please sign in to comment.