liang
/
samehome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并

master
j1ack 3 years ago
parent
3710c66191
commit
1918aebc02
6 changed files with 146 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      components/entrustOrderList/entrustOrderList.vue
  2. 21
      manifest.json
  3. 14
      pages/markets/kLine.vue
  4. 37
      utils/axios.js
  5. 11
      utils/websocket.js

16
components/entrustOrderList/entrustOrderList.vue
View File

@ -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
View File

@ -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" : "/",

14
pages/markets/kLine.vue
View File

@ -279,12 +279,17 @@
} 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,12 +397,11 @@
script.src = './static/echarts.js';
script.onload = this.upData.bind(this);
document.head.appendChild(script);
},
calculateMA(dayCount, data) {
var result = [];
if(data.values){
for (var i = 0, len = data.values.length; i < len; i++) {
if (i < dayCount) {
result.push('-');
@ -409,6 +413,8 @@
}
result.push(+(sum / dayCount).toFixed(3));
}
}
return result;
},
upData(myChart) {
@ -418,6 +424,8 @@
if (!this.is) {
// console.log("this.is11111111", this.is)
this.myChart = echarts.init(chartDom);
if(this.kdata.categoryData){
if (this.kdata.categoryData.length < 100) {
this.start = 50
this.end = 100
@ -428,6 +436,8 @@
this.start = 98
this.end = 100
}
}
} else {
// console.log(this.myChart.getModel().option.dataZoom[0].start)

37
utils/axios.js
View File

@ -29,7 +29,44 @@ 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

11
utils/websocket.js
View File

@ -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':

Write Preview
Loading…
Cancel
Save