From 34dcf46d3e5c8ec3088757ca300043a15b08df68 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Fri, 30 Aug 2024 18:04:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i18n/lang/de.json                       |  1 +
 i18n/lang/en.json                       |  1 +
 i18n/lang/fra.json                      |  1 +
 i18n/lang/it.json                       |  1 +
 i18n/lang/jp.json                       |  1 +
 i18n/lang/kor.json                      |  1 +
 i18n/lang/pt.json                       |  1 +
 i18n/lang/spa.json                      |  1 +
 i18n/lang/tr.json                       |  1 +
 i18n/lang/zh-TW.json                    |  1 +
 pages/auth/primary.vue                  |  8 +++++---
 pages/base/home.vue                     |  6 +++---
 pages/base/mine.vue                     |  4 ++++
 pages/exchange/contract-history.vue     | 21 +++++++++++++++++++--
 pages/exchange/exchange-transaction.vue |  2 +-
 pages/exchange/open-position.vue        |  2 +-
 pages/safe/email.vue                    |  2 +-
 17 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/i18n/lang/de.json b/i18n/lang/de.json
index 1f3c7aa..1904150 100644
--- a/i18n/lang/de.json
+++ b/i18n/lang/de.json
@@ -237,6 +237,7 @@
 		"d11": "Telefon Nummer",
 		"d12": "Bitte geben Sie die Mobiltelefonnummer ein",
 		"d13": "Bitte wählen",
