From e1c9c35eb6b2e66bc5bd3a47384afa556b32b98e Mon Sep 17 00:00:00 2001 From: j1ack <1209452658@qq.com> Date: Thu, 1 Sep 2022 19:22:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 10 +- .../entrustOrderList/entrustOrderList.vue | 1105 +++++++++-------- components/transaction/transaction.vue | 15 +- manifest.json | 21 +- pages/charity/details.vue | 2 +- pages/charity/index.vue | 71 +- pages/home/index.vue | 359 +++--- pages/login/forget.vue | 61 + pages/login/register.vue | 8 +- pages/markets/index.vue | 182 ++- pages/markets/kLine.vue | 108 +- pages/markets/trade.vue | 126 +- pages/me/aboutUs.vue | 7 +- pages/me/accountInfo.vue | 78 +- pages/me/changeLoginPassword.vue | 39 +- pages/me/changeWithdrawalPassword.vue | 34 +- pages/me/donateRecord.vue | 2 +- pages/me/index.vue | 261 +++- pages/me/myTeam.vue | 81 +- pages/me/notification.vue | 72 +- pages/me/notificationDetails.vue | 70 +- pages/me/transfer.vue | 8 +- pages/me/walletHistory.vue | 17 +- pages/mine/mineRecord.vue | 2 +- pages/recharge/recharge.vue | 11 +- pages/recharge/rechargeRecord.vue | 15 +- pages/subscription/index.vue | 71 +- pages/withdrawal/addAddress.vue | 2 +- pages/withdrawal/addOrEditBankCard.vue | 58 +- pages/withdrawal/chooseAddress.vue | 13 +- pages/withdrawal/withdrawal.vue | 10 +- pages/withdrawal/withdrawalRecord.vue | 10 +- utils/index.js | 23 +- utils/language/en_US.js | 4 + utils/language/vi_VN.js | 5 +- utils/language/zh_TW.js | 9 +- utils/qrCode/wxqrcode.js | 2 +- 37 files changed, 2077 insertions(+), 895 deletions(-) diff --git a/App.vue b/App.vue index 9a72b9f..7ed9da1 100644 --- a/App.vue +++ b/App.vue @@ -30,10 +30,14 @@ } console.log('ss' + JSON.stringify(uni.getSystemInfoSync())) const response = await this.$api.appVersion(param) + // console.log(response) + if(!response.isUpgrade){ + return; + } plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => { - console.log('当前版本号' + wgtinfo.versionCode) - console.log((wgtinfo.versionCode < response.versionCode)) - console.log(wgtinfo.versionCode, response.versionCode) + // console.log('当前版本号' + wgtinfo.versionCode) + // console.log((wgtinfo.versionCode < response.versionCode)) + // console.log(wgtinfo.versionCode, response.versionCode) if (wgtinfo.versionCode < response.versionCode) { console.log('更新了吗') let that = this; diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue index 556e15f..3120871 100644 --- a/components/entrustOrderList/entrustOrderList.vue +++ b/components/entrustOrderList/entrustOrderList.vue @@ -1,533 +1,608 @@ diff --git a/components/transaction/transaction.vue b/components/transaction/transaction.vue index b8d5b20..3d6c4cd 100644 --- a/components/transaction/transaction.vue +++ b/components/transaction/transaction.vue @@ -56,12 +56,12 @@ @@ -90,7 +90,7 @@ contractConfig: { type: Object, default: () => { - leverage: [10] + } }, symbol: { @@ -112,6 +112,7 @@ } }, }, + data() { return { math:null, @@ -137,6 +138,14 @@ return this.$t("markets"); }, }, + watch: { + contractConfig: { + deep: true, + handler: function (n,i) { + this.leverageValue = n.leverage[0]; + } + } + }, mounted() { this.leverageValue = this.contractConfig.leverage[0]; this.coinPrice = this.marketDetail.close diff --git a/manifest.json b/manifest.json index 7bd7c09..d813aab 100644 --- a/manifest.json +++ b/manifest.json @@ -46,26 +46,9 @@ /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : { - "ad" : {} - } + "sdkConfigs" : {} }, - "nativePlugins" : { - "HF-Step" : { - "__plugin_info__" : { - "name" : "原生计步器（Android和IOS） - [试用版，仅用于自定义调试基座]", - "description" : "计步器，原生计步器插件,安卓,IOS", - "platforms" : "Android,iOS", - "url" : "https://ext.dcloud.net.cn/plugin?id=6632", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : true, - "bought" : 0, - "pid" : "6632", - "parameters" : {} - } - } - } + "nativePlugins" : {} }, "h5" : { "publicPath" : "/", diff --git a/pages/charity/details.vue b/pages/charity/details.vue index 8d91f4f..27183c5 100644 --- a/pages/charity/details.vue +++ b/pages/charity/details.vue @@ -45,7 +45,7 @@ + border="none" :placeholder="i18n.PleaseChooseCoin" v-model="coinInfo.coinCode" :disabled="true"> {{coinInfo.coinCode}} diff --git a/pages/charity/index.vue b/pages/charity/index.vue index 4d94936..18e3966 100644 --- a/pages/charity/index.vue +++ b/pages/charity/index.vue @@ -1,7 +1,16 @@ diff --git a/pages/login/register.vue b/pages/login/register.vue index 44ff315..402e205 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -108,7 +108,7 @@ password: "", email: '', payPassword: '', - inviteCode: 'gyUafm', + inviteCode: '', code: '', lang: '', }, @@ -159,8 +159,10 @@ return this.$t("login"); }, }, - onLoad() { - // console.log(this.$t('login.emailInputMessage')); + onLoad(res) { + if(res){ + this.userInfo.inviteCode=res.inviteCode + } }, watch: { 'userInfo.email': { diff --git a/pages/markets/index.vue b/pages/markets/index.vue index d3b88cb..448e49d 100644 --- a/pages/markets/index.vue +++ b/pages/markets/index.vue @@ -1,32 +1,37 @@