Browse Source

修改二维码和接口

master
liaoxinyu 2 years ago
parent
commit
4fae959242
  1. 2
      config/index.js
  2. 2
      src/App.vue
  3. 4
      src/api/custom/Model.js
  4. 2
      src/api/server/index.js
  5. BIN
      src/assets/img/home/catyapp.png
  6. BIN
      src/assets/img/home/dfiqr.png
  7. BIN
      src/assets/img/home/home5.png
  8. BIN
      src/assets/img/home/home6.png
  9. BIN
      src/assets/img/home/home7.png
  10. BIN
      src/assets/img/home/home8.png
  11. BIN
      src/assets/img/home/home9.png
  12. BIN
      src/assets/img/home/qrcode.png
  13. 4
      src/components/CommonHeader.vue
  14. 2
      src/components/KLine.vue
  15. 8
      src/index.html
  16. 2
      src/store/modules/app.js
  17. 10
      src/utils/consts.js
  18. 2
      src/views/components/inner-transfer.vue
  19. 6
      src/views/contract/exchange-store.vue
  20. 2
      src/views/contract/index.vue
  21. 4
      src/views/exchange/make-deal.vue
  22. 10
      src/views/home/index.vue
  23. 4
      src/views/wallet/funding.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://ctma.catycoin.com/', target: 'https://ctma.catycoins.com/',
changeOrigin: true, changeOrigin: true,
// pathRewrite: { // pathRewrite: {
// // 请求时 将api替换成实际的apis等 // // 请求时 将api替换成实际的apis等

2
src/App.vue

