Merge branch 'jingjie' of gitlab.maxrocky.com:html/poolin_app into zhanghui

src/components/reg/index.vue

@@ -13,6 +13,9 @@
             <el-form-item prop="email" label="" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur,change' }]">
               <el-input v-model="regForm.email" placeholder="输入邮箱"><i slot="prefix" class="iconfont icon-email"></i></el-input>
             </el-form-item>
+            <captcha>
+
+            </captcha>
             <el-form-item>
               <div class="btn-group full mt100">
                 <el-button type="primary" round @click="submitForm('regForm')">提交</el-button>
@@ -29,6 +32,7 @@
   </div>
 </template>
 <script>
+  import captcha from '@/components/common/captcha'
 export default {
   name: 'rega',
   data() {
@@ -39,6 +43,9 @@ export default {
       step: 1
     }
   },
+    components:{
+        captcha,
+    },
   mounted() {
 
   },
@@ -59,7 +66,8 @@ export default {
     goLogin() {
       this.$router.replace("/login")
     }
-  }
+  },
+
 }
 
 </script>

src/config/index.js

+const api ={
+    api: {
+        // 邮箱注册api
+        'post-register-email-start': '/register/email/start',
+        'post-register-email-verify-code': '/register/email/verify-code',
+        'post-register-email-password': '/register/email/password',
+
+        // 手机注册api
+        'post-register-mobile-start': '/register/mobile/start',
+        'post-register-mobile-verify-code': '/register/mobile/verify-code',
+        'post-register-mobile-password': '/register/mobile/password',
+
+        // 登录
+        'post-login-start': '/login/start',
+        'post-login-mobile': '/login/start/mobile',
+        'post-login-password': '/login/password',
+        'post-login-totp': '/login/totp',
+        'post-login-code': '/login/code',
+
+        // 重置密码
+        'post-reset-start': '/reset/start',
+        'post-reset-send-code': '/reset/send-code',
+        'post-reset-verify': '/reset/verify',
+        'post-reset-password': '/reset/password',
+
+        // 登出
+        'get-logout-do': '/logout/do',
+
+        // 获取用户信息
+        'get-userinfo': '/userinfo',
+        'get-captcha' : '/captcha'
+
+    }
+}
+
+const config = {
+    base:{
+        domain:'https://management.poolin.com',
+    },
+    get_api:function (key) {
+        // domain=window.config.baseUrl
+        var apiPrefix='/auth/api'
+        return this.base.domain + apiPrefix + api.api[key]
+    }
+}
+
+export default config;