修改合约平仓弹出框组件问题、修改首页数据、点击返回时直接返回到首页

pages/base/home.vue

@@ -196,8 +196,8 @@
 								</view>
 								<v-link :to="{path: '/pages/exchange/index',query: { code: item.pair_name },}"
 									class="m-b-md m-x-md rounded-xs link-active d-flex justify-between align-center p-y-xs box-size p-x-xs"
-									v-for="item in parentItem.collect ? collect.slice(0,5) : parentItem.marketInfoList.slice(0,5)"
+									v-for="item in parentItem.collect ? collect.slice(0,5) : parentItem.marketInfoList" :key="item.pair_name"
-									:key="item.pair_name">
+									v-if="item.coin_name=='BTC'||item.coin_name=='ETH'||item.coin_name=='ETC'||item.coin_name=='BCH'||item.coin_name=='DOGE'">
 									<view class="fn-left w-5/12">
 										<view class="d-flex align-center">
 											<image :src="item.coin_icon" mode=""

pages/exchange/index.vue

@@ -2,7 +2,8 @@
   <v-page>
     <v-header :leftClick="() => {}" :left-arrow="false">
       <template #left>
-        <view @click="$back(-1)">
+        <!-- <view @click="$back(-1)"> -->
+        <view @click="torouter">
           <i class="van-icon van-icon-arrow-left van-nav-bar__arrow"></i>
         </view>
         <view
@@ -498,6 +499,9 @@ export default {
         }
       });
     },
+	torouter(){
+		this._router.replace("/pages/base/index");
+	}
   },
   onUnload() {
     this.isShow = false;

pages/exchange/open-position.vue

@@ -803,11 +803,11 @@ export default {
           { label: this.$t("exchange.d7"), value: 1 },
           { label: this.$t("exchange.d6"), value: 0 }
         ],
-      shixian:[
+    //   shixian:[
-		  { label: this.$t("contract.d7"), value: 2 },
+		  // { label: this.$t("contract.d7"), value: 2 },
-        { label: this.$t("contract.h8"), value: 1 },
+    //     { label: this.$t("contract.h8"), value: 1 },
 
-      ],
+    //   ],
       canvasShow:false,
       myCanvas:'',
       detail: '',
@@ -870,9 +870,15 @@ export default {
         return plus.os.name
         // #endif
     },
-		marginCheck(){
+	marginCheck(){
-			return parseInt(this.margin);
+		return parseInt(this.margin);
-		}
+	},
+	shixian() {
+	    return [
+	      { label: this.$t("contract.d7"), value: 2 },
+	      { label: this.$t("contract.h8"), value: 1 },
+	    ];
+	}
   },
   watch: {
 		marginCheck: {