diff --git a/src/api/member.js b/src/api/member.js index 7405f15..86b45a3 100644 --- a/src/api/member.js +++ b/src/api/member.js @@ -145,6 +145,17 @@ class Member { static agent(data){ return server.post('/agent/register',data) } + /** + * 注册gc验证码 + * @param data {email,token} + */ + static sendGCode() { + return server.get(`/register/Graph_che`); + } + // 提币获取邮箱验证码 + static getWdcode(data){ + return server.get(`/user/wdcode`,{params:data}); + } } export default Member; diff --git a/src/api/server/index.js b/src/api/server/index.js index 66778de..0256d99 100644 --- a/src/api/server/index.js +++ b/src/api/server/index.js @@ -59,7 +59,7 @@ Object.assign(settings, { // api请求根地址 打包使用完整地址 调试使用本地服务器代理 避免跨域 // baseURL: process.env.NODE_ENV == 'production' ? 'http://qkladmin2.ruanmeng.top/api/' : '/api/', // baseURL: process.env.NODE_ENV == 'production' ? 'https://guanli.coin.amatak.net/api/' : '/api/', - baseURL: process.env.NODE_ENV == 'production' ? 'https://xmg.xusexchange.com/api/' : '/api/', + baseURL: process.env.NODE_ENV == 'production' ? 'https://xmg.xusexchange.com/api/' : 'https://mgg.cxisux.com/api/', // baseURL: 'https://aaccdd.kixcoin.org/api/' , // baseURL: 'https://guanli.coin.amatak.net/api/', // baseURL: 'https://api.hipc.world/', diff --git a/src/assets/img/bg/radial_bg.png b/src/assets/img/bg/radial_bg.png new file mode 100644 index 0000000..7e7ff17 Binary files /dev/null and b/src/assets/img/bg/radial_bg.png differ diff --git a/src/assets/img/fas fa-user-plus@3x.png b/src/assets/img/fas fa-user-plus@3x.png deleted file mode 100644 index 94f70b5..0000000 Binary files a/src/assets/img/fas fa-user-plus@3x.png and /dev/null differ diff --git a/src/assets/img/features/1.png b/src/assets/img/features/1.png index 44cb6af..543e9d1 100644 Binary files a/src/assets/img/features/1.png and b/src/assets/img/features/1.png differ diff --git a/src/assets/img/features/2.png b/src/assets/img/features/2.png index 1354f9b..9392b80 100644 Binary files a/src/assets/img/features/2.png and b/src/assets/img/features/2.png differ diff --git a/src/assets/img/features/3.png b/src/assets/img/features/3.png index 5ed1a54..f62e651 100644 Binary files a/src/assets/img/features/3.png and b/src/assets/img/features/3.png differ diff --git a/src/assets/img/features/4.png b/src/assets/img/features/4.png new file mode 100644 index 0000000..be076e1 Binary files /dev/null and b/src/assets/img/features/4.png differ diff --git a/src/assets/img/features/5.png b/src/assets/img/features/5.png new file mode 100644 index 0000000..e2a7415 Binary files /dev/null and b/src/assets/img/features/5.png differ diff --git a/src/assets/img/features/6.png b/src/assets/img/features/6.png index e2e8d2c..3c0e801 100644 Binary files a/src/assets/img/features/6.png and b/src/assets/img/features/6.png differ diff --git a/src/assets/img/features/7.png b/src/assets/img/features/7.png index e5733e0..7db2644 100644 Binary files a/src/assets/img/features/7.png and b/src/assets/img/features/7.png differ diff --git a/src/assets/img/features/8.png b/src/assets/img/features/8.png index 57abce8..2c6eb29 100644 Binary files a/src/assets/img/features/8.png and b/src/assets/img/features/8.png differ diff --git a/src/assets/img/features/9.png b/src/assets/img/features/9.png new file mode 100644 index 0000000..5a22cdd Binary files /dev/null and b/src/assets/img/features/9.png differ diff --git a/src/assets/img/features/stt.png b/src/assets/img/features/stt.png index 158db41..2022b21 100644 Binary files a/src/assets/img/features/stt.png and b/src/assets/img/features/stt.png differ diff --git a/src/assets/img/illustration_1.png b/src/assets/img/illustration_1.png index a414777..8728cf1 100644 Binary files a/src/assets/img/illustration_1.png and b/src/assets/img/illustration_1.png differ diff --git a/src/assets/img/illustration_2.png b/src/assets/img/illustration_2.png deleted file mode 100644 index 1c46379..0000000 Binary files a/src/assets/img/illustration_2.png and /dev/null differ diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue index c177341..994661b 100644 --- a/src/components/CommonFooter.vue +++ b/src/components/CommonFooter.vue @@ -328,7 +328,7 @@ export default { diff --git a/src/views/signUp/index.vue b/src/views/signUp/index.vue index 335bfe6..c52d94c 100644 --- a/src/views/signUp/index.vue +++ b/src/views/signUp/index.vue @@ -52,8 +52,13 @@ +
+ + + +
-
+
@@ -200,6 +205,8 @@ export default { smsCode: null, emailCode: null }, + Graph_che:'', // gc code image + gc_key:'', // tuxiangyanzheng key codes: new Array(6) }; @@ -255,6 +262,13 @@ export default { ); return } + // check gc code has fill + if(this.Graph_che==''){ + this.$message({ + type:"warning", + message:"input gc code pls.", + }) + } // 其他补充的验证 if (!this.isAgree) { // 没有同意条款 @@ -357,6 +371,23 @@ export default { window.frames["my-modal-body"].$captcha.sliderCaptcha("reset"); }, + // get gc code from api + gett_gc_code(){ + console.log("dddddd") + Member.sendGCode().then( (res) =>{ + this.gc_key = res.key + this.Graph_che = res.img + console.log("gc",res); + this.$message({ + message: `${type} ${this.$t("login.sendOK")}`, + type: "success", + duration : 2000, + }); + }).catch( err =>{ + console.log(err) + }); + }, + autofill($event) { let data = $event.clipboardData.getData("text/plain"), val; @@ -541,6 +572,9 @@ export default { window.md5 = md5; // 安全性验证成功时的回调函数 window.step2Register = this.step2; + + // bind get gc code + this.gett_gc_code(); } }; diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index fab2e9c..3105f1f 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -367,6 +367,19 @@
+ +
+ +
+ +
+
@@ -397,6 +410,7 @@ import InnerTransfer from "../components/inner-transfer.vue"; import Wallet from "@/api/wallet"; import Profile from "@/api/profile"; +import Member from "@/api/member"; import ClipboardJS from "clipboard"; import getCode from "./getCode"; import vueQr from "vue-qr"; @@ -444,7 +458,8 @@ export default { addressType: 2, // 默认提币类型 1 为 omni； 2 为 erc20, code_type: 1, code: '', - password:'' + password:'', + emailcode: '' }, withdrawFee: { @@ -463,7 +478,10 @@ export default { number:"", amount:"", images:"" - } + }, + getEmailCodeLock: false, + JStime: 0, + tiemr: null, }; }, @@ -484,6 +502,11 @@ export default { } } }, + computed : { + daojishi(){ + return '('+this.JStime + 's' + ')'; + } + }, methods: { //确认提交贝宝支付 paypalSbumit(){ @@ -656,6 +679,55 @@ export default { Profile.getUserInfo({}).then(res => { this.userInfo = res }); + }, + // 獲取邮箱验证码 + getEmailCode(){ + if(!this.withdraw.address){ + this.$message({ + message: this.$t('wallet.enterDrawAddress'), + // message: 'mlkdfdks', + // type: "warn", + duration : 2000, + }); + return; + } + if(!this.withdraw.amount){ + this.$message({ + message: this.$t('wallet.enterDrawNum'), + // type: "warn", + duration : 2000, + }); + return; + } + if(!this.withdraw.password){ + this.$message({ + message: this.$t('common.enterPwd'), + // type: "warn", + duration : 2000, + }); + return; + } + if(this.getEmailCodeLock){return}; + this.JStime = 300; + this.tiemr = setInterval(()=>{ + if(this.JStime===0){ + this.getEmailCodeLock = false; + clearInterval(this.tiemr); + return; + } + this.JStime--; + }, 1000) + this.getEmailCodeLock = true; + // let gdata = {bt:this.withdraw.addressType,baddr:this.withdraw.address,bnum:this.withdraw.amount} + let gdata = {bt:this.withdrawCoin,baddr:this.withdraw.address,bnum:this.withdraw.amount} + Member.getWdcode(gdata).then(res => { + // console.log(res, 11111) + this.$message({ + message: `${this.$t("login.sendOK")}`, + type: "success", + duration : 2000, + }); + }); } }, @@ -767,4 +839,9 @@ created() { .label{ font-size: 16px; } + .getCodeAA{ + border: 1px solid #444; + padding: 5px 10px; + border-radius: 30px; + }