Browse Source

合并

master
j1ack 3 years ago
parent
commit
e42076d532
  1. 4
      App.vue
  2. 2
      components/KeyValueRow/KeyValueRow.vue
  3. 4
      components/kEchart/index.vue
  4. 2
      components/transaction/transaction.vue
  5. 36
      manifest.json
  6. 57
      pages/home/index.vue
  7. 2
      pages/login/register.vue
  8. 4
      pages/markets/index.vue
  9. 10
      pages/markets/kLine.vue
  10. 4
      pages/markets/trade.vue
  11. 6
      pages/withdrawal/withdrawal.vue
  12. 11
      utils/axios.js
  13. 2
      utils/constant.js
  14. 2
      utils/language/en_US.js

4
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,

2
components/KeyValueRow/KeyValueRow.vue

@ -84,7 +84,7 @@ export default {
if (this.size) {
height = this.size
}
console.log(height);
// console.log(height);
return height;
},
},

4
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)
}
}
}

2
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({

36
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" : {

57
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',
}
}

2
pages/login/register.vue

@ -265,7 +265,7 @@
})
})
}).catch(errors => {
console.log('err')
// console.log('err')
})
},

4
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',

10
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
}

4
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)
}
});
},

6
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) => {

11
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 {

2
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 {

2
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',

Loading…
Cancel
Save