From f2ca5442b2b073bc7f3f9fc9e2e5e12ce87a56b9 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Mon, 13 May 2024 13:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=81=E5=B8=81=E5=92=8C?=
 =?UTF-8?q?=E5=90=88=E7=BA=A6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommonFooter.vue       | 46 ++++--------------
 src/views/contract/exchange-store.vue |  8 +--
 src/views/contract/handicap.vue       |  2 +-
 src/views/contract/index.vue          | 70 ++++++++++++++-------------
 src/views/exchange/book-trades.vue    | 10 ++--
 src/views/exchange/index.vue          | 26 +++++-----
 src/views/exchange/make-deal.vue      |  2 +-
 src/views/exchange/order-list.vue     |  2 +-
 src/views/exchange/symbols.vue        |  4 +-
 src/views/home/index.vue              |  4 +-
 10 files changed, 76 insertions(+), 98 deletions(-)

diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue
index 629db64..e23e0cf 100644
--- a/src/components/CommonFooter.vue
+++ b/src/components/CommonFooter.vue
@@ -8,7 +8,7 @@
           <div class="footer-logo">
             <div style="width: 89px; height: 44px">
               <img
-                :src="appConfig.head_logo"
+                :src="appConfig.foot_logo"
                 alt="logo"
                 style="width: 200px; height: 100%;max-width: 200px; object-fit: contain;"
               />
@@ -17,7 +17,7 @@
           </div>
         </div>
         
-        <div class="footer-upper-section-lang">
+        <div class="footer-upper-section-lang" v-if="0">
           <!-- <button class="navbar-toggler lang_now" type="button"
            data-toggle="collapse" data-target="#lang_menu"
                     aria-controls="lang_menu" aria-expanded="false" aria-label="Toggle navigation">{{ nativeLang }}
@@ -39,16 +39,7 @@
           <!-- service -->
           <div class="service" v-if="service.length>0">
             <div class="item" style="width: 100%;text-align: left">
-              <p
-                class="item_p"
-                style="
-                  
-                  font-size: 20px;
-                  color: #fff;
-                "
-              >
-                {{ $t("common.service") }}
-              </p>
+              <p class="item_p" style="font-size: 20px;color: #fff;">{{ $t("common.service") }}</p>
 			  <p class="foot_p" v-for="(items,index) in service" :key="index">
 			  	  <span class="serviceText" @click="Jump(items.url)">{{items.label}}</span>
 			  </p>
@@ -92,16 +83,7 @@
           <!-- college -->
           <div class="college" style="margin:0 119px;" v-if="college.length>0">
             <div class="item item1" style="width: 100%;text-align: left">
-              <p
-                class="item_p"
-                style="
-                  
-                  font-size: 20px;
-                  color: #fff;
-                "
-              >
-                {{ $t("common.college") }}
-              </p>
+              <p class="item_p" style="font-size: 20px;color: #fff;">{{ $t("common.college") }}</p>
 			  <p class="foot_p" v-for="(item,index) in college" :key="index">
 			  	<span class="serviceText" @click="Jump(item.url)">{{item.label}}</span>
 			  </p>
@@ -141,18 +123,9 @@
           </div>
           <!-- email -->
           <div class="item">
-            <p
-              class="item_p"
-              style="text-align: left; font-size: 20px; color: #fff"
-            >
-              {{ $t("common.contactUs") }}
-            </p>
-            <p class="foot_p" style="font-size: 14px;color: #D3D3D3;">
-              {{ $t("common.email") }}:
-            </p>
-            <p class="foot_p" style="font-size: 14px;color: #D3D3D3;">
-              {{ email }}
-            </p>
+            <p class="item_p" style="text-align: left; font-size: 20px; color: #fff">{{ $t("common.contactUs") }}</p>
+            <p class="foot_p" style="font-size: 14px;color: #D3D3D3;">{{ $t("common.email") }}:</p>
+            <p class="foot_p" style="font-size: 14px;color: #D3D3D3;">{{ email }}</p>
           </div>
           
           <!-- <div class="logo"> -->
