徐浩 / zzxyt-uniapp · 提交

转到一个项目

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

合并代码

内嵌 并排对比
正在显示 4 个修改的文件 包含 88 行增加 和 24 行删除
@@ -12,19 +12,10 @@ @@ -12,19 +12,10 @@
12 </view> 12 </view>
13 <view class="oneSettingV2-c-1"> 13 <view class="oneSettingV2-c-1">
14 <view class="oneSettingV2-c-1-l">姓名</view> 14 <view class="oneSettingV2-c-1-l">姓名</view>
15 - <view class="oneSettingV2-c-1-r">{{userdata.name}}</view>  
16 - </view>  
17 - <view class="oneSettingV2-c-1">  
18 - <view class="oneSettingV2-c-1-l">性别</view>  
19 - <view class="oneSettingV2-c-1-r">{{userdata.sex==1?'男':'女'}}</view>  
20 - </view>  
21 - <view class="oneSettingV2-c-1">  
22 - <view class="oneSettingV2-c-1-l">学号</view>  
23 - <view class="oneSettingV2-c-1-r">{{userdata.study_code}}</view> 15 + <view class="oneSettingV2-c-1-r">{{userdata.title}}</view>
24 </view> 16 </view>
25 17
26 </view> 18 </view>
27 - <!-- <view class="oneSettingV2-c-su" @click="logout_fuc">退出登录</view> -->  
28 </view> 19 </view>
29 </view> 20 </view>
30 </template> 21 </template>
@@ -56,7 +47,7 @@ @@ -56,7 +47,7 @@
56 this.userdata=this.userDatas 47 this.userdata=this.userDatas
57 }, 48 },
58 computed: { 49 computed: {
59 - ...mapState(['hasLogin', 'forcedLogin', 'userName', 'userinfo','nowtime', 'userDatas']), 50 + ...mapState(['userDatas']),
60 }, 51 },
61 methods: { 52 methods: {
62 // 更新头像 53 // 更新头像
@@ -401,7 +401,7 @@ @@ -401,7 +401,7 @@
401 .footer { 401 .footer {
402 position: fixed; 402 position: fixed;
403 left: 0; 403 left: 0;
404 - bottom: 0; 404 + bottom: calc(env(safe-area-inset-bottom) + 0);
405 width: 100%; 405 width: 100%;
406 padding: 16rpx 25rpx; 406 padding: 16rpx 25rpx;
407 background-color: #fff; 407 background-color: #fff;
1 <template> 1 <template>
2 <view class="oneSubmitted"> 2 <view class="oneSubmitted">
3 - <topbar bg_color="#2d81ff">  
4 - <text style="color: #fff;"></text>  
5 - <text style="color: #fff;">登录</text>  
6 - <text style="color: #fff;"></text>  
7 - </topbar> 3 + <CustomReturn bgColor="none" title="登录"/>
  4 + <view class="oneSubmitted-v2">
  5 + <image class="oneSubmitted-v2-bg" src="@/static/imagesV2/icon29.png" mode="widthFix"></image>
  6 + <PaddingTopB>
  7 + <view style="width: 100%;">
  8 + <view class="oneSubmitted-v2-1">
  9 + <image class="oneSubmitted-v2-1-i" src="@/static/imagesV2/icon68.png" mode="widthFix"></image>
  10 + </view>
  11 + <view class="oneSubmitted-v2-2">
  12 + <view class="oneSubmitted-v2-2-1" @click="openMajor">
  13 + <view class="oneSubmitted-v2-2-1-l">
  14 + <text style="color: #979797;" v-if="!school.id">请选择学校</text>
  15 + <text v-else>{{ school.name }}</text>
  16 + </view>
  17 + <u-icon name="arrow-down-fill" size="10"></u-icon>
  18 + </view>
  19 + <view class="oneSubmitted-v2-2-2" v-if="!school.id" @click="prompt">
  20 + 登录
  21 + </view>
  22 + <button class="oneSubmitted-v2-2-2" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber" v-else>
  23 + 登录
  24 + </button>
  25 + <view class="oneSubmitted-v2-2-3">
  26 + 本小程序为中志教育内部系统，不对外开放
  27 + </view>
  28 + </view>
  29 + </view>
  30 + </PaddingTopB>
  31 + </view>
8 <!-- 登录--> 32 <!-- 登录-->
9 - <view class="header-wrap"></view> 33 + <!-- <view class="header-wrap"></view> -->
10 34
11 - <view class="content-wrap1 area flex"> 35 + <!-- <view class="content-wrap1 area flex">
12 <view class="content-item flex"> 36 <view class="content-item flex">
13 <image class="img" src="/static/images/logo.png" mode=""></image> 37 <image class="img" src="/static/images/logo.png" mode=""></image>
14 - <!-- <view class="botm-btn" @tap="login_fuc" style="position: relative;">登录</view> -->  
15 <view class="botm-btn-2" @click="openMajor"> 38 <view class="botm-btn-2" @click="openMajor">
16 <text style="color: #979797;" v-if="!school.id">请选择学校</text> 39 <text style="color: #979797;" v-if="!school.id">请选择学校</text>
17 <text v-else>{{ school.name }}</text> 40 <text v-else>{{ school.name }}</text>
@@ -27,16 +50,15 @@ @@ -27,16 +50,15 @@
27 <view class="samll-text" style="color: red;"> 50 <view class="samll-text" style="color: red;">
28 本小程序为中志教育内部系统,不对外开放 51 本小程序为中志教育内部系统,不对外开放
29 </view> 52 </view>
30 - <!-- <view class="botm-btn botm-btn1" @tap="login_fuc1" style="position: relative;">  
31 - 教师登录  
32 - </view> -->  
33 - </view>  
34 </view> 53 </view>
  54 + </view> -->
35 <u-picker :show="show" :columns="columns" @cancel="show = false" keyName="name" @confirm="confirm"></u-picker> 55 <u-picker :show="show" :columns="columns" @cancel="show = false" keyName="name" @confirm="confirm"></u-picker>
36 </view> 56 </view>
37 </template> 57 </template>
38 58
39 <script> 59 <script>
  60 + import CustomReturn from "@/components/CustomReturn/index.vue"
  61 + import PaddingTopB from "@/components/PaddingTopB/index.vue"
40 import Vue from 'vue' 62 import Vue from 'vue'
41 import { 63 import {
42 mapState, 64 mapState,
@@ -44,6 +66,10 @@ @@ -44,6 +66,10 @@
44 } from 'vuex' 66 } from 'vuex'
45 var that 67 var that
46 export default { 68 export default {
  69 + components: {
  70 + CustomReturn,
  71 + PaddingTopB
  72 + },
47 data() { 73 data() {
48 return { 74 return {
49 show: false, 75 show: false,
@@ -255,6 +281,53 @@ @@ -255,6 +281,53 @@
255 .oneSubmitted { 281 .oneSubmitted {
256 position: relative; 282 position: relative;
257 } 283 }
  284 + .oneSubmitted-v2{
  285 + position: relative;
  286 + background-color: #ebf5ff;
  287 + .oneSubmitted-v2-bg{
  288 + position: absolute;
  289 + width: 100%;
  290 + }
  291 + .oneSubmitted-v2-1{
  292 + text-align: center;
  293 + margin-top: 150rpx;
  294 + .oneSubmitted-v2-1-i{
  295 + height: 240rpx;
  296 + width: 240rpx;
  297 + }
  298 + }
  299 + .oneSubmitted-v2-2{
  300 + padding: 0 75rpx;
  301 + .oneSubmitted-v2-2-1{
  302 + display: flex;
  303 + background-color: #FFFFFF;
  304 + height: 102rpx;
  305 + align-items: center;
  306 + border-radius: 300rpx;
  307 + padding: 0 40rpx;
  308 + box-sizing: border-box;
  309 + .oneSubmitted-v2-2-1-l{
  310 + flex-grow: 1;
  311 + }
  312 + }
  313 + .oneSubmitted-v2-2-2{
  314 + height: 90rpx;
  315 + border-radius: 200rpx;
  316 + font-size: 34rpx;
  317 + color: #FFFFFF;
  318 + text-align: center;
  319 + line-height: 90rpx;
  320 + margin-top: 60rpx;
  321 + background-color: #2D81FF;
  322 + }
  323 + .oneSubmitted-v2-2-3{
  324 + font-size: 24rpx;
  325 + margin-top: 26rpx;
  326 + text-align: center;
  327 + color: #323232;
  328 + }
  329 + }
  330 + }
258 331
259 .content-wrap1 { 332 .content-wrap1 {
260 min-height: 608rpx; 333 min-height: 608rpx;