Browse Source

合并

master
j1ack 3 years ago
parent
commit
1918aebc02
  1. 16
      components/entrustOrderList/entrustOrderList.vue
  2. 21
      manifest.json
  3. 2
      pages/home/index.vue
  4. 50
      pages/markets/kLine.vue
  5. 151
      utils/axios.js
  6. 11
      utils/websocket.js

16
components/entrustOrderList/entrustOrderList.vue

@ -32,8 +32,8 @@
<view class="value">{{item.openedPrice}}</view>
<view class="title">{{ i18n.Bond }}</view>
<view class="value">{{item.bondAmount}}</view>
<view class="title" v-show="type !== 3||type !== 0">{{ i18n.StyPrice }}</view>
<view class="value" v-show="type !== 3||type !== 0">{{item.winStopPrice}}</view>
<view class="title" v-show="type == 1||type == 2">{{ i18n.StyPrice }}</view>
<view class="value" v-show="type ==1||type == 2">{{item.winStopPrice}}</view>
</view>
<!-- 公共的 -->
<view class="center">
@ -41,17 +41,17 @@
<view class="value">{{item.hand}} * {{item.leverage}}</view>
<view class="title">{{ i18n.Fee }}</view>
<view class="value">{{item.fee}}</view>
<view class="title" v-show="type !== 3||type !== 0">{{ i18n.StsPrice }}</view>
<view class="value" v-show="type !== 3||type !== 0">{{item.lossStopPrice}}</view>
<view class="title" v-show="type == 1||type == 2">{{ i18n.StsPrice }}</view>
<view class="value" v-show="type == 1||type == 2">{{item.lossStopPrice}}</view>
</view>
<!-- Current Entrust Position-->
<view class="right" v-show="type === 0 || type === 1">
<view class="title">{{ i18n.CurrentPrice }}</view>
<view class="value" style="color:#F4506A;">{{marketDetail.close}}</view>
<view class="title" v-show="type === 0">{{ i18n.status }}</view>
<!-- <view class="title" v-show="type === 0">{{ i18n.status }}</view>
<view class="value" v-show="type === 0">
{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}}
</view>
</view> -->
<view class="title" v-show="type === 1">{{ i18n.do }}</view>
<view class="value" style="color:#00E8A2;" v-show="type === 1" @click="getStopLimit(item)">
{{ i18n.StopLimit }}
@ -81,10 +81,10 @@
</view>
<!-- Revoked -->
<view class="right" v-show="type === 3">
<view class="title">{{ i18n.status }}</view>
<!-- <view class="title">{{ i18n.status }}</view>
<view class="value" style="color:#F4506A;">
{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}}
</view>
</view> -->
<view class="title">{{ i18n.PL }}</view>
<view class="value" style="color:#00E8A2;">
<!-- {{item.currentPl}} --> 0

21
manifest.json

