From 90bb31cf6f92a44c3ce136e5048f10935083dddb Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 5 Jun 2023 16:21:38 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=AD=97=E4=BD=93=E6=9C=AA=E7=BF=BB=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lb-picker/index.vue | 12 ++++++------
 layout/vPicker.vue             |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/components/lb-picker/index.vue b/components/lb-picker/index.vue
index 2053846..387c6c8 100644
--- a/components/lb-picker/index.vue
+++ b/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>
 
                     <!-- 单选 -->
diff --git a/layout/vPicker.vue b/layout/vPicker.vue
index 94faf00..0b9759e 100644
--- a/layout/vPicker.vue
+++ b/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,

From 7f1466269ace0b7723ca7e04b684cac2ae914bea Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 5 Jun 2023 17:47:14 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/exchange/open-position.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue
index 9630a3c..e25abdc 100644
--- a/pages/exchange/open-position.vue
+++ b/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')"
@@ -1882,7 +1882,7 @@ export default {
 .t-no {
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap
+    /*white-space: nowrap*/
 }
 
 .h-120 {
@@ -1994,4 +1994,8 @@ export default {
 .bg-panel-2{
 	background-color: #ebebeb;
 }
+.label-word-wrap{
+  word-wrap: break-word;
+  word-break: break-all;
+}
 </style>

From 05f360a52d60707643192dd4ea8dfe82cadf14e0 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 5 Jun 2023 17:49:07 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=94=B9=E5=AF=BC=E8=88=AA=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=8D=95=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i18n/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/lang/en.json b/i18n/lang/en.json
index 96f8004..acff92c 100644
--- a/i18n/lang/en.json
+++ b/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",

From 6c0f9bbe4f28848782914dc67d77fac2981706c8 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 5 Jun 2023 19:21:39 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E5=8D=95=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i18n/lang/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/lang/pt.json b/i18n/lang/pt.json
index e7ac1ca..24cc031 100644
--- a/i18n/lang/pt.json
+++ b/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",

From a430fe1fdb2aaca65fd01cc4183702f5fe9b6300 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 5 Jun 2023 19:59:52 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AD=97=E5=88=B0=E6=A1=86=E5=A4=96?=
 =?UTF-8?q?=E9=9D=A2=E5=8E=BB=E4=BA=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/scss/app.scss | 5 +++++
 pages/base/mine.vue  | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/assets/scss/app.scss b/assets/scss/app.scss
index 87f40fd..f180e41 100644
--- a/assets/scss/app.scss
+++ b/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";
diff --git a/pages/base/mine.vue b/pages/base/mine.vue
index f5f5840..cf0bbfb 100644
--- a/pages/base/mine.vue
+++ b/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>