@@ -278,8 +251,8 @@
         <div style="font-size: 20px;">{{ $t("homeNewText.hh44",{name:"Ewmcoin"}) }}</div>
 		<router-link class="jump_btn" to="/sign-up" v-if="!isLogin">{{ $t("homeNewText.hh48") }}</router-link>
         <router-link class="jump_btn" to="/exchange" v-else>{{ $t("homeNewText.hh45") }}</router-link>
-        <img src="@/assets/img/home/Ewmlogin.png" alt="" style="width: 120px;height: 120px;background-color: #ccc;">
-        <div style="font-size: 16px; color: #fff;margin-top: 12px;text-align: center;">{{ $t("homeNewText.hh46",{name:"Ewmcoin"}) }}</div>
+        <img src="@/assets/img/home/Ewmlogin.png" alt="" style="width: 120px;height: 120px;background-color: #ccc;" v-if="0">
+        <div style="font-size: 16px; color: #fff;margin-top: 12px;text-align: center;" v-if="0">{{ $t("homeNewText.hh46",{name:"Ewmcoin"}) }}</div>
       </div>
     </div>
   </footer>
@@ -564,6 +537,7 @@ export default {
         }
       }
       .footer-upper-section-list {
+		  margin-top: 100px;
         display: flex;
         justify-content: space-between;
       }
diff --git a/src/views/contract/exchange-store.vue b/src/views/contract/exchange-store.vue
index 511b076..d994bcd 100644
--- a/src/views/contract/exchange-store.vue
+++ b/src/views/contract/exchange-store.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="markets-pair-list exchange-store bg-plain" style="margin-top: 8px;">
     <div class="px-3 pri">
-      <div class="nav nav-pills" style="border-bottom: 1px solid #2e2e2e;">
+      <div class="nav nav-pills" style="border-bottom: 1px solid #e0e3eb;">
         <div class="nav-item">
           <a class="nav-link" :class="{ active: form.type == 2 }" @click="form.type = 2">{{ $t("contract.d9") }}</a>
         </div>
@@ -16,7 +16,7 @@
       </div>
       <div class="flex-fill px-3 justify-content-end d-flex align-items-center" style="background-color: #F2F2F2;width:50%;text-align: center;">
         <el-popover style="display: block;width: 100%;" placement="bottom" width="100" v-model="visible" trigger="manual">
-          <div class="rounded border p-1 bg-black pointer" slot="reference" @click="visible = !visible">
+          <div class="rounded p-1 bg-black pointer" slot="reference" @click="visible = !visible">
             <!-- {{ $t("contract.b0") }} -->
             <span class="fn-16" style="color: #999999;"> {{ form.lever_rate }}X </span>
             <i class="el-icon-edit text-primary"></i>
