From 595045b73675d076bad237a6345c3389c1ee83a5 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Tue, 11 Jun 2024 11:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7=E7=9A=84?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=EF=BC=8C=E9=9A=90=E8=97=8F=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/assets/address-list.vue      |  5 ++--
 pages/auth/senior.vue              |  2 +-
 pages/base/mine.vue                | 37 +++++++++++++++---------------
 pages/otc/detail.vue               |  4 ++--
 pages/safe/email.vue               |  2 +-
 pages/safe/google.vue              |  2 +-
 wxcomponents/vant/search/index.vue |  2 +-
 7 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/pages/assets/address-list.vue b/pages/assets/address-list.vue
index 473833b..6d99ee3 100644
--- a/pages/assets/address-list.vue
+++ b/pages/assets/address-list.vue
@@ -11,8 +11,8 @@
     <main class="layout-main p-t-md">
       <view class="p-md fn-sm">
         <ul>
-          <li class="m-b-xs">·{{ $t("assets.a1") }}。</li>
-          <li>·API{{ $t("assets.a2", { name: "API" }) }}。</li>
+          <li class="m-b-xs">·{{ $t("assets.a1") }}{{lang=='zh-TW'||lang=='jp'?'。':'.'}}</li>
+          <li>·API{{ $t("assets.a2", { name: "API" }) }}{{lang=='zh-TW'||lang=='jp'?'。':'.'}}</li>
         </ul>
       </view>
       <template v-for="parentItem in list">
@@ -118,6 +118,7 @@ export default {
       del: false,
       list: [],
       query: {},
+	  lang: uni.getStorageSync('language')
     };
   },
   computed: {},
