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

@@ -17,7 +17,7 @@
 				</view>
 			</template>
 		</v-header>
-		
+
         <view class="d-flex p-x-md p-0 p-t-md justify-between align-center fn-18 color-light flex-wrap">
             <view class="w-max" style="height: var(--status-bar-height)"></view>
             <view @click="$emit('symbol')" class="d-flex align-center">
@@ -78,7 +78,7 @@
                     </view>
                 </view>
             </view> -->
-			
+
         </view>
         <view class="w-max" style="height: var(--status-bar-height)"></view>
         <!-- <view class="h-120"></view> -->
@@ -149,7 +149,7 @@
 									{{$t("base.g5")}}
 								</view>
 							</view>
-							
+
                             <!-- 市价 -->
                            <v-input
                                 v-if="form.type == 1"
@@ -228,14 +228,14 @@
                           <span class="color-default">{{ $t("contract.d9") }}</span>
                           <span>{{ margin }}</span>
                         </view> -->
-						
+
 						<!-- 1111 -->
                         <view class="d-flex flex-wrap">
                             <!-- <view class="fn-12">
                                 {{$t('first.a3')}}
                                 <text class="color-theme-1">({{$t('reg.b4')}})</text>
                             </view> -->
-							
+
 													<view class="fn-sm m-t-md d-flex justify-between" style="width: 100%;">
 														<view class="">{{ $t("contract.d4") }}(USDT)</view>
 														<view class="num color-light d-flex align-center">
@@ -259,7 +259,7 @@
 															</view>
 														<img :src="$localImgUrl('antOutline.png')" alt="" class="h-18" @click="_router.push('/pages/transfer/index')" />
 													</view>
-							
+
                             <!-- <view class="d-flex justify-between m-y-xs align-center">
                                 <v-input
                                     :placeholder="$t('contract.i4')"
@@ -274,7 +274,7 @@
                                 >
                                 </v-input>
                             </view> -->
-							
+
 							<!-- 止盈/止损 -->
 							<view style="margin-top: 10px;">
 								<van-checkbox :value="showsStopLoss" @change="showsStopLoss = !showsStopLoss"  checked-color="#fff" shape="square" icon-size="15px">
@@ -291,7 +291,7 @@
 									 USDT</view>
 								   </template>
 								 </v-input>
-								 
+
 								 <v-input
 								    v-model="form.sl_trigger_price"
 								    :placeholder="$t('contract.i7')" style="border: 1px solid #202020;margin-top: 5px;">
@@ -437,7 +437,7 @@
                         </view> -->
                     </view>
                     <view class="w-6/12 p-r-md p-l-md box-size">
-						
+
 							<view style="margin-top: 20px;" class="m-b-md">
 							    <view style="text-align: right;">
 							        {{ $t("contract.d6") }}
@@ -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;
             });
@@ -2153,4 +2154,4 @@ export default {
 ::v-deep .el-slider__button-wrapper{
 	z-index: 1;
 }
-</style>
+</style>

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);