@@ -693,11 +693,11 @@ export default {
     .exchange-store .input-group-text{
       background-color: #F2F2F2;
       color: #999999;
-      border-color:  #999999 !important;
+      border-color:  #D3D3D3 !important;
     }
     .exchange-store .form-control{
       height: 44px !important;
-      border-color: #999999 !important;
+      border-color: #D3D3D3 !important;
     }
     .el-icon-sort:before{
       color: #2C60DC;
diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue
index acf3ea7..0d68d51 100644
--- a/src/views/contract/handicap.vue
+++ b/src/views/contract/handicap.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="markets-pair-list handicap bg-plain" style="width: 100%;">
-    <div class="nav nav-pills" style="border-bottom: 1px solid #2e2e2e;">
+    <div class="nav nav-pills" style="border-bottom: 1px solid #e0e3eb;">
       <div class="nav-item">
         <a class="nav-link" :class="{ active: tab == 1 }" @click="tab = 1">{{ $t("contract.f7") }}</a>
       </div>
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index a658f45..f769a23 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="contract-page" style="">
+	<div class="contract-page" style="background-color: #F8F8F8;">
 		<!--    <div class="banner-block col-xs-8">-->
 		<!--        <el-carousel :interval="6000" height="450px">-->
 		<!--          <el-carousel-item v-for="item in pcBannerList" :key="item.id">-->
@@ -16,7 +16,7 @@
 			</div>
 			<div class="d-flex fn-14 px-4 p-l-A align-items-center py-2">
 				<div class="item px-2 min-width-A">
-					<div class="title" :class="{ decreace2: activeContract.increase < 0, increase: activeContract.increase >= 0}">
+					<div class="title" :class="{ decreace2: activeContract.increase < 0, increase: activeContract.increase >= 0}" style="margin-bottom: 10px;">
 						{{ activeContract.price }}
 					</div>
 					<div :class="{ decreace2: activeContract.increase < 0, increase: activeContract.increase >= 0}">
@@ -27,7 +27,7 @@
 			<!-- 币种价值数据 -->
 			<div class="d-flex fn-14">
 				<div class="item px-2 min-width-B">
-					<div class="title mb-1 text-secondary">
+					<div class="title text-secondary" style="margin-bottom: 10px;">
 						24h {{ $t("contract.h7") }}
 					</div>
 					<div class="fn-12" style="color: #a8263b;">
@@ -35,7 +35,7 @@
 					</div>
 				</div>
 				<div class="item px-2 min-width-B">
-					<div class="title mb-1 text-secondary">
+					<div class="title text-secondary" style="margin-bottom: 10px;">
 						24h {{ $t("contract.h8") }}
 					</div>
 					<div class="fn-12" style="color: #a8263b;">
@@ -43,7 +43,7 @@
 					</div>
 				</div>
 				<div class="item px-2 min-width-B">
-					<div class="title mb-1 text-secondary">
+					<div class="title text-secondary" style="margin-bottom: 10px;">
 						24h {{ $t("contract.h9") }}
 						(USDT)
 					</div>
@@ -284,32 +284,7 @@
 						this.contractList = data;
 						if (this.filterCoin == '') {
 							this.contractListFilter = data;
-							this.Liste = []
-							this.contractListFilter[0].marketInfoList.map(item=>{
-								this.imge[0].marketInfoList.map(items=>{
-									if(item.symbol==items.symbol){
-										this.Liste.push({
-											amount:item.amount,
-											close:item.close,
-											count: item.count,
-											high:item.high,
-											id: item.id,
-											increase: item.increase,
-											increaseStr: item.increaseStr,
-											low: item.low,
-											mrid: item.mrid,
-											open: item.open,
-											pair_name: item.pair_name,
-											price:item.price,
-											symbol: item.symbol,
-											trade_turnover: item.trade_turnover,
-											type: item.type,
-											vol: item.vol,
-											icon:items.icon
-										})
-									}
-								})
-							})
+							this.Listes();
 							// console.log(this.Liste,'2222');
 						}
 					} else if (cmd == "ping") {
@@ -330,6 +305,34 @@
 					this.$refs.handicap.linkSocket()
 				});
 			},
