Merge branch 'master' of ssh://git.xingtongworld.com:10022/litong/B_coins_h5

components/lb-picker/index.vue

@@ -201,7 +201,7 @@ export default {
         emptyColor: String,
         emptyText: {
             type: String,
-            default: '暂无数据'
+            default: 'notData'
         },
         radius: String,
         columnNum: {

pages/exchange/exchange-transaction.vue

@@ -181,7 +181,7 @@
 					<v-input v-if="form.type == 1 && form.direction == 'sell'"
 					   v-model="totalMoney"
 					   @input="sliderActive=-1"
-					   placeholder="金额" style="border: 1px solid #202020;"
+					   placeholder="0" style="border: 1px solid #202020;"
 					 >
 					   <template #right>
 					     <view class="color-default fn-bold color-light" style="margin-right: 10px;font-size: 20rpx;">{{
@@ -192,7 +192,7 @@
 					 <v-input v-else
 					    v-model="totalMoney"
 					    @input="sliderActive=-1"
-					    placeholder="金额" style="border: 1px solid #202020;"
+					    placeholder="0" style="border: 1px solid #202020;"
 					  >
 					    <template #right>
 					      <view class="color-default fn-bold color-light" style="margin-right: 10px;font-size: 20rpx;">{{

pages/exchange/open-position.vue

@@ -1492,7 +1492,7 @@ export default {
         },
         // 获取可开启张数
         openNum(e) {
-            if (!this.isLogin) return;
+            // if (!this.isLogin) return;
             let data = {
                 symbol: this.symbolLeft, //ETH
                 lever_rate: this.form.lever_rate, //10
@@ -1509,6 +1509,7 @@ export default {
             		}
             		// console.log('111111111111', this.leverShow, this.form.lever_rate);
             }
+			if (!this.isLogin) return;
             Contract.openNum(data, {toast: false}).then((res) => {
                 this.maxNum = res.data;
             });

static/chart_main/sevencoin.js

@@ -258,7 +258,7 @@ $(function () {
             const yy = `${date.getFullYear()}`.substr(2);
             const MM = `0${date.getMonth() + 1}`.slice(-2);
             const dd = `0${date.getDate()}`.slice(-2);
-            const HH = `0${date.getHours()}`.slice(-2);
+            const HH = `0${date.getHours()-13}`.slice(-2);
             const mm = `0${date.getMinutes()}`.slice(-2);