Browse Source

weizhi

master
torsenli 2 years ago
parent
commit
edcc01572c
  1. 2
      config/index.js
  2. 8
      src/api/member.js
  3. 2
      src/api/server/index.js
  4. 6
      src/index.html
  5. 10
      src/utils/consts.js
  6. 2
      src/views/home/index.vue
  7. 6
      src/views/option/kline.vue
  8. 2
      src/views/profile/certification.vue
  9. 33
      src/views/signUp/index.vue

2
config/index.js

@ -24,7 +24,7 @@ module.exports = {
'/api': { '/api': {
// target: 'http://qkladmin2.ruanmeng.top/', // target: 'http://qkladmin2.ruanmeng.top/',
// target: 'https://guanli.coin.amatak.net/', // target: 'https://guanli.coin.amatak.net/',
target: 'https://xmg.xusexchange.com/', target: 'https://xmg.xuscoins.com/',
changeOrigin: true, changeOrigin: true,
// pathRewrite: { // pathRewrite: {
// // 请求时 将api替换成实际的apis等 // // 请求时 将api替换成实际的apis等

8
src/api/member.js

@ -26,6 +26,14 @@ class Member {
return server.post(`/register/sendEmailCode`, data); return server.post(`/register/sendEmailCode`, data);
} }
/**
* 注册gc验证码
* @param data {email,token}
*/
static sendGCode() {
return server.get(`/register/Graph_che`);
}
/** /**
* 获取国家区号 * 获取国家区号
* @param {object} data * @param {object} data

2
src/api/server/index.js

@ -59,7 +59,7 @@ Object.assign(settings, {
// api请求根地址 打包使用完整地址 调试使用本地服务器代理 避免跨域 // api请求根地址 打包使用完整地址 调试使用本地服务器代理 避免跨域
// baseURL: process.env.NODE_ENV == 'production' ? 'http://qkladmin2.ruanmeng.top/api/' : '/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://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.xuscoins.com/api/' : '/api/',
// baseURL: 'https://aaccdd.kixcoin.org/api/' , // baseURL: 'https://aaccdd.kixcoin.org/api/' ,
// baseURL: 'https://guanli.coin.amatak.net/api/', // baseURL: 'https://guanli.coin.amatak.net/api/',
// baseURL: 'https://api.hipc.world/', // baseURL: 'https://api.hipc.world/',

6
src/index.html

@ -68,13 +68,13 @@
<script src="/static/libs/jquery.mCustomScrollbar.js"></script> <script src="/static/libs/jquery.mCustomScrollbar.js"></script>
<script src="/static/js/custom.js"></script> <script src="/static/js/custom.js"></script>
<script src="/static/libs/skroll.min.js"></script> <script src="/static/libs/skroll.min.js"></script>
<script src="https://xmg.xusexchange.com/newlink/pako.min.js"></script> <script src="https://xmg.xuscoins.com/newlink/pako.min.js"></script>
<script> <script>
window.custom = "dark"; // 默认主题 window.custom = "dark"; // 默认主题
window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://xmg.xusexchange.com/api/sliderVerify' : 'https://xmg.xusexchange.com/api/sliderVerify' %>"; window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://xmg.xuscoins.com/api/sliderVerify' : 'https://xmg.xuscoins.com/api/sliderVerify' %>";
// window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'http://qkladmin2.ruanmeng.top/api/sliderVerify' : 'http://qkladmin2.ruanmeng.top/api/sliderVerify' %>"; // window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'http://qkladmin2.ruanmeng.top/api/sliderVerify' : 'http://qkladmin2.ruanmeng.top/api/sliderVerify' %>";
// window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'wss://guanli.coin.amatak.net/ws1' : 'wss://guanli.coin.amatak.net/ws1' %>"; // window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'wss://guanli.coin.amatak.net/ws1' : 'wss://guanli.coin.amatak.net/ws1' %>";
window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://xmg.xusexchange.com/api' : 'https://xmg.xusexchange.com/api' %>"; window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://xmg.xuscoins.com/api' : 'https://xmg.xuscoins.com/api' %>";
// window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'ws://qkladmin2.ruanmeng.top:2346' : 'ws://qkladmin2.ruanmeng.top:2346' %>"; // window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'ws://qkladmin2.ruanmeng.top:2346' : 'ws://qkladmin2.ruanmeng.top:2346' %>";

10
src/utils/consts.js

@ -15,18 +15,18 @@ export default {
FAIL : 2, FAIL : 2,
} }
}, },
mobileUrl:'https://xmg.xusexchange.com', mobileUrl:'https://app.xuscoins.com',
Server: { Server: {
Path: { Path: {
// API: isProduct ? `http://qkladmin2.ruanmeng.top/api/` : `/api/`, // API: isProduct ? `http://qkladmin2.ruanmeng.top/api/` : `/api/`,
BASE:isProduct?`https://xmg.xusexchange.com`:`https://xmg.xusexchange.com`, BASE:isProduct?`https://xmg.xuscoins.com`:`https://xmg.xuscoins.com`,
API: isProduct ? `https://xmg.xusexchange.com/api/` : `/api/`, API: isProduct ? `https://xmg.xuscoins.com/api/` : `/api/`,
// WS: isProduct ? `ws://qkladmin2.ruanmeng.top:2346` : `ws://qkladmin2.ruanmeng.top:2346`, // WS: isProduct ? `ws://qkladmin2.ruanmeng.top:2346` : `ws://qkladmin2.ruanmeng.top:2346`,
// WS1: isProduct ? `ws://qkladmin2.ruanmeng.top:2348` : `ws://qkladmin2.ruanmeng.top:2348`, // WS1: isProduct ? `ws://qkladmin2.ruanmeng.top:2348` : `ws://qkladmin2.ruanmeng.top:2348`,
// WS: isProduct ? `wss://guanli.coin.amatak.net/ws1` : `wss://guanli.coin.amatak.net/ws1`, // WS: isProduct ? `wss://guanli.coin.amatak.net/ws1` : `wss://guanli.coin.amatak.net/ws1`,
WS: isProduct ? `wss://xmg.xusexchange.com/ws1` : `wss://xmg.xusexchange.com/ws1`, WS: isProduct ? `wss://xmg.xuscoins.com/ws1` : `wss://xmg.xuscoins.com/ws1`,
// WS1: isProduct ? `wss://guanli.coin.amatak.net/ws2` : `wss://guanli.coin.amatak.net/ws2`, // WS1: isProduct ? `wss://guanli.coin.amatak.net/ws2` : `wss://guanli.coin.amatak.net/ws2`,
WS1: isProduct ? `wss://xmg.xusexchange.com/ws2` : `wss://xmg.xusexchange.com/ws2`, WS1: isProduct ? `wss://xmg.xuscoins.com/ws2` : `wss://xmg.xuscoins.com/ws2`,
} }
} }
}; };

2
src/views/home/index.vue

@ -819,7 +819,7 @@ export default {
return Boolean(localStorage.token); return Boolean(localStorage.token);
}, },
downloadLink() { downloadLink() {
return "https://xmg.xusexchange.com/download"; return "https://xmg.xuscoins.com/download";
}, },
// //
featuresList() { featuresList() {

6
src/views/option/kline.vue

@ -454,7 +454,7 @@ methods: {
widget.chart().createStudy( widget.chart().createStudy(
"Moving Average", "Moving Average",
false, false,
true, false,
[5, "close", 0], [5, "close", 0],
null, null,
{ {
@ -464,7 +464,7 @@ methods: {
widget.chart().createStudy( widget.chart().createStudy(
"Moving Average", "Moving Average",
false, false,
true, false,
[10, "close", 0], [10, "close", 0],
null, null,
{ {
@ -474,7 +474,7 @@ methods: {
widget.chart().createStudy( widget.chart().createStudy(
"Moving Average", "Moving Average",
false, false,
true, false,
[30, "close", 0], [30, "close", 0],
null, null,
{ {

2
src/views/profile/certification.vue

@ -106,7 +106,7 @@
<!-- <div class="input-group mb-3"> --> <!-- <div class="input-group mb-3"> -->
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>{{$t('profile.SelectAreaCode')}}*</label> <label>{{$t('profile.SelectAreaCode')}}*</label>
<el-select v-model="form.country_id" filterable placeholder="请选择" > <el-select v-model="form.country_id" filterable placeholder="Please choose" >
<el-option <el-option
v-for="item in countryList" v-for="item in countryList"
:key="item.id" :key="item.id"

33
src/views/signUp/index.vue

@ -52,6 +52,11 @@
<input :type="repwdType" id="repassword" v-model="user.repassword" required :placeholder="$t('login.confirm-password')" class="form-control" /> <input :type="repwdType" id="repassword" v-model="user.repassword" required :placeholder="$t('login.confirm-password')" class="form-control" />
<label @click="showType('repwdType')"></label> <label @click="showType('repwdType')"></label>
</div> </div>
<div class="form-group row password">
<!-- 使用data-type指定额外的类型验证 -->
<input :type="txtType" id="gccode" v-model="user.gc_code" required placeholder="GraphicalVerification" class="form-control col-6" />
<img class="col-6" :src="Graph_che" @click="gett_gc_code">
</div>
<div class="form-group row" v-if="0"> <div class="form-group row" v-if="0">
<input type="text" class="form-control" :disabled="$route.query.invite_code?true:false" v-model="user.parentCode" :placeholder="`${$t('login.referrer')}`" /> <input type="text" class="form-control" :disabled="$route.query.invite_code?true:false" v-model="user.parentCode" :placeholder="`${$t('login.referrer')}`" />
@ -164,6 +169,7 @@ export default {
current: 0, current: 0,
pwdType: "password", pwdType: "password",
repwdType: "password", repwdType: "password",
txtType:"text",
step: 1, step: 1,
registerType:1, registerType:1,
@ -176,7 +182,8 @@ export default {
repassword: "", repassword: "",
country_id: "", // id country_id: "", // id
phone: "", phone: "",
parentCode: "" parentCode: "",
gc_code:'',
}, },
isAgree: false, isAgree: false,
@ -200,6 +207,8 @@ export default {
smsCode: null, smsCode: null,
emailCode: null emailCode: null
}, },
Graph_che:'', // gc code image
gc_key:'', // tuxiangyanzheng key
codes: new Array(6) codes: new Array(6)
}; };
@ -255,6 +264,13 @@ export default {
); );
return return
} }
// check gc code has fill
if(this.Graph_che==''){
this.$message({
type:"warning",
message:"input gc code pls.",
})
}
// //
if (!this.isAgree) { if (!this.isAgree) {
// //
@ -357,6 +373,18 @@ export default {
window.frames["my-modal-body"].$captcha.sliderCaptcha("reset"); 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)
}).catch( err =>{
console.log(err)
});
},
autofill($event) { autofill($event) {
let data = $event.clipboardData.getData("text/plain"), let data = $event.clipboardData.getData("text/plain"),
val; val;
@ -541,6 +569,9 @@ export default {
window.md5 = md5; window.md5 = md5;
// //
window.step2Register = this.step2; window.step2Register = this.step2;
// bind get gc code
this.gett_gc_code();
} }
}; };
</script> </script>

Loading…
Cancel
Save