diff --git a/pages/auth/senior.vue b/pages/auth/senior.vue
index 6b09c7a..7309e65 100644
--- a/pages/auth/senior.vue
+++ b/pages/auth/senior.vue
@@ -94,7 +94,7 @@ export default {
             Profile.topAuth(data, {btn: this.$refs.btn})
                 .then(() => {
                     // alert($t('auth.c4') );
-                    this.$toast.success(this.$t('auth.c4') + "。");
+                    this.$toast.success(this.$t('auth.c4') + ".");
                     clearTimeout(this.timer); //清除延迟执行
                     this.timer = setTimeout(()=>{  //设置延迟执行
                         this.$router.push("/pages/base/index");
diff --git a/pages/base/mine.vue b/pages/base/mine.vue
index e203952..5c0f0d3 100644
--- a/pages/base/mine.vue
+++ b/pages/base/mine.vue
@@ -30,32 +30,32 @@
 					<v-link tag="view" to="/pages/assets/recharge" v-if="user_auth_level==1" @click="getAuthInfo"
 						class="manage_text">
 						<img src="@/assets/img/home/Make.png" alt="" class="h-25" />
-						<view class="color-light fn-middle fn-ms">{{$t("base.b5")}}</view>
+						<view class="color-light fn-middle fn-ms" style="text-align: center;">{{$t("base.b5")}}</view>
 					</v-link>
 					<v-link tag="view" to="/pages/auth/primary" v-if="user_auth_level==0" @click="getAuthInfo"
 						class="manage_text">
 						<img src="@/assets/img/home/Make.png" alt="" class="h-25" />
-						<view class="color-light fn-middle fn-ms">{{$t("base.b5")}}</view>
+						<view class="color-light fn-middle fn-ms" style="text-align: center;">{{$t("base.b5")}}</view>
 					</v-link>
 					<v-link tag="view" to="/pages/assets/draw" class="manage_text">
 						<img src="@/assets/img/home/currency.png" alt="" class="h-25" />
-						<view class="color-light fn-ms">{{$t("base.b6")}}</view>
+						<view class="color-light fn-ms" style="text-align: center;">{{$t("base.b6")}}</view>
 					</v-link>
 					<v-link tag="view" to="/pages/transfer/index" class="manage_text">
 						<img src="@/assets/img/home/transfer.png" alt="" class="h-25" />
-						<view class="color-light fn-ms">{{$t("base.d8")}}</view>
+						<view class="color-light fn-ms" style="text-align: center;">{{$t("base.d8")}}</view>
 					</v-link>
-					<v-link tag="view" :to="{path: '/pages/exchange/his',query: { symbol: symbol }}" class="manage_text">
+					<v-link tag="view" :to="{path: '/pages/exchange/his'}" class="manage_text">
 						<img src="@/assets/img/home/check.png" alt="" class="h-25" />
-						<view class="color-light fn-ms">{{$t("base.h1")}}</view>
+						<view class="color-light fn-ms" style="text-align: center;">{{$t("base.h1")}}</view>
 					</v-link>
 				</view> -->
 			
-				<view class="m-t-ms p-b-ms w-max " style="margin-top: 10px" v-if="0">
+				<view class="m-t-ms p-b-ms w-max " style="margin-top: 10px">
 					<view class="d-flex justify-between align-center rounded-lg">
 						<v-link tag="view"
 							:to="ProfileDetail.primary_status!=1?'/pages/auth/index':'/pages/assets/recharge'"
-							class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center">
+							class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center" style="background-color: #fff;">
 							<view class="m-r-xs d-flex align-center">
 								<img src="static/img/13.png" alt="" class="h-25" />
 							</view>
@@ -63,14 +63,14 @@
 						</v-link>
 						<v-link tag="view"
 							:to="ProfileDetail.status==1?'/pages/auth/index':(ProfileDetail.status==2?'/pages/assets/draw':'/pages/auth/senior')"
-							class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center">
+							class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center" style="background-color: #fff;">
 							<view class="m-r-xs d-flex align-center">
 								<img src="static/img/5.png" alt="" class="h-25" />
 							</view>
 							<text class="color-light fn-ms">{{$t("base.b6")}}</text>
 						</v-link>
 						<v-link tag="view" to="/pages/transfer/index"
-							class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center">
+							class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center" style="background-color: #fff;">
 							<view class="m-r-xs d-flex align-center">
 								<img src="static/img/hua.png" alt="" class="h-25" />
 							</view>
@@ -102,7 +102,7 @@
               {{$t('otc.d5')}}
           </view> -->
 				<!-- </view> -->
-				<view style="padding: 15px;background-color: #F6F9FF;" @click="showPopup">
+				<view style="padding: 15px;background-color: #F6F9FF;" @click="showPopup" v-if="0">
 					<view style="background-color: #fff;border-radius: 10px;padding: 15px;display: flex;align-items: center;justify-content: space-between;">
 						<view style="display: flex;align-items: center;">
 							<view style="background-color: #ECF1FF;padding: 10px;border-radius: 50px;height: 24px;margin-right: 10px;">
@@ -707,14 +707,15 @@
 			.popup_box_a_box1{
 				display: flex;
 				align-items: center;
-				
-				.popup_box_a_img{
-					height: 20px;
-					padding: 10px;
-					border-radius: 50px;
-					background-color: #ECF1FF;
-				}
 			}
 		}
 	}
+	.popup_box_a_img{
+		height: 20px;
+		padding: 10px;
+		margin-bottom: 5px;
+		border-radius: 50px;
+		background-color: #fff;
+		// background-color: #ECF1FF;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/otc/detail.vue b/pages/otc/detail.vue
index 3230e99..ea16be6 100644
--- a/pages/otc/detail.vue
+++ b/pages/otc/detail.vue
@@ -247,7 +247,7 @@ export default {
       this.$dialog
         .confirm({
           title: this.$t("otc.d0"),
-          message: this.$t("otc.h0") + "。",
+          message: this.$t("otc.h0") + ".",
           confirmButtonText: this.$t("common.confirm"),
           cancelButtonText: this.$t("common.cancel"),
           type: "warning",
@@ -270,7 +270,7 @@ export default {
       this.$dialog
         .confirm({
            title: this.$t("otc.d0"),
-          message: this.$t('otc.h1')+"。",
+          message: this.$t('otc.h1')+".",
           confirmButtonText: this.$t("common.confirm"),
           cancelButtonText: this.$t("common.cancel"),
           type: "warning",
diff --git a/pages/safe/email.vue b/pages/safe/email.vue
index 0aa43a7..53ae468 100644
--- a/pages/safe/email.vue
+++ b/pages/safe/email.vue
@@ -38,7 +38,7 @@
       </view>
     </main>
     <view class="p-md bg-panel-4">
-      <v-button block class="w-max" type="theme" ref="btn" @click="chnageEmail">{{user.email?$t('safe.a0'):$t('safe.a1')}}</v-button>
+      <!-- <v-button block class="w-max" type="theme" ref="btn" @click="chnageEmail">{{user.email?$t('safe.a0'):$t('safe.a1')}}</v-button> -->
     </view>
     <van-toast id="van-toast" />
   </v-page>
diff --git a/pages/safe/google.vue b/pages/safe/google.vue
index d8874f4..480f8ef 100644
--- a/pages/safe/google.vue
+++ b/pages/safe/google.vue
@@ -6,7 +6,7 @@
     <main v-show="step==1&&!user.google_token" class="layout-main bg-panel-4 p-t-md">
       <view
         class="p-x-md p-y-xs bg-theme-1-transparent color-theme-1 fn-sm"
-      >{{$t('safe.c0')}}。</view>
+      >{{$t('safe.c0')}}.</view>
       <!-- 二维码 -->
       <view class="row p-md fn-center code-box">
         <v-qr class="v-qr" :text="googleToken.qrcode_url"></v-qr>
diff --git a/wxcomponents/vant/search/index.vue b/wxcomponents/vant/search/index.vue
index 22eb900..c158b88 100644
--- a/wxcomponents/vant/search/index.vue
+++ b/wxcomponents/vant/search/index.vue
@@ -12,7 +12,7 @@
 
   <view v-if="showAction || useActionSlot" class="van-search__action" hover-class="van-search__action--hover" hover-stay-time="70">
     <slot v-if="useActionSlot" name="action"></slot>
-    <view v-else @click="onCancel" class="cancel-class">{{ actionText }}</view>
+    <view v-else @click="onCancel" class="cancel-class">{{ $t('common.cancel') }}</view>
   </view>
 </view></uni-shadow-root>
 </template>