+		"d14": "Datum auswählen",
 		"SelectAreaCode": "Vorwahl auswählen"
 	},
 	"exchange": {
diff --git a/i18n/lang/en.json b/i18n/lang/en.json
index 046d9b5..5a5690b 100644
--- a/i18n/lang/en.json
+++ b/i18n/lang/en.json
@@ -240,6 +240,7 @@
 		"d11": "Phone Number",
 		"d12": "Please enter your phone number",
 		"d13": "Please select",
+		"d14": "Select date",
 		"SelectAreaCode": "Select Area Code"
 	},
 	"exchange": {
diff --git a/i18n/lang/fra.json b/i18n/lang/fra.json
index 9b8307a..8940702 100644
--- a/i18n/lang/fra.json
+++ b/i18n/lang/fra.json
@@ -237,6 +237,7 @@
 		"d11": "Numéro de téléphone",
 		"d12": "Veuillez saisir le numéro de téléphone",
 		"d13": "Veuillez sélectionner",
+		"d14": "Sélectionner une date",
 		"SelectAreaCode": "sélectionner l'indicatif régional"
 	},
 	"exchange": {
diff --git a/i18n/lang/it.json b/i18n/lang/it.json
index 3678c95..24ac825 100644
--- a/i18n/lang/it.json
+++ b/i18n/lang/it.json
@@ -237,6 +237,7 @@
 		"d11": "numero di telefono",
 		"d12": "Inserisci il numero di telefono cellulare",
 		"d13": "Seleziona",
+		"d14": "Seleziona la data",
 		"SelectAreaCode": "selezionare il prefisso"
 	},
 	"exchange": {
diff --git a/i18n/lang/jp.json b/i18n/lang/jp.json
index 2ea34e2..4c9673f 100644
--- a/i18n/lang/jp.json
+++ b/i18n/lang/jp.json
@@ -237,6 +237,7 @@
 		"d11": "電話番号",
 		"d12": "携帯の番号を入力してください",
 		"d13": "選択してください",
+		"d14": "日付を選択してください",
 		"SelectAreaCode": "市外局番を選択してください"
 	},
 	"exchange": {
diff --git a/i18n/lang/kor.json b/i18n/lang/kor.json
index e978a8f..b812788 100644
--- a/i18n/lang/kor.json
+++ b/i18n/lang/kor.json
@@ -237,6 +237,7 @@
 		"d11": "전화 번호",
 		"d12": "핸드폰 번 호 를 입력 하 세 요.",
 		"d13": "선택 하 세 요.",
+		"d14": "날짜 선택",
 		"SelectAreaCode": "지역번호 선택"
 	},
 	"exchange": {
diff --git a/i18n/lang/pt.json b/i18n/lang/pt.json
index e8fd2ac..c4d6f9d 100644
--- a/i18n/lang/pt.json
+++ b/i18n/lang/pt.json
@@ -237,6 +237,7 @@
 		"d11": "Número de telefone",
 		"d12": "Por favor, digite o número de telefone celular",
 		"d13": "Por favor, escolha",
+		"d14": "Selecione a data",
 		"SelectAreaCode": "selecione o código de área"
 	},
 	"exchange": {
diff --git a/i18n/lang/spa.json b/i18n/lang/spa.json
index e2b1ab0..a9bb40c 100644
--- a/i18n/lang/spa.json
+++ b/i18n/lang/spa.json
@@ -237,6 +237,7 @@
 		"d11": "Número de teléfono",
 		"d12": "Por favor, introduzca el número de teléfono",
 		"d13": "Por favor, elija",
+		"d14": "Seleccione fecha",
 		"SelectAreaCode": "seleccionar código de área"
 	},
 	"exchange": {
diff --git a/i18n/lang/tr.json b/i18n/lang/tr.json
index f1d084a..fbad3b5 100644
--- a/i18n/lang/tr.json
+++ b/i18n/lang/tr.json
@@ -237,6 +237,7 @@
 		"d11": "Telefon numarası",
 		"d12": "Lütfen telefon numarasını girin",
 		"d13": "Lütfen seç",
+		"d14": "Tarih seç",
 		"SelectAreaCode": "alan kodunu seçin"
 	},
 	"exchange": {
diff --git a/i18n/lang/zh-TW.json b/i18n/lang/zh-TW.json
index fdfb743..33461f0 100644
--- a/i18n/lang/zh-TW.json
+++ b/i18n/lang/zh-TW.json
@@ -239,6 +239,7 @@
 		"d11": "電話號碼",
 		"d12": "請輸入手機號",
 		"d13": "請選擇",
+		"d14": "選擇日期",
 		"SelectAreaCode": "選擇區號"
 	},
 	"exchange": {
diff --git a/pages/auth/primary.vue b/pages/auth/primary.vue
index b31e25b..ae5fd2b 100644
--- a/pages/auth/primary.vue
+++ b/pages/auth/primary.vue
@@ -10,16 +10,18 @@
         </view>
       </view>
 			<!-- 出生日期 -->
-			<view class="form-item border-b p-md m-b-md" v-if="0">
+			<view class="form-item border-b p-md m-b-md">
 			 <view class="label m-b-xs">{{$t('auth.d0')}}</view>
 			 <view class="input color-light" >
-			   <uni-datetime-picker
+			   <!-- <uni-datetime-picker
 			   	type="date"
 			   	:value="single"
 			   	start="1900-1-1"
 			   	end="2050-12-12"
 			   	@change="selectDate"
-			   />
+			   /> -->
+			   <uni-datetime-picker type="date" :placeholder="$t('auth.d14')" start="1873-1-01" :end="new Date().toLocaleDateString()"
+			   :clear-icon="false" v-model="form.birthday" @maskClick="maskClick" />
 			 </view>
 			</view>
 			<!-- 证件号类型 -->
diff --git a/pages/base/home.vue b/pages/base/home.vue
index cc3483d..1a32bc9 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -291,19 +291,19 @@
 				<view class="Trading">
 					<view class="Trading_box">{{ $t("homeNewText.hh23") }}</view>
 					<view><image src="@/assets/img/home/home12.png" style="width: 674rpx;height: 450rpx;"></image></view>
-					<a class="Trading_a">
+					<a href="https://app.coinobserv.com/download/Coinobserv.html" class="Trading_a">
 						<view class="Trading_a_box">
 							<view style="margin-right: 10rpx;"><image src="@/assets/img/home/antFill-apple@2x.png" style="width: 48rpx;height: 48rpx;"></image></view>
 							<view>App Store</view>
 						</view>
 					</a>
-					<a class="Trading_a" style="margin-top: 40rpx;">
+					<a href="https://app.coinobserv.com/download/Coinobserv.html" class="Trading_a" style="margin-top: 40rpx;">
 						<view class="Trading_a_box">
 							<view style="margin-right: 10rpx;"><image src="@/assets/img/home/fa-android@2x.png" style="width: 48rpx;height: 48rpx;"></image></view>
 							<view>Android APK</view>
 						</view>
 					</a>
-					<a class="Trading_a" style="margin-top: 40rpx;">
+					<a href="https://app.coinobserv.com/download/Coinobserv.html" class="Trading_a" style="margin-top: 40rpx;">
 						<view class="Trading_a_box">
 							<view style="margin-right: 10rpx;"><image src="@/assets/img/home/riFill-google-play-fill@2x.png" style="width: 48rpx;height: 48rpx;"></image></view>
 							<view>Google Play</view>
diff --git a/pages/base/mine.vue b/pages/base/mine.vue
index d7c83cf..e810248 100644
--- a/pages/base/mine.vue
+++ b/pages/base/mine.vue
@@ -230,6 +230,7 @@
 							</view>
 							<view class="h-4 m-t-xs"></view>
 						</router-link>
+						<van-empty class="bg-panel-3" v-if="filteredList.length === 0" :description="$t('contract.d0')"/>
 					</view>
 					<!-- </van-tab>
 
@@ -328,6 +329,9 @@
 				hideMoney: "hideMoney",
 				theme: "theme",
 			}),
