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

个人中心及注册页面跳转

This commit is contained in:
Jason 2022-09-09 15:59:18 +08:00
parent 0a1cf3fb1a
commit f1a80f7c5e
4 changed files with 37 additions and 9 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> <template>
<div class="user-info flex px-[50rpx] justify-between py-[50rpx]"> <view class="user-info flex px-[50rpx] justify-between py-[50rpx]">
<navigator <navigator
v-if="isLogin" v-if="isLogin"
class="flex items-center" class="flex items-center"
@ -7,16 +7,19 @@
url="/pages/user_data/user_data" url="/pages/user_data/user_data"
> >
<u-avatar :src="user.avatar" :size="120"></u-avatar> <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>
<navigator v-else class="flex items-center" hover-class="none" url="/pages/login/login"> <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> <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>
<navigator v-if="isLogin" hover-class="none" url="/pages/user_set/user_set"> <navigator v-if="isLogin" hover-class="none" url="/pages/user_set/user_set">
<u-icon name="setting" color="#fff" :size="58"></u-icon> <u-icon name="setting" color="#fff" :size="58"></u-icon>
</navigator> </navigator>
</div> </view>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
const props = defineProps({ const props = defineProps({

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

@ -81,8 +81,20 @@
<u-checkbox v-model="isCheckAgreement" shape="circle"> <u-checkbox v-model="isCheckAgreement" shape="circle">
<view class="text-xs flex"> <view class="text-xs flex">
已阅读并同意 已阅读并同意
<navigator class="text-primary" hover-class="none">《服务协议》</navigator> <navigator
和<navigator class="text-primary" hover-class="none"> @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> </navigator>
</view> </view>

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

@ -35,8 +35,22 @@
<u-checkbox v-model="isCheckAgreement" shape="circle"> <u-checkbox v-model="isCheckAgreement" shape="circle">
<view class="text-xs flex"> <view class="text-xs flex">
已阅读并同意 已阅读并同意
<navigator class="text-primary">《服务协议》</navigator> <navigator
和<navigator class="text-primary">《隐私协议》</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> </view>
</u-checkbox> </u-checkbox>
</view> </view>

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

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