修改二维码、首页图片、ico

src/components/CommonFooter.vue

@@ -260,7 +260,7 @@
         <div style="font-size: 20px;">{{ $t("homeNewText.cc1") }}</div>
         <router-link class="jump_btn" to="/sign-up" v-if="!isLogin">{{ $t("homeNewText.hh17") }}</router-link>
         <router-link class="jump_btn" to="/exchange" v-else>{{ $t("homeNewText.cc2") }}</router-link>
-        <!-- <img src="@/assets/img/home/qrcode.png" alt="" style="width: 120px;height: 120px;"> -->
+        <img src="@/assets/img/home/qrcode.png" alt="" style="width: 120px;height: 120px;">
         <div style="font-size: 16px; color: #9c9c9c;margin-top: 12px;">{{ $t("homeNewText.cc3") }}</div>
       </div>
     </div>

src/components/CommonHeader.vue

@@ -135,7 +135,7 @@
                         <div class="dropdown-menu download">
                           <div class="dropdown-item">
                             <div style="width:142px;white-space: pre-wrap;line-height: 25px;">{{ $t("homeNewText.cc4") }}</div>
-                            <!-- <img src="@/assets/img/home/qrcode.png" alt=""> -->
+                            <img src="@/assets/img/home/qrcode.png" alt="">
                           </div>
                         </div>
                     </li>

src/components/KLine.vue

