diff --git a/.gitignore b/.gitignore index 638fb71..5ca0df3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,9 +35,11 @@ Icon .AppleDesktop Network Trash Folder Temporary Items -.apdisk +.apdisk +package-lock.json node_modules/ unpackage -.idea/ \ No newline at end of file +.idea/ +.hbuilderx/ \ No newline at end of file diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json deleted file mode 100644 index 07c1d5f..0000000 --- a/.hbuilderx/launch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ - // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 - "version": "0.0", - "configurations": [{ - "default" : - { - "launchtype" : "local" - }, - "h5" : - { - "launchtype" : "local" - }, - "type" : "uniCloud" - } - ] -} diff --git a/i18n/lang/en.json b/i18n/lang/en.json index 68cf119..eab7292 100644 --- a/i18n/lang/en.json +++ b/i18n/lang/en.json @@ -756,7 +756,7 @@ "a9":"multiple", "b0":"Are you sure you want to log out?", "b1":"Sign in or register", - "b2":"Hi, welcome to CXICoin", + "b2":"Hi, welcome to CXIPro", "b3":"amount", "b4":"spot index ", "b5":"Contract index", diff --git a/i18n/lang/zh-CN.json b/i18n/lang/zh-CN.json index cf2d8c2..7e69497 100644 --- a/i18n/lang/zh-CN.json +++ b/i18n/lang/zh-CN.json @@ -739,7 +739,7 @@ "a9": "倍数", "b0": "确定要退出登录吗？", "b1": "登录或注册", - "b2": "Hi，欢迎使用CXICoin", + "b2": "Hi，欢迎使用CXIPro", "b3": "量", "b4": "现货指数", "b5": "合约指数", diff --git a/i18n/lang/zh-TW.json b/i18n/lang/zh-TW.json index a564ca8..c9bbf83 100644 --- a/i18n/lang/zh-TW.json +++ b/i18n/lang/zh-TW.json @@ -754,7 +754,7 @@ "a9":"倍數", "b0":"確定要登出嗎？", "b1":"登入或注册", - "b2":"Hi，歡迎使用CXICoin", + "b2":"Hi，歡迎使用CXIPro", "b3":"量", "b4":"現貨指數", "b5":"合約指數", diff --git a/package-lock.json b/package-lock.json index 5b0d893..0584205 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,239 @@ { "name": "exchange", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "exchange", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "async-validator": "^1.11.5", + "axios": "^0.20.0", + "clipboard": "^2.0.8", + "element-ui": "^2.15.3", + "highcharts": "^8.2.0", + "lodash": "^4.17.20", + "qs": "^6.9.4", + "vue-i18n": "^8.21.0", + "vuex": "^3.5.1" + }, + "devDependencies": { + "babel-plugin-component": "^1.1.1" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.0.0-beta.35", + "resolved": "https://registry.nlark.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.0.0-beta.35.tgz?cache=0&sync_timestamp=1623280362184&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-module-imports%2Fdownload%2F%40babel%2Fhelper-module-imports-7.0.0-beta.35.tgz", + "integrity": "sha1-MI41DnMXUs200PBY3x1wSSXGTgo=", + "dev": true, + "dependencies": { + "@babel/types": "7.0.0-beta.35", + "lodash": "^4.2.0" + } + }, + "node_modules/@babel/types": { + "version": "7.0.0-beta.35", + "resolved": "https://registry.nlark.com/@babel/types/download/@babel/types-7.0.0-beta.35.tgz?cache=0&sync_timestamp=1626804454589&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.0.0-beta.35.tgz", + "integrity": "sha1-z5M6mpo4SEynJLM1uI2Dcm1auWA=", + "dev": true, + "dependencies": { + "esutils": "^2.0.2", + "lodash": "^4.2.0", + "to-fast-properties": "^2.0.0" + } + }, + "node_modules/async-validator": { + "version": "1.11.5", + "resolved": "https://registry.nlark.com/async-validator/download/async-validator-1.11.5.tgz", + "integrity": "sha1-nUPPSe9rt2vlRCOI0Z+5puR1l+o=" + }, + "node_modules/axios": { + "version": "0.20.0", + "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.20.0.tgz?cache=0&sync_timestamp=1597979633356&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.20.0.tgz", + "integrity": "sha1-BXujDwSIRpSZOozQf6OUz/EcUL0=", + "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410", + "dependencies": { + "follow-redirects": "^1.10.0" + } + }, + "node_modules/babel-helper-vue-jsx-merge-props": { + "version": "2.0.3", + "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz", + "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY=" + }, + "node_modules/babel-plugin-component": { + "version": "1.1.1", + "resolved": "https://registry.npm.taobao.org/babel-plugin-component/download/babel-plugin-component-1.1.1.tgz", + "integrity": "sha1-mwI6I/9cmq4P1WxaGLnKuMTUXuo=", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "7.0.0-beta.35" + } + }, + "node_modules/babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.nlark.com/babel-runtime/download/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dependencies": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, + "node_modules/clipboard": { + "version": "2.0.8", + "resolved": "https://registry.npm.taobao.org/clipboard/download/clipboard-2.0.8.tgz?cache=0&sync_timestamp=1615409953598&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclipboard%2Fdownload%2Fclipboard-2.0.8.tgz", + "integrity": "sha1-/8bBA90pZ6gwBfP2GXaqRlWkzbo=", + "dependencies": { + "good-listener": "^1.2.2", + "select": "^1.1.2", + "tiny-emitter": "^2.0.0" + } + }, + "node_modules/core-js": { + "version": "2.6.12", + "resolved": "https://registry.nlark.com/core-js/download/core-js-2.6.12.tgz", + "integrity": "sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=", + "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", + "hasInstallScript": true + }, + "node_modules/deepmerge": { + "version": "1.5.2", + "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz", + "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/delegate": { + "version": "3.2.0", + "resolved": "https://registry.npm.taobao.org/delegate/download/delegate-3.2.0.tgz", + "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY=" + }, + "node_modules/element-ui": { + "version": "2.15.3", + "resolved": "https://registry.nlark.com/element-ui/download/element-ui-2.15.3.tgz", + "integrity": "sha1-VRCKuCo7zGRuewVwhxxIupYwBlI=", + "dependencies": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + }, + "peerDependencies": { + "vue": "^2.5.17" + } + }, + "node_modules/element-ui/node_modules/async-validator": { + "version": "1.8.5", + "resolved": "https://registry.nlark.com/async-validator/download/async-validator-1.8.5.tgz", + "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=", + "dependencies": { + "babel-runtime": "6.x" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.nlark.com/esutils/download/esutils-2.0.3.tgz", + "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/follow-redirects": { + "version": "1.13.0", + "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.0.tgz?cache=0&sync_timestamp=1597057976909&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.0.tgz", + "integrity": "sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs=", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npm.taobao.org/good-listener/download/good-listener-1.2.2.tgz", + "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", + "dependencies": { + "delegate": "^3.1.2" + } + }, + "node_modules/highcharts": { + "version": "8.2.0", + "resolved": "https://registry.npm.taobao.org/highcharts/download/highcharts-8.2.0.tgz?cache=0&sync_timestamp=1597919354751&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhighcharts%2Fdownload%2Fhighcharts-8.2.0.tgz", + "integrity": "sha1-PUiTAVyvGnye2FKE2YORHoRGSfM=" + }, + "node_modules/lodash": { + "version": "4.17.20", + "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz?cache=0&sync_timestamp=1597335994883&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz", + "integrity": "sha1-tEqbYpe8tpjxxRo1RaKzs2jVnFI=" + }, + "node_modules/normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz", + "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + }, + "node_modules/qs": { + "version": "6.9.4", + "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.9.4.tgz", + "integrity": "sha1-kJCykNH5FyjTwi5UhDykSupatoc=", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.11.1.tgz", + "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=" + }, + "node_modules/resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.nlark.com/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" + }, + "node_modules/select": { + "version": "1.1.2", + "resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz", + "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=" + }, + "node_modules/throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz?cache=0&sync_timestamp=1604313832516&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrottle-debounce%2Fdownload%2Fthrottle-debounce-1.1.0.tgz", + "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0=", + "engines": { + "node": ">=4" + } + }, + "node_modules/tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.1.0.tgz", + "integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM=" + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.nlark.com/to-fast-properties/download/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/vue-i18n": { + "version": "8.21.0", + "resolved": "https://registry.npm.taobao.org/vue-i18n/download/vue-i18n-8.21.0.tgz?cache=0&sync_timestamp=1597336528269&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-i18n%2Fdownload%2Fvue-i18n-8.21.0.tgz", + "integrity": "sha1-UmRQUl/buch3aFtbpsuVc7c9OUA=" + }, + "node_modules/vuex": { + "version": "3.5.1", + "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.5.1.tgz", + "integrity": "sha1-8bjc6mSbwlJUz09DWAgdv12hiz0=", + "peerDependencies": { + "vue": "^2.0.0" + } + } + }, "dependencies": { "@babel/helper-module-imports": { "version": "7.0.0-beta.35", @@ -187,7 +418,8 @@ "vuex": { "version": "3.5.1", "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.5.1.tgz", - "integrity": "sha1-8bjc6mSbwlJUz09DWAgdv12hiz0=" + "integrity": "sha1-8bjc6mSbwlJUz09DWAgdv12hiz0=", + "requires": {} } } } diff --git a/pages/base/home.vue b/pages/base/home.vue index 1797d20..8a4ec78 100644 --- a/pages/base/home.vue +++ b/pages/base/home.vue @@ -440,7 +440,7 @@ - App Stoer + App Store Android APK diff --git a/pages/exchange/contract-history.vue b/pages/exchange/contract-history.vue index 90f1213..7f5d876 100644 --- a/pages/exchange/contract-history.vue +++ b/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('CXICoin',88,windowHeight*0.63); + myCanvas.fillText('CXIPro',88,windowHeight*0.63); myCanvas.font = '14px Arial'; myCanvas.setFillStyle('#717171') myCanvas.fillText(i.symbol+'/USDT',25,windowHeight*0.53); diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue index 88a309e..3b236a5 100644 --- a/pages/exchange/open-position.vue +++ b/pages/exchange/open-position.vue @@ -1013,7 +1013,7 @@ export default { myCanvas.font = '12px Arial';//绘制文字 myCanvas.fillText('全球合约领跑者',88,windowHeight*0.653); myCanvas.font = '16px Arial'; - myCanvas.fillText('CXICoin',88,windowHeight*0.63); + myCanvas.fillText('CXIPro',88,windowHeight*0.63); myCanvas.font = '14px Arial'; myCanvas.setFillStyle('#717171') myCanvas.fillText(i.pair_name,25,windowHeight*0.53); diff --git a/pages/income/index.vue b/pages/income/index.vue index a0d5e5c..b03c22e 100644 --- a/pages/income/index.vue +++ b/pages/income/index.vue @@ -98,7 +98,7 @@ - CXICoin + CXIPro 全球合约领跑者 diff --git a/static/img/app_st.png b/static/img/app_st.png new file mode 100644 index 0000000..541e57c Binary files /dev/null and b/static/img/app_st.png differ