Merge branch 'master' of https://git.xingtongworld.com/luyisha/ybgcoins_h5_3

assets/scss/app.scss

@@ -714,4 +714,9 @@ $i: 1;
 .color-yellow-a{
 	color: #F7D558 !important;
 }
+.fn-word-wrap{
+    word-wrap: break-word;
+    word-break: break-all;
+    overflow: hidden;
+}
 @import "./vant.scss";

components/lb-picker/index.vue

@@ -99,12 +99,12 @@
                     <!-- 暂无数据 -->
                     <view v-if="isEmpty && !loading"
                           class="lb-picker-empty">
-                        <slot name="empty">
-                            <text class="lb-picker-empty-text"
-                                  :style="{ color: emptyColor }">
-                                {{ emptyText }}
-                            </text>
-                        </slot>
+                      <slot v-if="$slots['confirm-text']"
+                            name="empty"></slot>
+                      <text v-else class="lb-picker-empty-text"
+                            :style="{ color: emptyColor }">
+                          {{ emptyText }}
+                      </text>
                     </view>
 
                     <!-- 单选 -->

i18n/lang/en.json

@@ -572,7 +572,7 @@
 		"a1": "Position",
 		"a2": "Open Orders",
 		"a3": "Order History",
-		"a4": "Contract Transaction",
+		"a4": "Perpetual contracts",
 		"a5": "Opened successfully",
 		"a6": "Transaction Type",
 		"a7": "Filled",

i18n/lang/pt.json

@@ -250,7 +250,7 @@
     "c1":"Fechado",
     "c2":"Total",
     "c3":"Compra",
-    "c4":"Vender fora",
+    "c4":"Vender",
     "c5":"Número",
     "c6":"Fechar Ao Melhor preço de Mercado",
     "c7":"Preço total",

layout/vPicker.vue

@@ -4,6 +4,7 @@
     @confirm="select"
     :confirm-text="$t('common.confirm')"
     :cancel-text="$t('common.cancel')"
+    :empty-text="$t('common.notData')"
     :list="list"
     :props="{
       label: rangeLabel,

pages/base/mine.vue

@@ -31,7 +31,7 @@
             <view class="m-r-xs d-flex align-center">
               <img src="static/img/13.png" alt="" class="h-25"/>
             </view>
-            <text class="fn-middle fn-ms">{{
+            <text class="fn-middle fn-ms fn-word-wrap">{{
                 $t("base.b5")
               }}
             </text>
@@ -41,7 +41,7 @@
             <view class="m-r-xs d-flex align-center">
               <img src="static/img/13.png" alt="" class="h-25"/>
             </view>
-            <text class="fn-middle fn-ms">{{
+            <text class="fn-middle fn-ms fn-word-wrap">{{
                 $t("base.b5")
               }}
             </text>
@@ -51,7 +51,7 @@
             <view class="m-r-xs d-flex align-center">
               <img src="static/img/5.png" alt="" class="h-25"/>
             </view>
-            <text class="fn-ms">{{
+            <text class="fn-ms fn-word-wrap">{{
                 $t("base.b6")
               }}
             </text>
@@ -61,7 +61,7 @@
             <view class="m-r-xs d-flex align-center">
               <img src="static/img/hua.png" alt="" class="h-25"/>
             </view>
-            <text class="fn-ms">{{
+            <text class="fn-ms fn-word-wrap">{{
                 $t("base.d8")
               }}
             </text>

pages/exchange/open-position.vue

@@ -30,7 +30,7 @@
             </view>
             <view v-if="1" class="p-ms fn-sm m-t-xs rounded-sm d-flex justify-between w-max fn-13">
                 <view class="item w-33 t-no positions">
-                    <view class="label">{{ $t("contract.d4") }}(USDT)</view>
+                    <view class="label label-word-wrap">{{ $t("contract.d4") }}(USDT)</view>
                     <view class="num color-dark d-flex align-center" style="margin-top:8px;">
                         <text>{{ accountInfo.account_equity || "--"}}</text>
                         <van-icon name="exchange " @click="_router.push('/pages/transfer/index')"
@@ -1901,7 +1901,7 @@ export default {
 .t-no {
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap
+    /*white-space: nowrap*/
 }
 
 .h-120 {
@@ -2013,4 +2013,8 @@ export default {
 .bg-panel-2{
 	background-color: #ebebeb;
 }
+.label-word-wrap{
+  word-wrap: break-word;
+  word-break: break-all;
+}
 </style>