diff --git a/api/member.js b/api/member.js
index 26724bd..0bdcc5a 100644
--- a/api/member.js
+++ b/api/member.js
@@ -4,14 +4,14 @@ class Member {
/**
* 注册滑块验证码
- * @param {object} data
+ * @param {object} data
*/
static sliderVerify(data) {
return server.post(`/sliderVerify`, data);
}
/**
- * 注册发送手机验证码
+ * 注册发送手机验证码
* @param data {phone,country_code,token}
*/
static sendSmsCode(data) {
@@ -26,6 +26,14 @@ class Member {
return server.post(`/register/sendEmailCode`, data);
}
+ /**
+ * 获取图形验证码
+ * @param data {email,token}
+ */
+ static Graph_che() {
+ return server.get(`/register/Graph_che`);
+ }
+
/**
* 获取国家区号
* @param {object} data
@@ -36,7 +44,7 @@ class Member {
/**
* 注册提交
- * @param {object} data
+ * @param {object} data
*/
static register(data) {
return server.post(`/user/register`, data);
@@ -44,7 +52,7 @@ class Member {
/**
* 登陆发送短信验证码
- * @param {object} data
+ * @param {object} data
*/
static sendSmsCodeBeforeLogin(data) {
return server.post(`/login/sendSmsCodeBeforeLogin`, data)
@@ -52,7 +60,7 @@ class Member {
/**
* 登陆发送邮箱验证码
- * @param {object} data
+ * @param {object} data
*/
static sendEmailCodeBeforeLogin(data) {
return server.post(`/login/sendEmailCodeBeforeLogin`, data);
@@ -60,7 +68,7 @@ class Member {
/**
* 登陆初始化验证
- * @param {object} data
+ * @param {object} data
*/
static login(data) {
return server.post(`/user/login`, data);
@@ -68,7 +76,7 @@ class Member {
/**
* 登陆二次验证
- * @param {object} data
+ * @param {object} data
*/
static loginConfirm(data,{loading}) {
return server.post(`/user/loginConfirm`, data,{loading})
@@ -85,7 +93,7 @@ class Member {
* @param {FormData} data
*/
static uploadImage(data) {
-
+
return server.uploadFile(`/uploadImage`,data);
}
diff --git a/app.js b/app.js
index 9369506..59bc298 100644
--- a/app.js
+++ b/app.js
@@ -3,14 +3,14 @@ let config = {};
if (process.env.NODE_ENV == 'production'||true) { //生产环境
config = {
// ajax地址
- baseUrl: 'https://xmg.xusexchange.com/',
+ baseUrl: 'https://xmg.xuscoins.com/',
// 图片地址 （暂时无用）
- imgUrl: 'https://xmg.xusexchange.com/storage',
+ imgUrl: 'https://xmg.xuscoins.com/storage',
// socket地址
- socketUrl: 'wss://xmg.xusexchange.com/ws1',
- socketUrl1: 'wss://xmg.xusexchange.com/ws2',
+ socketUrl: 'wss://xmg.xuscoins.com/ws1',
+ socketUrl1: 'wss://xmg.xuscoins.com/ws2',
// pc端地址
- pcUrl:'https://xmg.xusexchange.com/',
+ pcUrl:'https://xmg.xuscoins.com/',
// app名称
appName: 'XUSCoins',
// 版本
diff --git a/layout/vCode.vue b/layout/vCode.vue
index b7574fe..584779a 100644
--- a/layout/vCode.vue
+++ b/layout/vCode.vue
@@ -75,11 +75,19 @@ export default {
if (this.load) return;
this.inSend = true;
serve.post(this.url, this.data)
- .then(() => {
- this.inSend = false;
- this.load = true;
- this.countDown();
- this.$toast(this.$t('common.sendSuccess'));
+ .then((res) => {
+ // ss
+ if(res.code=='4001'){
+ this.inSend = false
+ this.$toast(res.message);
+ }else{
+ this.inSend = false;
+ this.load = true;
+ this.countDown();
+ this.$toast(this.$t('common.sendSuccess'));
+ }
+
+
})
.catch(() => {
this.inSend = false;
@@ -99,4 +107,4 @@ export default {
},
},
};
-
\ No newline at end of file
+
diff --git a/pages/reg/index.vue b/pages/reg/index.vue
index c9a4870..e4a8a7d 100644
--- a/pages/reg/index.vue
+++ b/pages/reg/index.vue
@@ -70,6 +70,26 @@
+
+
+ Captcha
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
{{$t('reg.a6')}}
@@ -89,6 +109,8 @@
url="/register/sendEmailCode"
:data="{
email:form.account,
+ gc_code: form.gr_code,
+ gc_key: gc_key,
type:1
}"
v-show="form.type==2"
@@ -159,7 +181,11 @@ export default {
password: "",
password_confirmation: "",
invite_code: "",
+ gr_code: "",
},
+ captcha: '',
+ Graph_che:'',
+ gc_key:'', // tuxiangyanzheng key
check: false,
agreement: {},
country_code:'',
@@ -231,7 +257,28 @@ export default {
this.$toast(this.$t('reg.c5'));
});
},
- //注册完成后登录
+
+ //获取图形验证码
+ refreshCaptcha() {
+ axios.get('/register/Graph_che')
+ .then(response => {
+ // 重新加载验证码图片
+ })
+ .catch(error => {
+ console.log(error);
+ });
+ },
+
+ gett_gc_code(){
+ Member.Graph_che().then((res)=>{
+ console.log("gc",res.data.img)
+ this.Graph_che = res.data.img;
+ this.gc_key= res.data.key;
+ });
+ //this.Graph_che = gc
+
+ },
+ //注册完成后登录,
login(){
let data={type: 2,account:this.form.account,password: this.form.password}
Member.login(this.form)
@@ -256,7 +303,7 @@ export default {
},
},
mounted() {
-
+ this.gett_gc_code();
},
onLoad(query){
this.query = query
diff --git a/static/tradingview.html b/static/tradingview.html
index 30a9669..f91a5ae 100644
--- a/static/tradingview.html
+++ b/static/tradingview.html
@@ -22,9 +22,9 @@
-
-
-
+
+
+