Browse Source

Merge branch 'master' of ssh://git.xingtongworld.com:10022/luyisha/jiaoyi_cxicoin_h5

master
luyisha 3 years ago
parent
commit
02ba9d5b05
  1. 16
      app.js
  2. 2
      i18n/lang/en.json
  3. 2
      i18n/lang/zh-CN.json
  4. 2
      i18n/lang/zh-TW.json
  5. 6
      manifest.json
  6. 2
      pages.json
  7. 2
      pages/exchange/contract-history.vue
  8. 2
      pages/exchange/open-position.vue
  9. 2
      pages/income/index.vue
  10. 6
      static/tradingview.html

16
app.js

@ -3,21 +3,21 @@ let config = {};
if (process.env.NODE_ENV == 'production'||true) { //生产环境
config = {
// ajax地址
baseUrl: 'https://api.firephoenix.world',
baseUrl: 'https://sses.cxicoin.com',
// 图片地址 (暂时无用)
imgUrl: 'https://api.firephoenix.world/storage',
imgUrl: 'https://sses.cxicoin.com/storage',
// socket地址
socketUrl: 'wss://api.firephoenix.world/ws1',
socketUrl1: 'wss://api.firephoenix.world/ws2',
socketUrl: 'wss://sses.cxicoin.com/ws1',
socketUrl1: 'wss://sses.cxicoin.com/ws2',
// pc端地址
pcUrl:'https://www.firephoenix.world',
pcUrl:'https://www.cxicoin.com',
// app名称
appName: 'Firephoenix',
appName: 'CXICoin',
// 版本
version: '1.0.0',
// 移动端地址
mobile: 'https://app.firephoenix.world',
down:"https://app.firephoenix.world/download/CINSCoin.html"
mobile: 'https://app.cxicoin.com',
down:"https://app.cxicoin.com/download/CINSCoin.html"
};
} else { //开发环境
config = {

2
i18n/lang/en.json

@ -741,7 +741,7 @@
"a9":"multiple",
"b0":"Are you sure you want to log out?",
"b1":"Sign in or register",
"b2":"Hi, welcome to Firephoenix",
"b2":"Hi, welcome to CXICoin",
"b3":"amount",
"b4":"spot index ",
"b5":"Contract index",

2
i18n/lang/zh-CN.json

@ -739,7 +739,7 @@
"a9": "倍数",
"b0": "确定要退出登录吗?",
"b1": "登录或注册",
"b2": "Hi,欢迎使用Firephoenix",
"b2": "Hi,欢迎使用CXICoin",
"b3": "量",
"b4": "现货指数",
"b5": "合约指数",

2
i18n/lang/zh-TW.json

@ -739,7 +739,7 @@
"a9":"倍數",
"b0":"確定要登出嗎?",
"b1":"登入或注册",
"b2":"Hi,歡迎使用Firephoenix",
"b2":"Hi,歡迎使用CXICoin",
"b3":"量",
"b4":"現貨指數",
"b5":"合約指數",

6
manifest.json

@ -1,6 +1,6 @@
{
"name" : "Firephoenix",
"appid" : "__UNI__FB27865",
"name" : "CXICoin",
"appid" : "__UNI__B2BBA70",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : 100,
@ -112,6 +112,6 @@
"router" : {
"base" : "./"
},
"domain" : "https://app.firephoenix.world"
"domain" : "https://app.cxicoin.com"
}
}

2
pages.json

@ -222,7 +222,7 @@
"titleNView": false
},
"navigationBarTextStyle": "black",
"navigationBarTitleText": "Firephoenix",
"navigationBarTitleText": "CXICoin",
"navigationBarBackgroundColor": "#007AFF",
"backgroundColor": "#FFFFFF"
},

2
pages/exchange/contract-history.vue

@ -210,7 +210,7 @@ export default {
myCanvas.font = '12px Arial';//
myCanvas.fillText('全球合约领跑者',88,windowHeight*0.653);
myCanvas.font = '16px Arial';
myCanvas.fillText('Firephoenix',88,windowHeight*0.63);
myCanvas.fillText('CXICoin',88,windowHeight*0.63);
myCanvas.font = '14px Arial';
myCanvas.setFillStyle('#717171')
myCanvas.fillText(i.symbol+'/USDT',25,windowHeight*0.53);

2
pages/exchange/open-position.vue

@ -1007,7 +1007,7 @@ export default {
myCanvas.font = '12px Arial';//
myCanvas.fillText('全球合约领跑者',88,windowHeight*0.653);
myCanvas.font = '16px Arial';
myCanvas.fillText('Firephoenix',88,windowHeight*0.63);
myCanvas.fillText('CXICoin',88,windowHeight*0.63);
myCanvas.font = '14px Arial';
myCanvas.setFillStyle('#717171')
myCanvas.fillText(i.pair_name,25,windowHeight*0.53);

2
pages/income/index.vue

@ -98,7 +98,7 @@
<img class="img rounded-3 w-60 w-60" src="static/img/logo.png"/>
<view class="m-l-md">
<view class="fn-bold color-black fn-16">
Firephoenix
CXICoin
</view>
<view class="fn-6 color-black">
全球合约领跑者

6
static/tradingview.html

@ -22,9 +22,9 @@
<body>
<div class="tradingview" id="tradingview_10798345"></div>
</body>
<script src="https://www.firephoenix.world/newlink/mobile/jquery3_5_1.min.js"></script>
<script src="https://www.firephoenix.world/newlink/mobile/pako1_0_9.min.js"></script>
<script src="https://www.firephoenix.world/newlink/mobile/qs6_9_4.min.js"></script>
<script src="https://www.cxicoin.com/newlink/mobile/jquery3_5_1.min.js"></script>
<script src="https://www.cxicoin.com/newlink/mobile/pako1_0_9.min.js"></script>
<script src="https://www.cxicoin.com/newlink/mobile/qs6_9_4.min.js"></script>
<script src="./chart_main/charting_library.min.js"></script>
<script src="./chart_main/ws.js"></script>
<script src="./chart_main/sevencoin.js?v=2"></script>

Loading…
Cancel
Save