From e42076d5325daefbe4f7db1ea1641f5574ba29da Mon Sep 17 00:00:00 2001 From: j1ack <1209452658@qq.com> Date: Tue, 6 Sep 2022 15:58:06 +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 | 4 +- components/KeyValueRow/KeyValueRow.vue | 2 +- components/kEchart/index.vue | 4 +- components/transaction/transaction.vue | 2 +- manifest.json | 36 +++++++++++++++- pages/home/index.vue | 57 ++++++++++++-------------- pages/login/register.vue | 2 +- pages/markets/index.vue | 4 +- pages/markets/kLine.vue | 10 ++--- pages/markets/trade.vue | 4 +- pages/withdrawal/withdrawal.vue | 6 +-- utils/axios.js | 11 ++--- utils/constant.js | 2 +- utils/language/en_US.js | 2 +- 14 files changed, 87 insertions(+), 59 deletions(-) diff --git a/App.vue b/App.vue index 7ed9da1..e3dd9ae 100644 --- a/App.vue +++ b/App.vue @@ -28,7 +28,7 @@ let param = { 'appId': uni.getSystemInfoSync().platform } - console.log('ss' + JSON.stringify(uni.getSystemInfoSync())) + // console.log('ss' + JSON.stringify(uni.getSystemInfoSync())) const response = await this.$api.appVersion(param) // console.log(response) if(!response.isUpgrade){ @@ -39,7 +39,7 @@ // console.log((wgtinfo.versionCode < response.versionCode)) // console.log(wgtinfo.versionCode, response.versionCode) if (wgtinfo.versionCode < response.versionCode) { - console.log('更新了吗') + // console.log('更新了吗') let that = this; uni.showModal({ title: this.$t("login").Versionupdate, diff --git a/components/KeyValueRow/KeyValueRow.vue b/components/KeyValueRow/KeyValueRow.vue index aa91bf9..c4f6c08 100644 --- a/components/KeyValueRow/KeyValueRow.vue +++ b/components/KeyValueRow/KeyValueRow.vue @@ -84,7 +84,7 @@ export default { if (this.size) { height = this.size } - console.log(height); + // console.log(height); return height; }, }, diff --git a/components/kEchart/index.vue b/components/kEchart/index.vue index 53a0135..f0fdbe3 100644 --- a/components/kEchart/index.vue +++ b/components/kEchart/index.vue @@ -137,7 +137,7 @@ export default { }, // 初始化数据 init(data) { - console.log(data); + // console.log(data); this.oldData = JSON.parse(JSON.stringify(data)); this.changeOption(this.oldData) }, @@ -396,7 +396,7 @@ export default { } }, onViewClick(options) { - console.log(options) + // console.log(options) } } } diff --git a/components/transaction/transaction.vue b/components/transaction/transaction.vue index 64b22f4..48ba75e 100644 --- a/components/transaction/transaction.vue +++ b/components/transaction/transaction.vue @@ -181,7 +181,7 @@ // #ifdef APP-PLUS data.source='android' // #endif - console.log(data); + // console.log(data); const contractOrder = this.$api.contractOrder(data); contractOrder.then(res => { uni.showToast({ diff --git a/manifest.json b/manifest.json index 9d40492..28ab375 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "samehome", + "name" : "Same home", "appid" : "__UNI__C4028F6", "description" : "", "versionName" : "1.0.0", - "versionCode" : "101", + "versionCode" : 100, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -48,6 +48,38 @@ /* SDK配置 */ "sdkConfigs" : { "ad" : {} + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } } }, "nativePlugins" : { diff --git a/pages/home/index.vue b/pages/home/index.vue index 9f5acfd..d6dc34a 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -246,11 +246,11 @@ isUpdate = true; } - if (isUpdate) { + if (isUpdate&&this.stepsNum>0) { this.$api.updateSteps({ steps: this.stepsNum }).then(res => { - console.log(res, 'res更新') + // console.log(res, 'res更新') uni.setStorageSync("stepsNum_date", { stepsNum: this.stepsNum, date: today, @@ -258,7 +258,7 @@ }); }) } - console.log(this.stepsNum) + // console.log(this.stepsNum) }, bannerClick(i) { @@ -289,33 +289,33 @@ try { //整个应用设置一次即可，停止计步后需重新调用，所有接口调用必须先开启计步服务 StepCounter.startStep((res) => { - console.log(res, '步数res'); + // console.log(res, '步数res'); this.stepCount = res.stepCount this.stepsNum = res.stepCount; this.updateSteps(); //res.stepCount 当天累计步数 }, (res) => { - console.log(res) + // console.log(res) let callback = res.callback if (callback == "stepStatus") { let status = res.status; if (1 == status) { //安卓gps定位服务未开 - console.log('安卓gps定位服务未开') + // console.log('安卓gps定位服务未开') } else if (2 == status || 5 == status) { //权限被禁止 //this.gotoSettings() - console.log('权限被禁止') + // console.log('权限被禁止') } else if (3 == status) { //允许运动权限（处理安卓权限问题） //this.startStep() - console.log('允许运动权限（处理安卓权限问题）') + // console.log('允许运动权限（处理安卓权限问题）') } } }); } catch (e) { - console.error("获取步数出错", e) + // console.error("获取步数出错", e) } }, startStep() { @@ -323,15 +323,15 @@ StepCounter.getRecordStep((res) => { //res.result == true 获取记录成功，否则错误 //res.stepCount 记录的步数 - console.log(res.result) - console.log(res.stepCount) + // console.log(res.result) + // console.log(res.stepCount) }); }, resStartStep() { //如需重新记录，再次调用此接口即可 StepCounter.startRecordStep((res) => { //res.result == true 开始记录成功，否则错误 - console.log(res.result) + // console.log(res.result) }); }, @@ -343,7 +343,7 @@ uni.$u.toast(res.errMsg); } else { // #ifdef APP-PLUS - console.log(res.url) + // console.log(res.url) plus.runtime.openUrl(res.url) // #endif // #ifdef H5 @@ -358,16 +358,16 @@ // 获取未读的公告 getNoReadNotice() { for (var i = 0; i < this.notice.length; i++) { - if (this.notice[i].isRead == 'no') { + if (this.notice[0].isRead == 'no') { this.contentFirst = this.notice[i].content this.noticeId = this.notice[i].id this.popupShow = true } } // 如果循环都是已读的就关闭弹框 - if (!this.noticeId) { - this.popupShow = false - } + // if (!this.noticeId) { + // this.popupShow = false + // } }, // 读公告 toRead() { @@ -379,7 +379,8 @@ this.popupShow = false setTimeout(() => { this.noticeId = null; - this.getNoReadNotice() + this.messageList=[]; + this.noticeList(); }, 1500) }, @@ -520,7 +521,7 @@ methods: { receive(newValue, oldValue, ownerVm, vm) { - console.log(newValue, '变化') + // console.log(newValue, '变化') this.initEcharts() // if(!this.myChart){ // this.initEcharts() @@ -573,8 +574,8 @@ }, itemStyle: { // 设置扇形的阴影 - shadowBlur: 30, - shadowColor: '#15141F', + shadowBlur: 0, + shadowColor: '#00E8A2', shadowOffsetX: 'center', shadowOffsetY: 'center', @@ -584,23 +585,17 @@ name: '步数', itemStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ - offset: .2, - color: '#47BDFF' - }, { - offset: .5, - color: '#34AEFF' - }, { offset: 1, - color: '#0589FF' - }]), - borderRadius: 800, + color: '#00E8A2' + }, ]), + borderRadius: 0, } }, { value: (this.stepTarget - this.stepsNum) / this.stepTarget, name: '剩余步数', itemStyle: { - color: '#15141F', + color: '#A1A0A8', } } diff --git a/pages/login/register.vue b/pages/login/register.vue index 402e205..de93369 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -265,7 +265,7 @@ }) }) }).catch(errors => { - console.log('err') + // console.log('err') }) }, diff --git a/pages/markets/index.vue b/pages/markets/index.vue index 448e49d..cd79c09 100644 --- a/pages/markets/index.vue +++ b/pages/markets/index.vue @@ -69,12 +69,12 @@ "model": "contract" }); symbolGroup.then(res => { - console.log(res) + // console.log(res) this.symbolList = res.USDT }) .catch(e => { - console.log('请求接口错误', e) + // console.log('请求接口错误', e) uni.showToast({ title: e, icon: 'none', diff --git a/pages/markets/kLine.vue b/pages/markets/kLine.vue index 4e4bb00..1ac6af1 100644 --- a/pages/markets/kLine.vue +++ b/pages/markets/kLine.vue @@ -222,12 +222,12 @@ "symbol": this.symbol.symbol }); bboList.then(res => { - console.log(9999999, res) + // console.log(9999999, res) this.bboList = res this.statisticsSum(); }) .catch(e => { - console.log(e) + // console.log(e) uni.showToast({ title: e, icon: 'none', @@ -244,7 +244,7 @@ }) .catch(e => { - console.log(e) + // console.log(e) uni.showToast({ title: e, icon: 'none', @@ -416,7 +416,7 @@ const downColor = '#FF3750'; var chartDom = document.getElementById('kline'); if (!this.is) { - console.log("this.is11111111", this.is) + // console.log("this.is11111111", this.is) this.myChart = echarts.init(chartDom); if (this.kdata.categoryData.length < 100) { this.start = 50 @@ -430,7 +430,7 @@ } } else { - console.log(this.myChart.getModel().option.dataZoom[0].start) + // console.log(this.myChart.getModel().option.dataZoom[0].start) this.start = this.myChart.getModel().option.dataZoom[0].start this.end = this.myChart.getModel().option.dataZoom[0].end } diff --git a/pages/markets/trade.vue b/pages/markets/trade.vue index 6dd722d..4236c8f 100644 --- a/pages/markets/trade.vue +++ b/pages/markets/trade.vue @@ -117,7 +117,7 @@ statisticsSum() { this.sum.buy = 0 this.sum.sell = 0 - console.log(this.sum.buy); + // console.log(this.sum.buy); for (var buy in this.bboList.buy) { if (buy >= 5) { @@ -213,7 +213,7 @@ } else if (data.channel === 'market.' + that.symbol.symbol + '.detail') { that.marketDetail = data.data; } else { - console.log('未知', data.data) + // console.log('未知', data.data) } }); }, diff --git a/pages/withdrawal/withdrawal.vue b/pages/withdrawal/withdrawal.vue index 922d62a..f03461b 100644 --- a/pages/withdrawal/withdrawal.vue +++ b/pages/withdrawal/withdrawal.vue @@ -288,7 +288,7 @@ } } api.withdraw(info).then(res => { - console.log(res) + // console.log(res) uni.$u.toast(this.$t("login").Withdrawalsucceeded) setTimeout(() => { this.coinInfo = { @@ -363,11 +363,11 @@ }, USDTRadioChange(e) { - console.log(e); + // console.log(e); }, copyAddress(value = "") { - console.log(value) + // console.log(value) uniCopy({ content: value, success: (res) => { diff --git a/utils/axios.js b/utils/axios.js index 2f0c0af..dd38b21 100644 --- a/utils/axios.js +++ b/utils/axios.js @@ -22,7 +22,7 @@ const service = axios.create({ service.interceptors.request.use( config => { const language = uni.getStorageSync("language")|| 'en_US'; - console.log('语言', language) + // console.log('语言', language) if (constant.SHOW_DIALOG) { uni.showLoading({ title: 'loading', @@ -107,7 +107,7 @@ service.interceptors.request.use( var key = "key=" + constant.KEY; - console.log(sign + key) + // console.log(sign + key) sign = md5(sign + key); if (config.method == 'post') { config.data['sign'] = sign @@ -124,7 +124,8 @@ service.interceptors.request.use( return config; }, error => { - console.error(error); // for debug + // console.error(error); + // for debug uni.hideLoading(); return Promise.reject(error); } @@ -136,7 +137,7 @@ service.interceptors.response.use(res => { uni.hideLoading() res=res.data; - console.log('数据',res) + // console.log('数据',res) // console.log(res.data) // console.log(res.data.data[0].nameAlias) if (res.code===0||res.success) { @@ -161,7 +162,7 @@ service.interceptors.response.use(res => { key: 'url', data: url, success: function() { - console.log('success') + // console.log('success') } }); } else { diff --git a/utils/constant.js b/utils/constant.js index 19a0754..53274aa 100644 --- a/utils/constant.js +++ b/utils/constant.js @@ -3,7 +3,7 @@ const H5_BASE_URL = '/api'; const BASE_URL = IS_TEST?'https://sapi.payairs.com':''; const H5_MARKET_URL = '/market'; const MARKET_URL = IS_TEST?'https://market.acefinex.com':''; -const KEY = IS_TEST?'jsabdjhfbsjndfksnjndja,sndmbstart':''; +const KEY = IS_TEST?'8M8gym8SaXs9kL27x7eQrXp4ELOqC8gl':''; const WSSURL = IS_TEST?'wss://market.acefinex.com/wss/':''; const SHOW_DIALOG=true export default { diff --git a/utils/language/en_US.js b/utils/language/en_US.js index 1a307da..a5d13aa 100644 --- a/utils/language/en_US.js +++ b/utils/language/en_US.js @@ -218,7 +218,7 @@ export default { invuteCode: 'Please type your invute code', lockBTC: 'Please type you want to lock BTC quantity ', ALL: 'ALL', - LockBTCBtn: 'Khoá BTC và sản xuất đầu', + LockBTCBtn: 'Lock BTC and begin produce', MineRecord: 'Mine Record', NoData: 'No Data',