mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop 

* 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java:
  修改pages.json
  【移动端】修复头像上传bug
  个人中心及注册页面跳转
This commit is contained in:
linjinyuan 2022-09-09 17:00:10 +08:00
parent bc927846c1 a4ed4f187d
commit 18bb453f04
8 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/components/widgets/user-info/user-info.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="user-info flex px-[50rpx] justify-between py-[50rpx]">
<view class="user-info flex px-[50rpx] justify-between py-[50rpx]">
<navigator
v-if="isLogin"
class="flex items-center"
@ -7,16 +7,19 @@
url="/pages/user_data/user_data"
>
<u-avatar :src="user.avatar" :size="120"></u-avatar>
<div class="text-white text-3xl ml-[20rpx]">{{ user.nickname }}</div>
<view class="text-white ml-[20rpx]">
<view class="text-2xl">{{ user.nickname }}</view>
<view class="text-xs mt-[18rpx]">账号：{{ user.username }}</view>
</view>
</navigator>
<navigator v-else class="flex items-center" hover-class="none" url="/pages/login/login">
<u-avatar src="/static/images/user/default_avatar.png" :size="120"></u-avatar>
<div class="text-white text-3xl ml-[20rpx]">未登录</div>
<view class="text-white text-3xl ml-[20rpx]">未登录</view>
</navigator>
<navigator v-if="isLogin" hover-class="none" url="/pages/user_set/user_set">
<u-icon name="setting" color="#fff" :size="58"></u-icon>
</navigator>
</div>
</view>
</template>
<script lang="ts" setup>
const props = defineProps({

9
app/src/pages.json
View File

@ -52,7 +52,8 @@
"path": "pages/user_set/user_set",
"style": {
"navigationBarTitleText": "个人设置"
}
},
"auth": true
},
{
"path": "pages/collection/collection",
@ -77,13 +78,15 @@
"path": "pages/change_password/change_password",
"style": {
"navigationBarTitleText": "修改密码"
}
},
"auth": true
},
{
"path": "pages/user_data/user_data",
"style": {
"navigationBarTitleText": "个人资料"
}
},
"auth": true
},
{
"path": "pages/search/search",

2
app/src/pages/index/index.vue
View File

@ -48,9 +48,11 @@ getData()
<style lang="scss">
.article-title {
&::before {
content: '';
width: 8rpx;
height: 34rpx;
display: block;
margin-right: 10rpx;
background: $u-type-primary;
}
}

16
app/src/pages/login/login.vue
View File

@ -81,8 +81,20 @@
<u-checkbox v-model="isCheckAgreement" shape="circle">
<view class="text-xs flex">
已阅读并同意
<navigator class="text-primary" hover-class="none">《服务协议》</navigator>
和<navigator class="text-primary" hover-class="none">
<navigator
@click.stop=""
class="text-primary"
hover-class="none"
url="/pages/agreement/agreement?type=service"
>
《服务协议》
</navigator>
和<navigator
@click.stop=""
class="text-primary"
hover-class="none"
url="/pages/agreement/agreement?type=privacy"
>
《隐私协议》
</navigator>
</view>

18
app/src/pages/register/register.vue
View File

@ -35,8 +35,22 @@
<u-checkbox v-model="isCheckAgreement" shape="circle">
<view class="text-xs flex">
已阅读并同意
<navigator class="text-primary">《服务协议》</navigator>
和<navigator class="text-primary">《隐私协议》</navigator>
<navigator
@click.stop=""
class="text-primary"
hover-class="none"
url="/pages/agreement/agreement?type=service"
>
《服务协议》
</navigator>
和<navigator
@click.stop=""
class="text-primary"
hover-class="none"
url="/pages/agreement/agreement?type=privacy"
>
《隐私协议》
</navigator>
</view>
</u-checkbox>
</view>

15
app/src/pages/user_data/user_data.vue
View File

@ -3,8 +3,7 @@
<!-- 头部修改头像 -->
<view class="header bg-white pt-[30rpx]">
<view class="flex justify-center">
<image @click="uploaderAvatar"
:src="userInfo?.avatar ? userInfo?.avatar : '/static/images/icon_default_user.png'"></image>
<image @click="uploaderAvatar" :src="userInfo?.avatar"></image>
</view>
<view class="mt-[20rpx] text-center text-muted text-xs" @click="uploaderAvatar">点击修改头像</view>
</view>
@ -242,8 +241,8 @@
// 修改用户账号
const changeUserNameConfirm = () => {
if (newUsername.value == '') return toast('账号不能为空')
if (newUsername.value.length > 10) return toast('账号长度不得超过十位数')
if (newUsername.value == '') return uni.$u.toast('账号不能为空')
if (newUsername.value.length > 10) return uni.$u.toast('账号长度不得超过十位数')
fieldType.value = FieldType.USERNAME
setUserInfoFun(newUsername.value)
@ -252,8 +251,8 @@
// 修改用户昵称
const changeNameConfirm = () => {
if (newNickname.value == '') return toast('昵称不能为空')
if (newNickname.value.length > 10) return toast('昵称长度不得超过十位数')
if (newNickname.value == '') return uni.$u.toast('昵称不能为空')
if (newNickname.value.length > 10) return uni.$u.toast('昵称长度不得超过十位数')
showNickName.value = false
fieldType.value = FieldType.NICKNAME
setUserInfoFun(newNickname.value)
@ -295,11 +294,11 @@
uploadFile(path)
.then((res) => {
uni.hideLoading()
setUserInfoFun(res.uri)
setUserInfoFun(res.url)
})
.catch(() => {
uni.hideLoading()
toast('上传失败')
uni.$u.toast('上传失败')
})
})

1
app/src/uni_modules/vk-uview-ui/components/u-image/u-image.vue
View File

@ -243,7 +243,6 @@ export default {
.u-image {
position: relative;
transition: opacity 0.5s ease-in-out;
&__image {
width: 100%;
height: 100%;

5
app/src/utils/util.ts
View File

@ -113,7 +113,7 @@ export function uploadFile(path: any) {
return new Promise((resolve, reject) => {
const token = getToken()
uni.uploadFile({
url: `${import.meta.env.VITE_APP_BASE_URL}/api/Upload/image`,
url: `${import.meta.env.VITE_APP_BASE_URL}/api/upload/image`,
filePath: path,
name: 'file',
header: {
@ -123,7 +123,8 @@ export function uploadFile(path: any) {
success: (res) => {
console.log('uploadFile res ==> ', res)
const data = JSON.parse(res.data)
if (data.code == 1) {
console.log('data.code', data.code)
if (data.code == 200) {
resolve(data.data)
} else {
reject()