@ -44,7 +44,9 @@
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
/* ios */
"ios" : {},
"ios" : {
"dSYMs" : false
},
/* SDK */
"sdkConfigs" : {
"ad" : {}
@ -82,22 +84,7 @@
}
}
},
"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" : "com.samehome",
"ios_bundle_id" : "com.samehome",
"isCloud" : true,
"bought" : 1,
"pid" : "6632",
"parameters" : {}
}
}
}
"nativePlugins" : {}
},
"h5" : {
"publicPath" : "/",

2
pages/home/index.vue

@ -170,7 +170,7 @@
}
},
onLoad() {
this.baseURL = constant.BASE_URL
this.baseURL = constant.BASE_URL
this.getbanner();
this.noticeList();
this.getUserInfoBalance();

50
pages/markets/kLine.vue

@ -279,11 +279,16 @@
} else if (data.channel === 'market.' + that.symbol.symbol + '.detail') {
that.marketDetail = data.data;
} else if (data.channel === 'market.' + that.symbol.symbol + ".kline." + that.type) {
// console.log('k线')
if (data.event === 'req') {
// console.log('k线req')
// console.log(11111,data)
that.kdata = that.splitData(data.data)
} else {
that.upkline(data.data)
}
}
});
@ -392,22 +397,23 @@
script.src = './static/echarts.js';
script.onload = this.upData.bind(this);
document.head.appendChild(script);
},
calculateMA(dayCount, data) {
var result = [];
for (var i = 0, len = data.values.length; i < len; i++) {
if (i < dayCount) {
result.push('-');
continue;
}
var sum = 0;
for (var j = 0; j < dayCount; j++) {
sum += data.values[i - j][1];
if(data.values){
for (var i = 0, len = data.values.length; i < len; i++) {
if (i < dayCount) {
result.push('-');
continue;
}
var sum = 0;
for (var j = 0; j < dayCount; j++) {
sum += data.values[i - j][1];
}
result.push(+(sum / dayCount).toFixed(3));
}
result.push(+(sum / dayCount).toFixed(3));
}
return result;
},
@ -418,16 +424,20 @@
if (!this.is) {
// console.log("this.is11111111", this.is)
this.myChart = echarts.init(chartDom);
if (this.kdata.categoryData.length < 100) {
this.start = 50
this.end = 100
} else if (this.kdata.categoryData.length < 200) {
this.start = 85
this.end = 100
} else {
this.start = 98
this.end = 100
if(this.kdata.categoryData){
if (this.kdata.categoryData.length < 100) {
this.start = 50
this.end = 100
} else if (this.kdata.categoryData.length < 200) {
this.start = 85
this.end = 100
} else {
this.start = 98
this.end = 100
}
}
} else {
// console.log(this.myChart.getModel().option.dataZoom[0].start)

151
utils/axios.js

@ -21,7 +21,7 @@ const service = axios.create({
// request拦截器,在请求之前做一些处理
service.interceptors.request.use(
config => {
const language = uni.getStorageSync("language")|| 'en_US';
const language = uni.getStorageSync("language") || 'en_US';
// console.log('语言', language)
if (constant.SHOW_DIALOG) {
// uni.showLoading({
@ -29,21 +29,58 @@ service.interceptors.request.use(
// mask: true
// })
}
console.log(config.url)
if (config.url.indexOf("/api/index/register") !== -1 ||
config.url.indexOf("/api/user/login") !== -1 ||
config.url.indexOf("/api/user/forgotPassword") !== -1 ||
config.url.indexOf("/api/user/updatePassword") !== -1 ||
config.url.indexOf("/api/user/bindBank") !== -1 ||
config.url.indexOf("/api/user/updatePayPassword") !== -1 ||
config.url.indexOf("/api/index/sendEmailCode") !== -1 ||
config.url.indexOf("/api/user/loginOut") !== -1 ||
config.url.indexOf("/api/recharge/recharge") !== -1 ||
config.url.indexOf("/api/withdraw/withdrawAddressAdd") !== -1 ||
config.url.indexOf("/api/withdraw/withdraw") !== -1 ||
config.url.indexOf("/api/mine/mineSubmit") !== -1 ||
config.url.indexOf("/api/contract/order") !== -1 ||
config.url.indexOf("/api/contract/setWinOrLossStopPrice") !== -1 ||
config.url.indexOf("/api/contract/cancel") !== -1 ||
config.url.indexOf("/api/contract/closed") !== -1 ||
config.url.indexOf("/api/transfer/transfer") !== -1 ||
config.url.indexOf("/api/exchange/exchangeCoin") !== -1 ||
config.url.indexOf("/api/charity/charitySubmit") !== -1 ||
config.url.indexOf("/api/steps/receivStepsAward") !== -1 ||
config.url.indexOf("/api/withdraw/withdrawAddressDel") !== -1
) {
console.log(config.url)
uni.showLoading({
title: 'loading',
mask: true
})
}
if (config.url.indexOf("/api/recharge/rechargeConfig") !== -1
|| config.url.indexOf("/api/recharge/rechargeList") !== -1
|| config.url.indexOf("/api/withdraw/withdrawConfig") !== -1
|| config.url.indexOf("/api/withdraw/withdrawList") !== -1
|| config.url.indexOf("/api/contract/orderList") !== -1
) {
uni.hideLoading()
}
if (config.url.indexOf('market') > -1) {
// #ifdef H5
config.baseURL = constant.H5_MARKET_URL;
// #endif
// #ifdef APP-PLUS
config.baseURL = constant.MARKET_URL
// #endif
}
// #ifdef H5
config.baseURL = constant.H5_MARKET_URL;
// #endif
// #ifdef APP-PLUS
config.baseURL = constant.MARKET_URL
// #endif
}
const ticket = uni.getStorageSync('ticket')
if (ticket) {
if(!config.data){
if (!config.data) {
config.data = {};
}
config.data['ticket'] = ticket
@ -70,7 +107,7 @@ service.interceptors.request.use(
}
if (config.method == 'post') {
if (config.method == 'post') {
dataStr = decodeURIComponent(qs.stringify(config.data)).split('&');
}
//console.log(config.url,111111,config.data,dataStr)
@ -82,9 +119,9 @@ service.interceptors.request.use(
var keys = [];
let sign = '';
var t = Date.now() - 2901;
config.data['lang'] = language;
for (var k in config.data)
keys.push(k);
@ -92,8 +129,8 @@ service.interceptors.request.use(
return a < b ? -1 : 1;
})
keys.forEach(function(e) {
@ -105,10 +142,10 @@ service.interceptors.request.use(
});
var key = "key=" + constant.KEY;
// console.log(sign + key)
var key = "key=" + constant.KEY;
// console.log(sign + key)
sign = md5(sign + key);
if (config.method == 'post') {
config.data['sign'] = sign
@ -125,8 +162,8 @@ service.interceptors.request.use(
return config;
},
error => {
// console.error(error);
// for debug
// console.error(error);
// for debug
uni.hideLoading();
return Promise.reject(error);
}
@ -134,45 +171,45 @@ service.interceptors.request.use(
//配置成功后的拦截器
service.interceptors.response.use(res => {
uni.hideLoading()
res=res.data;
// console.log('数据',res)
uni.hideLoading()
res = res.data;
// console.log('数据',res)
// console.log(res.data)
// console.log(res.data.data[0].nameAlias)
if (res.code===0||res.success) {
if (res.code === 0 || res.success) {
return res.data;
}
uni.showToast({
title: res.errMsg,
icon: 'none',
duration: 1500
}
uni.showToast({
title: res.errMsg,
icon: 'none',
duration: 1500
})
if (res.errCode === 'SYS.0006') {
uni.setStorageSync('ticket', null);
uni.setStorageSync('logInfo', null);
uni.reLaunch({
url: '/pages/login/index'
})
if (res.errCode === 'SYS.0006') {
uni.setStorageSync('ticket',null);
uni.setStorageSync('logInfo',null);
uni.reLaunch({
url: '/pages/login/index'
})
// #ifdef H5
var url = location.href;
if (url.indexOf('pages') > -1) {
uni.setStorage({
key: 'url',
data: url,
success: function() {
// console.log('success')
}
});
} else {
uni.removeStorageSync('url')
}
// #endif
// #ifdef H5
var url = location.href;
if (url.indexOf('pages') > -1) {
uni.setStorage({
key: 'url',
data: url,
success: function() {
// console.log('success')
}
});
} else {
uni.removeStorageSync('url')
}
uni.$emit('refreshQrCode')
return Promise.reject(res.errMsg);
// #endif
}
uni.$emit('refreshQrCode')
return Promise.reject(res.errMsg);
}, error => {
uni.hideLoading();
return Promise.reject(error)

11
utils/websocket.js

@ -124,6 +124,7 @@ class WebSocketClass {
// #ifdef APP-PLUS
this.ws.onMessage(event => {
this.globalCallback(JSON.parse(event.data))
});
// #endif
@ -150,7 +151,7 @@ class WebSocketClass {
this.ws && this.ws.send({
data: JSON.stringify(msg),
success() {
console.log('消息发送成功');
console.log('消息发送成功',msg);
},
fail(err) {
console.log('关闭失败', err)
@ -218,7 +219,13 @@ class WebSocketClass {
}
subKHistory(timeType, symbol) {
var toDate = parseInt(new Date().getTime() / 1000);
var num = 100000;
var num = 10000;
// #ifdef APP-PLUS
num = 3000;
// #endif
var fromDate = parseInt(new Date().getTime() / 1000);
switch (timeType) {
case '1min':

Loading…
Cancel
Save