Skip to content

Commit 4fa43c2

Browse files
SliverHornSliverHorn
committed
Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
2 parents d07cbc8 + 5fe66b7 commit 4fa43c2

File tree

2 files changed

+125
-10
lines changed

2 files changed

+125
-10
lines changed

‎web/src/view/person/person.vue‎

Lines changed: 124 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,61 @@
11
<template>
22
<div>
3-
<div class="fl-left left-mg-xs">
4-
<el-avatar :size="120" :src="userInfo.headerImg" shape="square" @click.native="openChooseImg"></el-avatar>
5-
</div>
6-
<div class="fl-left left-mg-lg">
7-
<div>用户ID：{{userInfo.uuid}}</div>
8-
<div>用户昵称：{{userInfo.nickName}}</div>
9-
<div>用户组：{{userInfo.authority&&userInfo.authority.authorityName}}</div>
10-
</div>
3+
<el-row>
4+
<el-col :span="6">
5+
<div class="fl-left avatar-box">
6+
<div class="user-card">
7+
<el-avatar :size="160" :src="userInfo.headerImg" shape="square" @click.native="openChooseImg"></el-avatar>
8+
<div class="user-personality">
9+
<p class="nickname">{{userInfo.nickName}}</p>
10+
<p>我是个性签名</p>
11+
</div>
12+
<div class="user-information">
13+
<ul>
14+
<li>
15+
<i class="el-icon-user"></i>资深前端工程师
16+
</li>
17+
<li>
18+
<i class="el-icon-data-analysis"></i>北京反转极光科技有限公司-技术部-前端事业群
19+
</li>
20+
<li>
21+
<i class="el-icon-video-camera-solid"></i>中国·北京市·朝阳区
22+
</li>
23+
<li>
24+
<i class="el-icon-medal-1"></i>goLang/JavaScript/Vue/Gorm
25+
</li>
26+
</ul>
27+
</div>
28+
</div>
29+
</div>
30+
</el-col>
31+
<el-col :span="18">
32+
<div class="user-addcount">
33+
<el-tabs v-model="activeName" @tab-click="handleClick">
34+
<el-tab-pane label="账号绑定" name="second">
35+
<ul>
36+
<li>
37+
<p class="title">密保手机</p>
38+
<p class="desc">已绑定手机:1245678910 <a href="#">立即修改</a></p>
39+
</li>
40+
<li>
41+
<p class="title">密保邮箱</p>
42+
<p class="desc">已绑定邮箱：[email protected]<a href="#">立即修改</a></p>
43+
</li>
44+
<li>
45+
<p class="title">密保问题</p>
46+
<p class="desc">未设置密保问题 <a href="#">去设置</a></p>
47+
</li>
48+
</ul>
49+
</el-tab-pane>
50+
</el-tabs>
51+
</div>
52+
</el-col>
53+
</el-row>
54+
1155
<ChooseImg ref="chooseImg" @enter-img="enterImg"/>
56+
<!-- <div>用户ID：{{userInfo.uuid}}</div>-->
57+
<!-- <div>用户昵称：{{userInfo.nickName}}</div>-->
58+
<!-- <div>用户组：{{userInfo.authority&&userInfo.authority.authorityName}}</div>-->
1259
</div>
1360
</template>
1461
<script>
@@ -20,7 +67,9 @@ export default {
2067
name: 'Person',
2168
data(){
2269
return {
23-
path:path
70+
path:path,
71+
activeName: 'second',
72+
2473
}
2574
},
2675
components: {
@@ -45,6 +94,9 @@ export default {
4594
)
4695
}
4796
},
97+
handleClick(tab, event) {
98+
console.log(tab, event);
99+
}
48100
}
49101
}
50102
</script>
@@ -72,4 +124,67 @@ export default {
72124
height: 178px;
73125
display: block;
74126
}
127+
.avatar-box{
128+
box-shadow: -2px 0 20px -16px;
129+
width: 80%;
130+
height: 100%;
131+
.user-card{
132+
min-height: calc(90vh - 200px);
133+
padding: 30px 20px;
134+
text-align: center;
135+
.el-avatar{
136+
border-radius: 50%;
137+
}
138+
.user-personality{
139+
padding: 24px 0;
140+
text-align: center;
141+
p{
142+
font-size: 16px;
143+
}
144+
.nickname{
145+
font-size: 26px;
146+
}
147+
}
148+
.user-information{
149+
width: 100%;
150+
height: 100%;
151+
text-align: left;
152+
ul{
153+
display: inline-block;
154+
height: 100%;
155+
li{
156+
i{
157+
margin-right: 8px;
158+
}
159+
padding: 20px 0;
160+
font-size: 16px;
161+
font-weight: 400;
162+
color: #606266;
163+
}
164+
}
165+
}
166+
}
167+
}
168+
.user-addcount{
169+
ul{
170+
li{
171+
.title{
172+
padding: 10px;
173+
font-size: 18px;
174+
color: #696969;
175+
}
176+
.desc{
177+
font-size: 16px;
178+
padding: 0 10px 20px 10px ;
179+
color: #A9A9A9;
180+
a{
181+
color: rgb(64, 158, 255);
182+
float: right;
183+
}
184+
}
185+
border-bottom: 2px solid #f0f2f5;
186+
}
187+
}
188+
}
189+
75190
</style>

‎web/vue.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module.exports = {
2323
// 把key的路径代理到target位置
2424
// detail: https://cli.vuejs.org/config/#devserver-proxy
2525
[process.env.VUE_APP_BASE_API]: { //需要代理的路径 例如 '/api'
26-
target: `http://127.0.0.1:8888/`, //代理到 目标路径
26+
target: `http://139.9.113.229:8888/`, //代理到 目标路径
2727
changeOrigin: true,
2828
pathRewrite: { // 修改路径数据
2929
['^' + process.env.VUE_APP_BASE_API]: '' // 举例 '^/api:""' 把路径中的/api字符串删除

0 commit comments

Comments
 (0)