修改返回时带默认值和短信登录

dist/css/AppLogin.cb80f7f9.css

@@ -1 +0,0 @@
-.login[data-v-258f3884]{min-height:100vh;background:-webkit-gradient(linear,left top,left bottom,from(#15938b),to(#6dbeba));background:linear-gradient(180deg,#15938b,#6dbeba)}.container[data-v-258f3884]{padding:0 .48rem}.logo[data-v-258f3884]{padding-top:1rem;padding-bottom:.9rem;width:1.6rem;margin:0 auto}.logo img[data-v-258f3884]{width:inherit}.input-group[data-v-258f3884]{position:relative;height:.44rem;border-radius:.5rem;border:.02rem solid #fff;margin-bottom:.2rem;padding-left:.3rem;padding-right:.3rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.input-group .input[data-v-258f3884]{-webkit-box-flex:1;-ms-flex:1;flex:1;font-size:.14rem;color:#fff;background:transparent;border:none}.input-group .input[data-v-258f3884]::-webkit-input-placeholder{color:#fff}.input-group .input[data-v-258f3884]::-moz-placeholder{color:#fff}.input-group .input[data-v-258f3884]:-ms-input-placeholder{color:#fff}.input-group .input[data-v-258f3884]::-ms-input-placeholder{color:#fff}.input-group .input[data-v-258f3884]::placeholder{color:#fff}.input-group .code-text[data-v-258f3884]{position:absolute;right:0;-webkit-box-flex:1;-ms-flex:1;flex:1;display:block;width:.94rem;text-align:center;border-left:.02rem solid #fff}.input-group .code-text[data-v-258f3884],[data-v-258f3884] .van-count-down{font-size:.14rem;color:#fff;line-height:.3rem;height:.3rem}[data-v-258f3884] .van-button--large{height:.44rem;line-height:.42rem;color:#14928a;border:0}[data-v-258f3884] .van-button:active:before{opacity:.05}[data-v-258f3884] .van-button--disabled{opacity:1;color:rgba(0,0,0,.25)}.login-change[data-v-258f3884]{padding-top:.08rem;font-size:.14rem;color:#fff;float:right}

dist/css/AppLogin.ef20b40f.css

@@ -0,0 +1 @@
+.login[data-v-7d09a3e9]{min-height:100vh;background:-webkit-gradient(linear,left top,left bottom,from(#15938b),to(#6dbeba));background:linear-gradient(180deg,#15938b,#6dbeba)}.container[data-v-7d09a3e9]{padding:0 .48rem}.logo[data-v-7d09a3e9]{padding-top:1rem;padding-bottom:.9rem;width:1.6rem;margin:0 auto}.logo img[data-v-7d09a3e9]{width:inherit}.input-group[data-v-7d09a3e9]{position:relative;height:.44rem;border-radius:.5rem;border:.02rem solid #fff;margin-bottom:.2rem;padding-left:.3rem;padding-right:.3rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.input-group .input[data-v-7d09a3e9]{-webkit-box-flex:1;-ms-flex:1;flex:1;font-size:.14rem;color:#fff;background:transparent;border:none}.input-group .input[data-v-7d09a3e9]::-webkit-input-placeholder{color:#fff}.input-group .input[data-v-7d09a3e9]::-moz-placeholder{color:#fff}.input-group .input[data-v-7d09a3e9]:-ms-input-placeholder{color:#fff}.input-group .input[data-v-7d09a3e9]::-ms-input-placeholder{color:#fff}.input-group .input[data-v-7d09a3e9]::placeholder{color:#fff}.input-group .code-text[data-v-7d09a3e9]{position:absolute;right:0;-webkit-box-flex:1;-ms-flex:1;flex:1;display:block;width:.94rem;text-align:center;border-left:.02rem solid #fff}.input-group .code-text[data-v-7d09a3e9],[data-v-7d09a3e9] .van-count-down{font-size:.14rem;color:#fff;line-height:.3rem;height:.3rem}[data-v-7d09a3e9] .van-button--large{height:.44rem;line-height:.42rem;color:#14928a;border:0}[data-v-7d09a3e9] .van-button:active:before{opacity:.05}[data-v-7d09a3e9] .van-button--disabled{opacity:1;color:rgba(0,0,0,.25)}.login-change[data-v-7d09a3e9]{padding-top:.08rem;font-size:.14rem;color:#fff;float:right}

dist/css/AppSetInfo.db3bce46.css → dist/css/AppSetInfo.ae559da8.css

@@ -1 +1 @@
-.mheader[data-v-61d0e2e4]{height:.44rem;overflow:hidden}.m-nav-header[data-v-61d0e2e4]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;background-color:#14928a;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#fff}.m-nav-header.fixed[data-v-61d0e2e4]{position:fixed;z-index:99}.m-nav-header .m-nav-bar__title[data-v-61d0e2e4]{max-width:60%;margin:0 auto;color:#fff;font-weight:500;font-size:.16rem}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4],.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-61d0e2e4]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{right:.12rem}.register[data-v-d09beabe]{min-height:100vh;background:#fff}.van-button--plain.van-button--primary[data-v-d09beabe]{color:#14928a;border-color:#14928a}[data-v-d09beabe] .van-cell-group{margin:.3rem .28rem 0}[data-v-d09beabe] .van-cell{display:block;padding:.05rem 0;margin-bottom:.1rem;border-bottom:1px solid #ebebeb}[data-v-d09beabe] .van-cell .van-field__label{font-size:.16rem;color:#444;padding-bottom:.05rem;width:100%}[data-v-d09beabe] .van-cell .van-field__value{font-size:.16rem}[data-v-d09beabe] .van-count-down{font-size:.14rem;color:#14928a;padding:.02rem .08rem;border-radius:1rem;border:1px solid #14928a}[data-v-d09beabe] .van-button--large{height:.44rem;line-height:.42rem;color:#fff;border:0;background:#14928a}[data-v-d09beabe] .van-button:active:before{opacity:.05}[data-v-d09beabe] .van-button--disabled{opacity:1;color:hsla(0,0%,100%,.4)}.login-change[data-v-d09beabe]{padding-top:.08rem;font-size:.14rem;color:#fff;float:right}
+.mheader[data-v-61d0e2e4]{height:.44rem;overflow:hidden}.m-nav-header[data-v-61d0e2e4]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;background-color:#14928a;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#fff}.m-nav-header.fixed[data-v-61d0e2e4]{position:fixed;z-index:99}.m-nav-header .m-nav-bar__title[data-v-61d0e2e4]{max-width:60%;margin:0 auto;color:#fff;font-weight:500;font-size:.16rem}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4],.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-61d0e2e4]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{right:.12rem}.register[data-v-2cc7804c]{min-height:100vh;background:#fff}.van-button--plain.van-button--primary[data-v-2cc7804c]{color:#14928a;border-color:#14928a}[data-v-2cc7804c] .van-cell-group{margin:.3rem .28rem 0}[data-v-2cc7804c] .van-cell{display:block;padding:.05rem 0;margin-bottom:.1rem;border-bottom:1px solid #ebebeb}[data-v-2cc7804c] .van-cell .van-field__label{font-size:.16rem;color:#444;padding-bottom:.05rem;width:100%}[data-v-2cc7804c] .van-cell .van-field__value{font-size:.16rem}[data-v-2cc7804c] .van-count-down{font-size:.14rem;color:#14928a;padding:.02rem .08rem;border-radius:1rem;border:1px solid #14928a}[data-v-2cc7804c] .van-button--large{height:.44rem;line-height:.42rem;color:#fff;border:0;background:#14928a}[data-v-2cc7804c] .van-button:active:before{opacity:.05}[data-v-2cc7804c] .van-button--disabled{opacity:1;color:hsla(0,0%,100%,.4)}.login-change[data-v-2cc7804c]{padding-top:.08rem;font-size:.14rem;color:#fff;float:right}

src/views/app/AppLogin.vue

@@ -126,8 +126,7 @@ export default {
                 if(s.code == 200) {
                     let auth = s.data.authentication
                     localStorage.setItem('userInfo', auth.token_type + ' ' + auth.access_token)
-                    
-                    if(s.password) {
+                    if(s.data.password) {
                         this.$router.push({
                             path: '/classDetail',
                             query: {

src/views/app/AppRegister.vue

@@ -34,17 +34,20 @@ import {sendSms, smsLogin, queryUserByPhone } from '@/api/app'
 export default {
     name: 'login',
     data() {
+        let query = localStorage.getItem('getRegister')
+        query = query ? JSON.parse(query) : {}
+        localStorage.removeItem('getRegister')
         return {
             groupId: this.$route.query.groupId,
             // codeDisable: true, // 验证码登录按钮状态
             countDownStatus: true, // 到计时状态
-            phoneNumber: null,
+            phoneNumber: query.phoneNumber ? query.phoneNumber : null,
             isRegister: 0, // 默认没有注册
-            code: null,
+            code: query.code ? query.code : null,
             codeText: '获取验证码',
             countDownTime: 1000 * 120, // 倒计时时间
             isClick: false,
-            agreeStatus: false
+            agreeStatus: query.agreeStatus ? query.agreeStatus : false
         }
     },
     mounted() {
@@ -60,10 +63,15 @@ export default {
             }, 100);
         },
         onToProtocol() {
+            localStorage.setItem('getRegister', JSON.stringify({
+                phoneNumber: this.phoneNumber,
+                code: this.code,
+                agreeStatus: this.agreeStatus
+            }))
             this.$router.push({
                 path: '/userProtocol',
                 query: {
-                    groupId: this.groupId
+                    groupId: this.groupId,
                 }
             })
         },

src/views/app/AppSetInfo.vue

@@ -20,7 +20,7 @@
 </template>
 <script>
 import MHeader from '@/components/MHeader'
-import {sendSms, userSetPassword, queryUserByPhone } from '@/api/app'
+import { userSetPassword } from '@/api/app'
 import { browser }  from '@/common/common'
 export default {
     name: 'register',
@@ -110,36 +110,6 @@ export default {
             // })
             
         },
-        onLogin() {
-            let params = {
-                clientId: 'student',
-                clientSecret: 'student',
-                phone: this.phoneNumber,
-                smsCode: this.code,
-                channel: 'H5'
-            }
-            if(this.isRegister == 0) {
-                params.isLessee = 'true'
-            }
-            registerAdd(params).then(sms => {
-                let s = sms.data
-                this.isClick = false
-                // 保存用户信息
-                if(s.code == 200) {
-                    let auth = s.data.authentication
-                    localStorage.setItem('userInfo', auth.token_type + ' ' + auth.access_token)
-                    
-                    this.$router.push({
-                        path: '/classDetail',
-                        query: {
-                            groupId: this.groupId
-                        }
-                    })
-                } else {
-                    this.$toast(s.msg)
-                }
-            })
-        },
         onFinished() { // 倒计时结束
             this.countDownStatus = true
             this.$refs.countdown.reset()

src/views/teacher/studyReportNew.vue

@@ -266,6 +266,7 @@
   </div>
 </template>
 <script>
+/* eslint-disable */
 import { subjectJson } from "@/utils/questionJson";
 import { browser } from "@/common/common";
 import { findTeacherClassGroupInfo, addStudyReport1 } from "@/api/teacher";