+			filteredList() {
+			    return this.list.filter(item => this.ifShow(item));
+			}
 		},
 		props: {
 			isShow: {
diff --git a/pages/exchange/contract-history.vue b/pages/exchange/contract-history.vue
index eb95076..036b340 100644
--- a/pages/exchange/contract-history.vue
+++ b/pages/exchange/contract-history.vue
@@ -47,7 +47,7 @@
           </div>
           <div class="row d-flex m-y-mini justify-between">
             <div class="label fn-sm">{{$t('contract.c7')}}</div>
-            <div class="color-light">{{item.profit*1||'--'}}</div>
+            <div :class="color_text(item)">{{item.profit*1||'--'}}</div>
           </div>
           <div class="row d-flex m-y-mini justify-between">
             <div class="label fn-sm">{{$t('contract.b3')}}</div>
@@ -360,7 +360,15 @@ export default {
         myCanvas.width=0
         myCanvas.height=0
     },
-
+	color_text(item){
+		if(item && item.profit && item.profit.indexOf('-') === 0){
+			return 'red'
+		}else if(item.profit == null){
+			return 'black'
+		}else{
+			return 'green'
+		}
+	}
   },
     mounted() {
       // this.generalizeInfo()
@@ -404,4 +412,13 @@ export default {
   /deep/ .share.vant-popup-index{
       z-index: 100;
   }
+  .red{
+	  color: red;
+  }
+  .green{
+	  color: green;
+  }
+  .black{
+	  color: black;
+  }
 </style>
diff --git a/pages/exchange/exchange-transaction.vue b/pages/exchange/exchange-transaction.vue
index 72ecd8f..9c635ce 100644
--- a/pages/exchange/exchange-transaction.vue
+++ b/pages/exchange/exchange-transaction.vue
@@ -260,7 +260,7 @@
 										<span class="fn-12 " style="font-size: 16px;">{{$t("purchase.a9")}}</span> 
 									</v-link>
               </view>
-              <van-empty v-if="!Object.values(list).length" description="" />
+              <van-empty v-if="!Object.values(list).length" :description="$t('contract.d0')" />
               <view v-for="item in (list)" class="item border-b fn-14" :key="item.order_no">
                 <view class="p-x-md p-y-xs">
                   <view class="row d-flex m-y-xs">
diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue
index d7df863..0fcccb5 100644
--- a/pages/exchange/open-position.vue
+++ b/pages/exchange/open-position.vue
@@ -473,7 +473,7 @@
                   </view>
                 </view>
             </template>
-            <van-empty class="bg-panel-3" v-if="!list.length&&active==0" description="" />
+            <van-empty class="bg-panel-3" v-if="!list.length&&active==0" :description="$t('contract.d0')" />
 
             <template v-if="active==1">
                 <view
diff --git a/pages/safe/email.vue b/pages/safe/email.vue
index 0aa43a7..754e8c4 100644
--- a/pages/safe/email.vue
+++ b/pages/safe/email.vue
@@ -37,7 +37,7 @@
         </view>
       </view>
     </main>
-    <view class="p-md bg-panel-4">
+    <view class="p-md bg-panel-4" v-if="0">
       <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" />