+			Listes(){
+				this.Liste = []
+				this.contractListFilter[0].marketInfoList.map(item=>{
+					this.imge[0].marketInfoList.map(items=>{
+						if(item.symbol==items.symbol){
+							this.Liste.push({
+								amount:item.amount,
+								close:item.close,
+								count: item.count,
+								high:item.high,
+								id: item.id,
+								increase: item.increase,
+								increaseStr: item.increaseStr,
+								low: item.low,
+								mrid: item.mrid,
+								open: item.open,
+								pair_name: item.pair_name,
+								price:item.price,
+								symbol: item.symbol,
+								trade_turnover: item.trade_turnover,
+								type: item.type,
+								vol: item.vol,
+								icon:items.icon
+							})
+						}
+					})
+				})
+			},
 			// 获取合约市场
 			getMarketList() {
 				this.currentIcon = "";
@@ -340,6 +343,7 @@
 						this.contractList = res;
 						if (this.filterCoin == '') {
 							this.contractListFilter = res;
+							// this.Listes();
 						}
 						// 默认值
 						let firstParent = res[0];
@@ -476,7 +480,7 @@
 		width: 95%;
 		height: 40px;
 		margin: 10px auto;
-		border: 1px solid #2e2e2e;
+		border: 1px solid #D9D9D9;
 		border-radius: 5px;
 		color: #2e2e2e;
 		align-items: center;
@@ -490,7 +494,7 @@
 		input {
 			background-color: transparent;
 			border: none;
-			border-left: 1px solid #2e2e2e;
+			border-left: 1px solid #D9D9D9;
 			padding: 0px 10px;
 			height: 40px;
 			font-size: 16px;
diff --git a/src/views/exchange/book-trades.vue b/src/views/exchange/book-trades.vue
index d72aece..1cfcc0d 100644
--- a/src/views/exchange/book-trades.vue
+++ b/src/views/exchange/book-trades.vue
@@ -1,6 +1,6 @@
 <template>
-<div class="col-md-3">
-    <div class="order-book mb15">
+<div class="col-md-3" style="margin-top: 10px;">
+    <div class="order-book mb15" style="border: 0px;">
         <h2 class="heading">{{ $t("exchange.order-book") }}</h2>
         <table class="table">
             <thead>
@@ -73,7 +73,7 @@
             </tbody>
         </table>
     </div>
-    <div class="market-history">
+    <div class="market-history" style="border: 0px;">
         <ul class="nav nav-pills" role="tablist">
             <li class="nav-item">
                 <a class="nav-link active" data-toggle="pill" href="#recent-trades" role="tab" aria-selected="true">
@@ -379,7 +379,7 @@ export default {
 </style>
 <style lang="scss" scoped>
 .ob-heading {
-    border: 1px solid #333;
-    box-shadow: 0 0 5px #555;
+    border: 1px solid #e0e3eb;
+    box-shadow: 0 0 5px #e0e3eb;
 }
 </style>
diff --git a/src/views/exchange/index.vue b/src/views/exchange/index.vue
index 2e45a0e..702eebe 100644
--- a/src/views/exchange/index.vue
+++ b/src/views/exchange/index.vue
@@ -15,29 +15,29 @@
 			      {{ activeContract.pair_name }}
 			    </div>
 				<div class="price px-3 border-right" :class="{ decreace: activeContract.increase < 0, increace: activeContract.increase >= 0}">
-				  <div class="current">{{ activeContract.price }}$</div>
+				  <div class="current" style="margin-bottom: 10px;">{{ activeContract.price }}$</div>
 				  <div class="zf">{{ activeContract.increaseStr }}</div>
 				</div>
 			    <!-- 币种价值数据 -->
-			    <div class="d-flex fn-12">
-			      <div class="item px-2">
-			        <div class="title mb-1 text-secondary" style="font-size: 16px;">24h {{ $t("contract.h7") }}</div>
-			        <div style="color: #000;font-weight: bold;font-size: 16px;">{{ activeContract.high }}</div>
+			    <div class="d-flex fn-12" style="margin-left: 8px;">
+			      <div class="item px-2 pl-2 pr-2" style="width: 130px;margin-left: ;">
+			        <div class="title text-secondary" style="font-size: 16px;margin-bottom: 10px;">24h {{ $t("contract.h7") }}</div>
+			        <div style="color: #000;font-weight: bold;font-size: 12px;">{{ activeContract.high }}</div>
 			      </div>
-			      <div class="item px-2">
-			        <div class="title mb-1 text-secondary" style="font-size: 16px;">24h {{ $t("contract.h8") }}</div>
-			        <div style="color: #000;font-weight: bold;font-size: 16px;">{{ activeContract.low }}</div>
+			      <div class="item px-2 pl-2 pr-2" style="width: 130px;">
+			        <div class="title text-secondary" style="font-size: 16px;margin-bottom: 10px;">24h {{ $t("contract.h8") }}</div>
+			        <div style="color: #000;font-weight: bold;font-size: 12px;">{{ activeContract.low }}</div>
 			      </div>
-			      <div class="item px-2">
-			        <div class="title mb-1 text-secondary" style="font-size: 16px;">24h {{ $t("contract.h9") }}</div>
-			        <div style="color: #000;font-weight: bold;font-size: 16px;">{{ activeContract.vol }}</div>
+			      <div class="item px-2 pl-2 pr-2" style="width: 150px;">
+			        <div class="title text-secondary" style="font-size: 16px;margin-bottom: 10px;">24h {{ $t("contract.h9") }}</div>
+			        <div style="color: #000;font-weight: bold;font-size: 12px;">{{ activeContract.vol }}</div>
 			      </div>
 			    </div>
 			  </div>
 			</div>
 		</div>
-		<div class="container-fluid no-fluid" style="background-color: #F8F8F8;padding: 15px 0;">
-			<div class="row sm-gutters">
+		<div class="container-fluid no-fluid" style="background-color: #F8F8F8;">
+			<div class="row sm-gutters" style="background-color: #F8F8F8;">
 
 				<!-- symbols -->
 				<symbols :marketList="marketList" :marketId="marketId" :isLogin="isLogin" :symbol.sync="symbol" >
diff --git a/src/views/exchange/make-deal.vue b/src/views/exchange/make-deal.vue
index 2807553..9a15bc6 100644
--- a/src/views/exchange/make-deal.vue
+++ b/src/views/exchange/make-deal.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="col-md-6">
+<div class="col-md-6" style="margin-top: 10px;">
     <div class="px-4 py-2 heading" style="background-color: #fff;">
          <!-- <theme-change/> -->
          <el-tooltip placement="bottom" effect="light">
diff --git a/src/views/exchange/order-list.vue b/src/views/exchange/order-list.vue
index c09b53a..bfd9244 100644
--- a/src/views/exchange/order-list.vue
+++ b/src/views/exchange/order-list.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="col-md-9">
-		<div class="exchange-history order-history market-order mt15" style="background-color: #fff;">
+		<div class="exchange-history order-history market-order mt15" style="background-color: #fff;border: 0px;">
 			<ul class="nav nav-pills" role="tablist">
 				<li class="nav-item" @click="toggle('opens')">
 					<a class="nav-link active" data-toggle="pill" href="#open-orders" role="tab" aria-selected="true">
diff --git a/src/views/exchange/symbols.vue b/src/views/exchange/symbols.vue
index 0e5ead4..afed027 100644
--- a/src/views/exchange/symbols.vue
+++ b/src/views/exchange/symbols.vue
@@ -1,6 +1,6 @@
 <template>
-<div class="col-md-3" style="background-color: #fff;">
-    <div class="market-pairs">
+<div class="col-md-3" style="background-color: #fff;margin-top: 10px;">
+    <div class="market-pairs" style="border: 0px;">
 
         <!-- 搜索框区域 -->
         <div class="input-group">
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f292941..938387a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -177,10 +177,10 @@
 								</div>
 								<div class="started_text">{{ $t("homeNewText.hh20") }}</div>
 								<div class="started_text1" style="font-size: 14px;">{{ $t("homeNewText.hh21",{name:"Ewmcoin"}) }}</div>
-								<router-link v-if="!isLogin" class="started_bottom" :to="{name:'signUp'}">
+								<router-link v-if="!isLogin" class="started_bottom" :to="{name:'signUp'}" style="text-align: center;">
 									{{ $t("homeNewText.hh22") }}
 								</router-link>
-								<router-link v-else class="started_bottom" :to="{name:'exchange'}">
+								<router-link v-else class="started_bottom" :to="{name:'exchange'}" style="text-align: center;">
 									{{ $t("homeNewText.hh22") }}
 								</router-link>
 							</div>