打包页面

dist/css/ApplyList.4b9273de.css → dist/css/ApplyList.fcc59f51.css

@@ -1 +1 @@
-.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.mbutton[data-v-a93b9764]{margin:.35rem 0 .2rem}.van-button--primary[data-v-a93b9764]{background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}.applyList[data-v-86984006]{height:100vh;overflow-y:auto;overflow-x:hidden;background-color:#f3f4f8}.applyList[data-v-86984006] .van-form{padding-top:.15rem}.applyList[data-v-86984006] .van-cell{padding:.13rem .16rem}.applyList[data-v-86984006] .van-field__label{font-size:.17rem;color:#333;width:1.15rem}.applyList[data-v-86984006] .van-field__body{font-size:.16rem}.applyList[data-v-86984006] .van-field__control{color:#999}.applyList .codeText[data-v-86984006]{font-size:.16rem;color:#2dc7aa}
+.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.mbutton[data-v-26f1a8ea]{margin:.35rem 0 .2rem}.van-button--primary[data-v-26f1a8ea]{background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}.applyList[data-v-86984006]{height:100vh;overflow-y:auto;overflow-x:hidden;background-color:#f3f4f8}.applyList[data-v-86984006] .van-form{padding-top:.15rem}.applyList[data-v-86984006] .van-cell{padding:.13rem .16rem}.applyList[data-v-86984006] .van-field__label{font-size:.17rem;color:#333;width:1.15rem}.applyList[data-v-86984006] .van-field__body{font-size:.16rem}.applyList[data-v-86984006] .van-field__control{color:#999}.applyList .codeText[data-v-86984006]{font-size:.16rem;color:#2dc7aa}

dist/index.html

@@ -23,7 +23,7 @@
     <!-- <link rel="stylesheet" href="https://www.unpkg.com/vant@2.8.4/lib/index.css"> -->
     <script>!function(e,t){var n=t.documentElement,d=e.devicePixelRatio||1;function i(){var e=n.clientWidth/3.75;n.style.fontSize=e+"px"}if(function e(){t.body?t.body.style.fontSize="16px":t.addEventListener("DOMContentLoaded",e)}(),i(),e.addEventListener("resize",i),e.addEventListener("pageshow",function(e){e.persisted&&i()}),2<=d){var o=t.createElement("body"),a=t.createElement("div");a.style.border=".5px solid transparent",o.appendChild(a),n.appendChild(o),1===a.offsetHeight&&n.classList.add("hairlines"),n.removeChild(o)}}(window,document)</script>
     <!-- <script type="text/javascript" src="./adaPay_min.js"></script> -->
-  <link href="css/ApplyCertificate.36e5a9a7.css" rel="prefetch"><link href="css/ApplyList.4b9273de.css" rel="prefetch"><link href="css/ApplyNeed.6315f90b.css" rel="prefetch"><link href="css/LevelMusic.8974d57c.css" rel="prefetch"><link href="css/SignUpAccount.5ae636f1.css" rel="prefetch"><link href="css/SignUpBaseInfo.eb921ebf.css" rel="prefetch"><link href="css/SignUpCard.b5f150e9.css" rel="prefetch"><link href="css/SignUpCertificate.9ee4dba6.css" rel="prefetch"><link href="css/SignUpLevel.7b3fbd2c.css" rel="prefetch"><link href="css/SignUpPayment.c8dc8bd3.css" rel="prefetch"><link href="js/ApplyCertificate.afcd2534.js" rel="prefetch"><link href="js/ApplyList.b9992c53.js" rel="prefetch"><link href="js/ApplyNeed.5dc6a800.js" rel="prefetch"><link href="js/LevelMusic.e505fa59.js" rel="prefetch"><link href="js/SignUp.fe55d634.js" rel="prefetch"><link href="js/SignUpAccount.58c3b622.js" rel="prefetch"><link href="js/SignUpBaseInfo.7e40b3e1.js" rel="prefetch"><link href="js/SignUpCard.f8885e69.js" rel="prefetch"><link href="js/SignUpCertificate.1081c46b.js" rel="prefetch"><link href="js/SignUpLevel.fa745474.js" rel="prefetch"><link href="js/SignUpPayment.a2e01aa0.js" rel="prefetch"><link href="app.b37a741f82c69399a657.js" rel="preload" as="script"><link href="css/app.16e19a78.css" rel="preload" as="style"><link href="css/chunk-vendors.bf7fc49d.css" rel="preload" as="style"><link href="js/chunk-vendors.8e0757dd.js" rel="preload" as="script"><link href="css/chunk-vendors.bf7fc49d.css" rel="stylesheet"><link href="css/app.16e19a78.css" rel="stylesheet"></head>
+  <link href="css/ApplyCertificate.36e5a9a7.css" rel="prefetch"><link href="css/ApplyList.fcc59f51.css" rel="prefetch"><link href="css/ApplyNeed.6315f90b.css" rel="prefetch"><link href="css/LevelMusic.8974d57c.css" rel="prefetch"><link href="css/SignUpAccount.fee3cf9c.css" rel="prefetch"><link href="css/SignUpBaseInfo.7ff502df.css" rel="prefetch"><link href="css/SignUpCard.b5f150e9.css" rel="prefetch"><link href="css/SignUpCertificate.47bd1ae0.css" rel="prefetch"><link href="css/SignUpLevel.7b3fbd2c.css" rel="prefetch"><link href="css/SignUpPayment.c8dc8bd3.css" rel="prefetch"><link href="js/ApplyCertificate.afcd2534.js" rel="prefetch"><link href="js/ApplyList.4ab49e1d.js" rel="prefetch"><link href="js/ApplyNeed.5dc6a800.js" rel="prefetch"><link href="js/LevelMusic.e505fa59.js" rel="prefetch"><link href="js/SignUp.3a6f50cd.js" rel="prefetch"><link href="js/SignUpAccount.a132e366.js" rel="prefetch"><link href="js/SignUpBaseInfo.7f1e3029.js" rel="prefetch"><link href="js/SignUpCard.f8885e69.js" rel="prefetch"><link href="js/SignUpCertificate.251896da.js" rel="prefetch"><link href="js/SignUpLevel.fa745474.js" rel="prefetch"><link href="js/SignUpPayment.a2e01aa0.js" rel="prefetch"><link href="app.d4be4fa3b10b6301cde2.js" rel="preload" as="script"><link href="css/app.16e19a78.css" rel="preload" as="style"><link href="css/chunk-vendors.bf7fc49d.css" rel="preload" as="style"><link href="js/chunk-vendors.8e0757dd.js" rel="preload" as="script"><link href="css/chunk-vendors.bf7fc49d.css" rel="stylesheet"><link href="css/app.16e19a78.css" rel="stylesheet"></head>
   <body>
     <div id="app"></div>
     <!-- <router-view id="app"></router-view> -->
@@ -41,5 +41,5 @@
     <script src="https://www.unpkg.com/vuex@3.0.1/dist/vuex.js"></script>
     <script src="https://www.unpkg.com/vue-router@3.0.3/dist/vue-router.js"></script>
     <script src="https://www.unpkg.com/vant@2.8.4/lib/index.js"></script> -->
-  <script type="text/javascript" src="js/chunk-vendors.8e0757dd.js"></script><script type="text/javascript" src="app.b37a741f82c69399a657.js"></script></body>
+  <script type="text/javascript" src="js/chunk-vendors.8e0757dd.js"></script><script type="text/javascript" src="app.d4be4fa3b10b6301cde2.js"></script></body>
 </html>

src/common/axios.js

@@ -2,8 +2,12 @@
 /* eslint-disable */
 import axios from "axios"
 // import router from '../router/index'
-import { browser }  from '@/utils/common'
-import { Toast } from 'vant'
+import {
+  browser
+} from '@/utils/common'
+import {
+  Toast
+} from 'vant'
 
 // Full config:  https://github.com/axios/axios#request-config
 // axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
@@ -11,42 +15,35 @@ import { Toast } from 'vant'
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
 
 let config = {
-    // baseURL: process.env.baseURL || process.env.apiUrl || ""
-    // timeout: 60 * 1000, // Timeout
-    // withCredentials: true, // Check cross-site Access-Control
-    // transformRequest: [function(data) {
-    //     console.log(data)
-    //     if(!data.qStringify) {
-    //       data = qs.stringify({
-    //           ...data
-    //       })
-    //     }
-    //     return data
-    // }]
+  // baseURL: process.env.baseURL || process.env.apiUrl || ""
+  // timeout: 60 * 1000, // Timeout
+  // withCredentials: true, // Check cross-site Access-Control
+  // transformRequest: [function(data) {
+  //     console.log(data)
+  //     if(!data.qStringify) {
+  //       data = qs.stringify({
+  //           ...data
+  //       })
+  //     }
+  //     return data
+  // }]
 
 };
 
 const _axios = axios.create(config);
 
 _axios.interceptors.request.use(
-  function(config) {
+  function (config) {
     // Do something before request is sent
     // 判断用户是否登录
-    if(browser().android || browser().iPhone) { // app里面
-      let userInfo = localStorage.getItem('Authorization')
-      if(userInfo) {
-        config.headers['Authorization'] = userInfo
-      }
-    } else { // 网页里面
-      let auth = localStorage.getItem('userInfo')
-      if(auth) {
-        config.headers['Authorization'] = auth
-      }
+    let userInfo = localStorage.getItem('Authorization')
+    if (userInfo) {
+      config.headers['Authorization'] = userInfo
     }
     // config.headers['Authorization'] ='bearer 8ffb419c-0d24-46b8-8faf-135ff24fa1d9'
     return config;
   },
-  function(error) {
+  function (error) {
     Toast.clear()
     Toast('网络错误')
     // Do something with request error
@@ -56,22 +53,26 @@ _axios.interceptors.request.use(
 
 // Add a response interceptor
 _axios.interceptors.response.use(
-  function(response) {
+  function (response) {
     // Do something with response data
-    if(response.data.code == 403 || response.data.code == 403) {
+    if (response.data.code == 403 || response.data.code == 403) {
       window.localStorage.removeItem('userInfo') // 删除用户信息
       window.localStorage.removeItem('Authorization') // 删除用户信息
-      if(browser().android) {
-        DAYA.postMessage(JSON.stringify({api: 'login'}))
-      } else if(browser().iPhone) {
-        window.webkit.messageHandlers.DAYA.postMessage(JSON.stringify({api: 'login'}))
+      if (browser().android) {
+        DAYA.postMessage(JSON.stringify({
+          api: 'login'
+        }))
+      } else if (browser().iPhone) {
+        window.webkit.messageHandlers.DAYA.postMessage(JSON.stringify({
+          api: 'login'
+        }))
       } else {
         // router.push('/login')
       }
     }
     return response;
   },
-  function(error) {
+  function (error) {
     Toast.clear()
     Toast('网络错误')
     // Do something with response error
@@ -97,4 +98,4 @@ _axios.interceptors.response.use(
 // };
 
 // Vue.use(Plugin)
-export default _axios
+export default _axios

src/components/MButton.vue

@@ -8,7 +8,8 @@
 export default {
     name: "mbutton",
     props: {
-        text: String
+        text: String,
+        disabled: Boolean
     },
     data() {
         return {}

src/views/signup/SignUp.js

@@ -43,4 +43,13 @@ export function smsLogin(data) {
         method: 'post',
         data: qs.stringify(data)
     })
+}
+
+// 检查手机号
+export function queryUserByPhone (data) {
+    return axios({
+        url: apiPrefix + '/user/noAuth/queryUserByPhone',
+        method: 'get',
+        params: data
+    })
 }

src/views/signup/SignUpAccount.vue

@@ -33,19 +33,21 @@ import MButton from '@/components/MButton'
 // import { browser } from '@/common/common'
 import { patternPhone } from '@/utils/validateRules'
 import setLoading from '@/utils/loading'
-import { sendSms } from './SignUp'
+import { sendSms, smsLogin, queryUserByPhone } from './SignUp'
 export default {
     name: 'signUpAccount',
 	components: { MHeader, MStep, MButton },
     data () {
+        const query = this.$route.query
         return {
+            organId: query.organId,
             patternPhone: patternPhone,
             form: {
                 phone: null,
                 code: null,
             },
             countDownStatus: true, // 到计时状态
-            countDownTime: 1000 * 10 // 倒计时时间
+            countDownTime: 1000 * 120 // 倒计时时间
         }
     },
     mounted() {
@@ -73,23 +75,70 @@ export default {
                 return
             }
             try {
-                const resultSend = await sendSms({ mobile: this.phoneNumber })
+                const resultSend = await sendSms({ mobile: this.form.phone })
                 const result = resultSend.data
                 if(result.code === 200) {
                     this.countDownStatus = false
                     this.$refs.countdown.start() // 倒计时开始
+                    setLoading(false)
                 } else {
                     this.$toast(result.msg)
                 }
             } catch (error) {
                 //
+                setLoading(false)
             }
-            setLoading(false)
         },
         onCountDownFinished() { // 倒计时结束
             this.countDownStatus = true
             this.$refs.countdown.reset()
         },
+        async onCheckPhone() { // 检查手机号是否存在
+            setLoading(true)
+            try {
+                let form = this.form
+                let params = {
+                    mobile: form.phone
+                }
+                const code = await queryUserByPhone(params)
+                const result = code.data
+                if(result.code === 200) {
+                    // 1 为已注册，0为未注册
+                    this.onLogin(result.data)
+                } else {
+                    this.$toast(result.msg)
+                }
+            } catch(error) {
+                setLoading(false)
+            }
+        },
+        async onLogin(status) { // 登录
+            const form = this.form
+            let params = {
+                clientId: 'student',
+                clientSecret: 'student',
+                phone: form.phone,
+                smsCode: form.code,
+                organId: this.organId
+            }
+            if(status === 0) { // 不为空是为注册
+                params.registerFlag = 'true'
+            }
+            const login = await smsLogin(params)
+            const result = login.data
+            if(result.code === 200) {
+                let auth = result.data.authentication
+                localStorage.setItem('Authorization', auth.token_type + ' ' + auth.access_token)
+                this.$router.push({
+                    path: "/signUpBaseInfo",
+                    query: {
+                        organId: this.organId
+                    }
+                })
+            } else {
+                this.$toast(result.msg)
+            }
+        },
         onSubmit() {
             const form = this.form
             if(!this.checkPhone(form.phone)) { // 手机号验证
@@ -99,10 +148,9 @@ export default {
                 this.$toast('请输入验证码')
                 return
             }
-
-            this.$router.push({
-                path: '/signUpBaseInfo'
-            })
+            // 验证码
+            this.onCheckPhone()
+            
         },
         checkPhone(phoneNumber) {
             let result = true