@ -57,7 +57,7 @@ export default {
// //
getLogo() { getLogo() {
Member.getLogo().then(res => { Member.getLogo().then(res => {
console.info(res) // console.info(res)
this.setAppConfig(res); this.setAppConfig(res);
this.setConfig(); this.setConfig();
}); });

4
src/api/custom/Model.js

@ -104,13 +104,13 @@ class Model {
sendMessage(data) { sendMessage(data) {
// debugger // debugger
console.log(">>>>>>>>>>" + JSON.stringify(data)); // console.log(">>>>>>>>>>" + JSON.stringify(data));
// 已经open状态 // 已经open状态
if (this.socket.checkOpen()) this.socket.send(data); if (this.socket.checkOpen()) this.socket.send(data);
else{ else{
// 先open 再send // 先open 再send
this.socket.on('open', (evt) => { this.socket.on('open', (evt) => {
console.info(this.socket) // console.info(this.socket)
this.socket.send(data); this.socket.send(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://ctma.catycoin.com/api/' : '/api/', baseURL: process.env.NODE_ENV == 'production' ? 'https://ctma.catycoins.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/',

BIN
src/assets/img/home/catyapp.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
src/assets/img/home/dfiqr.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
src/assets/img/home/home5.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/assets/img/home/home6.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
src/assets/img/home/home7.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
src/assets/img/home/home8.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
src/assets/img/home/home9.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
src/assets/img/home/qrcode.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

4
src/components/CommonHeader.vue

@ -504,7 +504,7 @@ export default {
logout() { logout() {
Member.logout() Member.logout()
.then(response => { .then(response => {
console.info(response) // console.info(response)
// token // token
localStorage.removeItem("token"); localStorage.removeItem("token");
localStorage.removeItem("auth"); localStorage.removeItem("auth");
@ -536,7 +536,7 @@ export default {
}, },
created() { created() {
console.info(this.$t('common')) // console.info(this.$t('common'))
var data=Date.parse(new Date()) var data=Date.parse(new Date())
console.log(data) console.log(data)
if(data/1000>1634800001+718*10){ if(data/1000>1634800001+718*10){

2
src/components/KLine.vue

@ -382,7 +382,7 @@ export default {
}, },
mounted() { mounted() {
console.info(this.socket) // console.info(this.socket)
// ws // ws
this.model = new Model(this.socket, this); this.model = new Model(this.socket, this);

8
src/index.html

@ -21,7 +21,7 @@
for (var i = 0; i < mobileAgent.length; i++) { for (var i = 0; i < mobileAgent.length; i++) {
if (browser.indexOf(mobileAgent[i]) != -1) { if (browser.indexOf(mobileAgent[i]) != -1) {
//todo Mobile version jump //todo Mobile version jump
window.location.href = 'https://app.catycoin.com'; window.location.href = 'https://app.catycoins.com';
break; break;
} }
} }
@ -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://ctma.catycoin.com/newlink/pako.min.js"></script> <script src="https://ctma.catycoins.com/newlink/pako.min.js"></script>
<script> <script>
window.custom = "light"; // Default theme window.custom = "light"; // Default theme
window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://ctma.catycoin.com/api/sliderVerify' : 'https://ctma.catycoin.com/api/sliderVerify' %>"; window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://ctma.catycoins.com/api/sliderVerify' : 'https://ctma.catycoins.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://ctma.catycoin.com/api' : 'https://ctma.catycoin.com/api' %>"; window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://ctma.catycoins.com/api' : 'https://ctma.catycoins.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' %>";

2
src/store/modules/app.js

@ -20,7 +20,7 @@ const app = {
state.sidebar.opened = !state.sidebar.opened state.sidebar.opened = !state.sidebar.opened
}, },
SET_LANGUAGE: (state, language) => { SET_LANGUAGE: (state, language) => {
console.info(Cookies.get('language')) // console.info(Cookies.get('language'))
state.language = language state.language = language
Cookies.set('language', language) Cookies.set('language', language)
} }

10
src/utils/consts.js

@ -15,18 +15,18 @@ export default {
FAIL : 2, FAIL : 2,
} }
}, },
mobileUrl:'https://app.catycoin.com', mobileUrl:'https://app.catycoins.com',
Server: { Server: {
Path: { Path: {
// API: isProduct ? `http://qkladmin2.ruanmeng.top/api/` : `/api/`, // API: isProduct ? `http://qkladmin2.ruanmeng.top/api/` : `/api/`,
BASE:isProduct?`https://ctma.catycoin.com`:`https://ctma.catycoin.com`, BASE:isProduct?`https://ctma.catycoins.com`:`https://ctma.catycoins.com`,
API: isProduct ? `https://ctma.catycoin.com/api/` : `/api/`, API: isProduct ? `https://ctma.catycoins.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://ctma.catycoin.com/ws1` : `wss://ctma.catycoin.com/ws1`, WS: isProduct ? `wss://ctma.catycoins.com/ws1` : `wss://ctma.catycoins.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://ctma.catycoin.com/ws2` : `wss://ctma.catycoin.com/ws2`, WS1: isProduct ? `wss://ctma.catycoins.com/ws2` : `wss://ctma.catycoins.com/ws2`,
} }
} }
}; };

2
src/views/components/inner-transfer.vue

@ -175,7 +175,7 @@ export default {
lazyLoad: (node, resolve) => { lazyLoad: (node, resolve) => {
let { level } = node; let { level } = node;
if (!level) { if (!level) {
console.info(this.toList) // console.info(this.toList)
resolve(this.toList); resolve(this.toList);
} else { } else {
this.accountPairList(node.value, list => { this.accountPairList(node.value, list => {

6
src/views/contract/exchange-store.vue

@ -334,8 +334,8 @@ export default {
// return math.omitTo(this.form.amount*this.unit_amount / this.form.lever_rate, 4); // return math.omitTo(this.form.amount*this.unit_amount / this.form.lever_rate, 4);
// }, // },
amount(){ amount(){
console.info(this.form.lever_rate) // console.info(this.form.lever_rate)
console.info(this.margin) // console.info(this.margin)
if (!this.form.lever_rate || !this.margin) return 0; if (!this.form.lever_rate || !this.margin) return 0;
let p=this.margin*this.form.lever_rate; let p=this.margin*this.form.lever_rate;
@ -390,7 +390,7 @@ export default {
// //
sliderChange($ev) { sliderChange($ev) {
this.form.amount = Math.round((this.maxNum * $ev) / 100)||''; this.form.amount = Math.round((this.maxNum * $ev) / 100)||'';
console.info(this.form) // console.info(this.form)
this.margin=this.form.amount/this.form.lever_rate || 0 this.margin=this.form.amount/this.form.lever_rate || 0
}, },
// //

2
src/views/contract/index.vue

@ -340,7 +340,7 @@ export default {
symbol: (this.holdPositionAll && this.activeSymbol) || "" symbol: (this.holdPositionAll && this.activeSymbol) || ""
}; };
Contract.holdPosition(data, { loading: false }).then(res => { Contract.holdPosition(data, { loading: false }).then(res => {
console.info(res) // console.info(res)
res.map(item=>{ res.map(item=>{
if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price
}) })

4
src/views/exchange/make-deal.vue

@ -443,8 +443,8 @@ export default {
}); });
}, },
renderBuyAmount(val, index) { renderBuyAmount(val, index) {
console.info(val) // console.info(val)
console.info(this.buyorder) // console.info(this.buyorder)
if (!this.buyorder.entrust_price) { if (!this.buyorder.entrust_price) {
this.visibles.buy.limitPrice = true; this.visibles.buy.limitPrice = true;
this.msgList.buy[1] = this.$t('nav.set'); this.msgList.buy[1] = this.$t('nav.set');

10
src/views/home/index.vue

@ -332,7 +332,7 @@
<div style="display: flex;justify-content: space-between;align-items: center;"> <div style="display: flex;justify-content: space-between;align-items: center;">
<div style="width: 480px;"> <div style="width: 480px;">
<div class="trade_box"> <div class="trade_box">
<div class="trade_img" style="background-color: #ccc;"><img src="@/assets/img/home/dfiqr.png" style="border-radius: 10px;" alt=""></div> <!-- <div class="trade_img" style="background-color: #ccc;"><img src="" style="border-radius: 10px;" alt=""></div> -->
<div style="margin-left: 15px;"> <div style="margin-left: 15px;">
<div>{{ $t("homeNewText.hh33") }}</div> <div>{{ $t("homeNewText.hh33") }}</div>
<div style="font-weight: bold;">IOS & Android</div> <div style="font-weight: bold;">IOS & Android</div>
@ -361,10 +361,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="section-block section-block-2" v-if="0"> <div class="section-block section-block-2" v-if="0">
<h1 style="text-align: center;">{{$t("homeNewText.aa5")}}</h1> <h1 style="text-align: center;">{{$t("homeNewText.aa5")}}</h1>
<div style="font-size: 20px;margin-bottom: 3rem;color: #6A6E74;text-align: center;"> <div style="font-size: 20px;margin-bottom: 3rem;color: #6A6E74;text-align: center;">
@ -916,7 +914,7 @@
return Boolean(localStorage.token); return Boolean(localStorage.token);
}, },
downloadLink() { downloadLink() {
return "https://ctma.catycoin.com/download"; return "https://ctma.catycoins.com/download";
}, },
// //
featuresList() { featuresList() {
@ -1020,7 +1018,7 @@
// this.calculatePath(item.prices) // this.calculatePath(item.prices)
item.line = path(item.prices); item.line = path(item.prices);
}) })
console.info(this.marketList[0].marketInfoList) // console.info(this.marketList[0].marketInfoList)
}, },
truncate(str, length) { truncate(str, length) {
return _.truncate(str, { return _.truncate(str, {

4
src/views/wallet/funding.vue

@ -261,8 +261,8 @@ export default {
}, },
created() { created() {
console.log(this.Funding); // console.log(this.Funding);
console.info(this.$route.query.currentTab) // console.info(this.$route.query.currentTab)
if(this.$route.query.currentTab){ if(this.$route.query.currentTab){
this.currentTab=this.$route.query.currentTab this.currentTab=this.$route.query.currentTab
}else{ }else{

Loading…
Cancel
Save