徐浩 / zzxyt-uniapp · 提交

转到一个项目

作者 徐浩
提交 d5f993ae72c3bd8ed1b82df2597d3e2831015296 1 个父辈 ba3b50e4

合并代码

内嵌 并排对比
正在显示 4 个修改的文件 包含 88 行增加 和 24 行删除
... ... @@ -12,19 +12,10 @@
</view>
<view class="oneSettingV2-c-1">
<view class="oneSettingV2-c-1-l">姓名</view>
<view class="oneSettingV2-c-1-r">{{userdata.name}}</view>
</view>
<view class="oneSettingV2-c-1">
<view class="oneSettingV2-c-1-l">性别</view>
<view class="oneSettingV2-c-1-r">{{userdata.sex==1?'男':'女'}}</view>
</view>
<view class="oneSettingV2-c-1">
<view class="oneSettingV2-c-1-l">学号</view>
<view class="oneSettingV2-c-1-r">{{userdata.study_code}}</view>
<view class="oneSettingV2-c-1-r">{{userdata.title}}</view>
</view>
</view>
<!-- <view class="oneSettingV2-c-su" @click="logout_fuc">退出登录</view> -->
</view>
</view>
</template>
... ... @@ -56,7 +47,7 @@
this.userdata=this.userDatas
},
computed: {
...mapState(['hasLogin', 'forcedLogin', 'userName', 'userinfo','nowtime', 'userDatas']),
...mapState(['userDatas']),
},
methods: {
// 更新头像
... ...
... ... @@ -401,7 +401,7 @@
.footer {
position: fixed;
left: 0;
bottom: 0;
bottom: calc(env(safe-area-inset-bottom) + 0);
width: 100%;
padding: 16rpx 25rpx;
background-color: #fff;
... ...
<template>
<view class="oneSubmitted">
<topbar bg_color="#2d81ff">
<text style="color: #fff;"></text>
<text style="color: #fff;">登录</text>
<text style="color: #fff;"></text>
</topbar>
<CustomReturn bgColor="none" title="登录"/>
<view class="oneSubmitted-v2">
<image class="oneSubmitted-v2-bg" src="@/static/imagesV2/icon29.png" mode="widthFix"></image>
<PaddingTopB>
<view style="width: 100%;">
<view class="oneSubmitted-v2-1">
<image class="oneSubmitted-v2-1-i" src="@/static/imagesV2/icon68.png" mode="widthFix"></image>
</view>
<view class="oneSubmitted-v2-2">
<view class="oneSubmitted-v2-2-1" @click="openMajor">
<view class="oneSubmitted-v2-2-1-l">
<text style="color: #979797;" v-if="!school.id">请选择学校</text>
<text v-else>{{ school.name }}</text>
</view>
<u-icon name="arrow-down-fill" size="10"></u-icon>
</view>
<view class="oneSubmitted-v2-2-2" v-if="!school.id" @click="prompt">
登录
</view>
<button class="oneSubmitted-v2-2-2" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber" v-else>
登录
</button>
<view class="oneSubmitted-v2-2-3">
本小程序为中志教育内部系统，不对外开放
</view>
</view>
</view>
</PaddingTopB>
</view>
<!-- 登录-->
<view class="header-wrap"></view>
<!-- <view class="header-wrap"></view> -->
<view class="content-wrap1 area flex">
<!-- <view class="content-wrap1 area flex">
<view class="content-item flex">
<image class="img" src="/static/images/logo.png" mode=""></image>
<!-- <view class="botm-btn" @tap="login_fuc" style="position: relative;">登录</view> -->
<view class="botm-btn-2" @click="openMajor">
<text style="color: #979797;" v-if="!school.id">请选择学校</text>
<text v-else>{{ school.name }}</text>
... ... @@ -27,16 +50,15 @@
<view class="samll-text" style="color: red;">
本小程序为中志教育内部系统,不对外开放
</view>
<!-- <view class="botm-btn botm-btn1" @tap="login_fuc1" style="position: relative;">
教师登录
</view> -->
</view>
</view>
</view> -->
<u-picker :show="show" :columns="columns" @cancel="show = false" keyName="name" @confirm="confirm"></u-picker>
</view>
</template>
<script>
import CustomReturn from "@/components/CustomReturn/index.vue"
import PaddingTopB from "@/components/PaddingTopB/index.vue"
import Vue from 'vue'
import {
mapState,
... ... @@ -44,6 +66,10 @@
} from 'vuex'
var that
export default {
components: {
CustomReturn,
PaddingTopB
},
data() {
return {
show: false,
... ... @@ -255,6 +281,53 @@
.oneSubmitted {
position: relative;
}
.oneSubmitted-v2{
position: relative;
background-color: #ebf5ff;
.oneSubmitted-v2-bg{
position: absolute;
width: 100%;
}
.oneSubmitted-v2-1{
text-align: center;
margin-top: 150rpx;
.oneSubmitted-v2-1-i{
height: 240rpx;
width: 240rpx;
}
}
.oneSubmitted-v2-2{
padding: 0 75rpx;
.oneSubmitted-v2-2-1{
display: flex;
background-color: #FFFFFF;
height: 102rpx;
align-items: center;
border-radius: 300rpx;
padding: 0 40rpx;
box-sizing: border-box;
.oneSubmitted-v2-2-1-l{
flex-grow: 1;
}
}
.oneSubmitted-v2-2-2{
height: 90rpx;
border-radius: 200rpx;
font-size: 34rpx;
color: #FFFFFF;
text-align: center;
line-height: 90rpx;
margin-top: 60rpx;
background-color: #2D81FF;
}
.oneSubmitted-v2-2-3{
font-size: 24rpx;
margin-top: 26rpx;
text-align: center;
color: #323232;
}
}
}
.content-wrap1 {
min-height: 608rpx;
... ...