@@ -311,7 +311,7 @@ export default {
       this.model.subscribe([
         {
           cmd: "sub",
-          msg: `Kline_${this.symbol}_${this.interval}min`
+          msg: `Kline_${this.symbol}_1day`
         }
       ]);
       // console.log(this.lang)

src/views/contract/account.vue

@@ -18,7 +18,8 @@
                 </div>
                 <div class="d-flex p-3 justify-content-between">
                     <div>{{$t('contract.a3')}}（USDT）</div>
-                    <div>{{(accountInfo.usable_balance).toFixed(2)}}</div>
+                    <!-- <div>{{(accountInfo.usable_balance).toFixed(2)}}</div> -->
+                    <div>{{omitTo(accountInfo.usable_balance,2)}}</div>
                 </div>
                 <!-- <div class="d-flex p-3 justify-content-between">
                     <div>{{$t('contract.a4')}}（USDT）</div>
@@ -47,6 +48,7 @@
     </div>
 </template>
 <script>
+import math from "@/utils/class/math.js";
 export default {
     name:'account',
     props:{
@@ -68,7 +70,7 @@ export default {
         // console.log(this.accountInfo)
     },
     methods:{
-
+		omitTo: math.omitTo,
     }
 };
 </script>

src/views/contract/index.vue

@@ -77,26 +77,31 @@
           <template v-for="parent in contractListFilter">
             <table class="table" :key="parent.coin_name + 1">
               <thead>
-                <tr class="">
+                <!-- <tr class="">
                   <th class="w-9/24">{{ $t("contract.h5") }}</th>
                   <th class="w-7/24 text-right">{{ $t("contract.g3") }}</th>
-                  <th class="w-8/24 text-right">
+                  <th class="w-8/24 text-right">{{ $t("contract.h6") }}</th>
-                    {{ $t("contract.h6") }}
+                </tr> -->
-                  </th>
+				<th class="" style="display:block;width:100%">
-                </tr>
+					<div class="width-32" style="padding-left: 18px;">{{ $t("contract.h5") }}</div>
+					<div class="text-right width-32">{{ $t("contract.g3") }}</div>
+					<div class="text-right width-32">{{ $t("contract.h6") }}</div>
+				</th>
               </thead>
-              <tbody>
+              <tbody class="trade-list">
                 <tr
                   v-for="item in parent.marketInfoList"
                   :key="item.symbol"
                   :class="{ active: item.symbol == activeSymbol }"
                   @click="ispopover1(item.symbol)"
+				  v-show="isShow(item)"
+				  style="display:block"
                 >
-                  <td class="w-9/24 tr-text">
+                  <!-- <td class="w-9/24 tr-text">
                     {{ item.symbol }}/{{ parent.coin_name }}
                   </td>
                   <td class="w-7/24 text-right" >
-                    <!-- :class="item.increase < 0 ? 'decreace' : 'increase'" -->
+                    :class="item.increase < 0 ? 'decreace' : 'increase'"
                     {{ item.close }}
                   </td>
                   <td
@@ -104,7 +109,20 @@
                     :class="item.increase < 0 ? 'decreace' : 'increase'"
                   >
                     {{ item.increaseStr }}
-                  </td>
+                  </td> -->
+				  <td  style="display:block;width:100%;border:none;">
+				  <div class="width-32">
+				  	<div>
+				  		<div style="margin-left: 10px;">{{ item.symbol }}/{{ parent.coin_name }}</div>
+				  	</div>
+				  </div>
+				  <div class="text-right width-32">
+				  	{{ item.close }}
+				  </div>
+				  <div class="text-right width-32" :class="item.increase < 0 ? 'decreace' : 'increase'">
+				  	{{ item.increaseStr }}
+				  </div>
+				  </td>
                 </tr>
               </tbody>
             </table>
@@ -269,22 +287,22 @@ export default {
     activeSymbol() {
       this.holdPosition();
     },
-    filterCoin: {
+    // filterCoin: {
-      handler(n,o){
+    //   handler(n,o){
-        if(!n){
+    //     if(!n){
-          this.contractListFilter = this.contractList;
+    //       this.contractListFilter = this.contractList;
-        }else{
+    //     }else{
-          this.contractListFilter = this.contractList.map((item1, index1)=>{
+    //       this.contractListFilter = this.contractList.map((item1, index1)=>{
-            let arr = item1;
+    //         let arr = item1;
-            arr.marketInfoList = item1.marketInfoList.filter(item2=>{
+    //         arr.marketInfoList = item1.marketInfoList.filter(item2=>{
-              return item2.symbol.indexOf(n.toUpperCase())!=-1
+    //           return item2.symbol.indexOf(n.toUpperCase())!=-1
-            })
+    //         })
-            return arr;
+    //         return arr;
-          })
+    //       })
-        }
+    //     }
-      },
+    //   },
-      immediate: true
+    //   immediate: true
-    }
+    // }
   },
   destroyed() {
     clearInterval(this._time);
@@ -433,7 +451,19 @@ export default {
     },
     enterFilter(){
 
-    }
+    },
+	// 搜索关键字
+	isShow(symbol) {
+		const reg = new RegExp(this.filterCoin, "gi");
+		if (!this.filterCoin) return true;
+		else {
+			// let name = symbol.coinName || symbol.pair;
+			// return name.search(reg) >= 0;
+			let name = symbol.pair_name || symbol.symbol;
+			return name.search(reg) >= 0;
+		}
+		// return !this.keyword || symbol.coinName.concat(symbol.pair).search(reg) >= 0;
+	},
   }
 };
 </script>
@@ -503,4 +533,15 @@ export default {
     .min-width-B{
       min-width: 130px;
     }
+	.trade-list{
+		// width: 23vw;
+		height: 1110px;
+		overflow-y: auto;
+		display: block;
+	}
+	.width-32{
+		display: inline-block !important;
+		vertical-align: top !important;
+		width: 31% !important;
+	}
 </style>

src/views/home/index.vue

@@ -466,7 +466,7 @@
 	  	<div style="width: 480px;">
 	  		<div class="trade_box">
 	  			<div class="trade_img">
-					<!-- <img src="@/assets/img/home/qrcode.png" style="border-radius: 10px;" alt=""> -->
+					<img src="@/assets/img/home/qrcode.png" style="border-radius: 10px;" alt="">
 				</div>
 	  			<div style="margin-left: 15px;">
 	  				<div>{{ $t("homeNewText.hh13") }}</div>