From a3c83995b488d6826dc38b8ab59eb72fe0b09ce6 Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 25 Aug 2022 09:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/home.vue | 2 +- pages/index/index.vue | 110 ++++++++++++++++++++++++-------- pages/phone/phone.vue | 15 +++-- static/{登陆头像.png => dl.png} | Bin 4 files changed, 92 insertions(+), 35 deletions(-) rename static/{登陆头像.png => dl.png} (100%) diff --git a/pages/home/home.vue b/pages/home/home.vue index db30150..b571ec1 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -104,7 +104,7 @@ margin-top: 80rpx; text-align: center; margin-bottom: 50rpx; - + } .score { diff --git a/pages/index/index.vue b/pages/index/index.vue index aeea540..305768f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -16,9 +16,9 @@ - + - + @@ -124,11 +144,13 @@ top2: false, login: false, mask: false, + mask2: false, before: false, stuinfos: false, tip: true, yonghuwx: [], - code: 11, + logincode: '', + phonecode: '', studentList: [], classList: [], parentList: [], @@ -159,13 +181,14 @@ }) }, getPreOrderById() { - getPreOrderById(this.code).then(res => { + getPreOrderById(this.logincode, this.phonecode).then(res => { console.log((res)) if (res.code == 200) { this.studentList = res.data.studentInfoList; this.classList = res.data.classInfoList; this.parentList = res.data; // this.mask = true; + this.mask2=false; } else if (res.code == 500 && res.msg == "EMPTY") { this.mask = true; } @@ -173,10 +196,21 @@ }, getPhoneNumberp(val) { + this.phonecode = val.detail.code + console.log(this.phonecode) + let that = this; wx.login({ provider: 'weixin', success: function(loginRes) { console.log(loginRes) + that.logincode = loginRes.code + console.log(that.logincode) + that.getPreOrderById(); + that.login = true + that.stuinfos = true + that.tip = false + that.top2 = true + that.top = false } }); }, @@ -192,13 +226,7 @@ key: 'user', data: res.userInfo }); - that.getPreOrderById() - that.getPhoneNumberp(); - that.login = true - that.stuinfos = true - that.tip = false - that.top2 = true - that.top = false + that.mask2 = true }, fail(res) { //失败则返回home页面 @@ -219,6 +247,7 @@ }, }, onLoad(options) { + // this.wxGetUserInfo(); this.setitem(); // this.yonghuwx = JSON.parse(options.userinfo) // console.log(this.yonghuwx) @@ -257,15 +286,17 @@ } .btn2 { - border-top: 1px solid #4486e8; + border-top: 1px solid #eeeeee; + /* background-color: #4486e8; */ + right: 0; } .btn1 { - border-top: 1px solid #4486e8; - border-right: 1px solid #4486e8; - background-color: #4486e8; - color: #fff; + border-top: 1px solid #eeeeee; + border-right: 1px solid #eeeeee; + + /* color: #fff; */ left: 0; } @@ -278,21 +309,45 @@ top: 0; z-index: 999; } + .mask2{ + width: 70%; + height: 400rpx; + background-color: #fff; + margin: 200rpx auto; + position: relative; + } + .sq{ + width: 90rpx; + height: 90rpx; + /* background-color: red; */ + margin:0 auto; + padding-top: 25rpx; + padding-bottom: 40rpx; + } + .masks img{ + width: 90rpx; + height: 90rpx; + } .text { font-size: 30rpx; width: 100%; text-align: left; - padding-top: 40rpx; + /* padding-top: 40rpx; */ text-align: center; + } .title { - font-size: 40rpx; - margin: 0 auto; - width: 20%; + height: 100rpx; + line-height: 100rpx; + border-bottom: 1px solid #eeeeee; + /* background-color: red; */ + font-size: 36rpx; + margin: 0px auto; + width: 100%; text-align: center; - line-height: 80rpx; + /* line-height: 80rpx; */ } .mask { @@ -367,10 +422,11 @@ } .name { - text-align: center; - margin-top: -120rpx; + /*text-align: center;*/ + /*margin-top: -120rpx;*/ /* margin-left: 10rpx; */ - margin-top: 10rpx; + /*margin-top: 10rpx;*/ + margin-left: 280rpx; } .name-qm { diff --git a/pages/phone/phone.vue b/pages/phone/phone.vue index 22e19d2..6bea9f6 100644 --- a/pages/phone/phone.vue +++ b/pages/phone/phone.vue @@ -1,3 +1,4 @@ +