文档7.18

src/assets/scss/base/_common.scss

@@ -348,7 +348,7 @@ $basew: 24;
 }
 .form-control:disabled,
 .form-control[readonly] {
-    background-color: #676767;
+    background-color: #f7f7f7;
     color: #999;
 }
 .table {

src/components/CommonFooter.vue

@@ -216,11 +216,12 @@ export default {
     display: flex;
     align-items: center;
     height: 324px;
-    margin-left: 233px;
+    // margin-left: 233px;
-
+    justify-content: space-between;
+    padding:0 233px;
     .item_left{
       width: 504px;
-      margin-right: 300px;
+    //   margin-right: 300px;
       .logo{
         display: flex;
         align-items: center;

src/components/SecondaryNav.vue

@@ -241,7 +241,8 @@ export default {
 
         a {
             font-weight: 500;
-            color: rgba(193, 187, 242, 1);
+            // color: rgba(193, 187, 242, 1);
+            color: black;
             width: 100%;
             height: 100%;
             // border: 1px solid red;
@@ -261,7 +262,8 @@ export default {
                 position: absolute;
                 bottom: 0;
                 left: 0;
-                background: linear-gradient(135deg, rgba(188, 106, 188, 1) 0%, rgba(104, 86, 166, 1) 100%);
+                // background: linear-gradient(135deg, rgba(188, 106, 188, 1) 0%, rgba(104, 86, 166, 1) 100%);
+                background: black;
             }
         }
     }

src/components/VBox.vue

@@ -195,7 +195,7 @@ export default {
 
     .v-box__container {
 
-        background: #141e2c;
+        background: white;
         border-radius: 4px;
         overflow: hidden; // 解决圆角益处的问题
 

src/i18n/en.json

@@ -908,7 +908,7 @@
         "d8": "Price",
         "d9": "Market Price",
         "e0": "Limit Price",
-        "e1": "Num",
+        "e1": "Amount",
         "e2": "Leaf",
         "e3": "Margin",
         "e4": "Multiple positions",

src/views/college/detail.vue

@@ -10,7 +10,7 @@
                 </el-breadcrumb>
                 <div class="title h2 mt-4">{{article.title}}</div>
                 <div class="single-subtitle d-flex justify-content-between border-bottom pb-2">
-                    <div class="text-muted">{{article.created_at}}</div>
+                    <!-- <div class="text-muted">{{article.created_at}}</div> -->
                 </div>
                 <div class="edit-content py-4">
                     <div v-html="article.body"></div>

src/views/contract/exchange-store.vue

@@ -88,16 +88,16 @@
       </div>
       <div class="input-group mb-4 input-group-sm">
         <div class="input-group-prepend">
-          <!-- <span class="input-group-text">{{ $t("contract.e1") }}</span> -->
+          <span class="input-group-text">{{ $t("contract.e1") }}</span>
-          <span class="input-group-text">{{ $t("contract.l2") }}</span>
+          <!-- <span class="input-group-text">{{ $t("contract.l2") }}</span> -->
         </div>
         <!-- v-model="form.amount" -->
         <!-- :placeholder="tips" -->
         <input
           type="number"
-          v-model="margin"
+          v-model="form.amount"
           class="form-control"
-          placeholder="USDT"
+          :placeholder="tips"
         />
         <!-- <div class="input-group-append">
             <span class="input-group-text">{{ $t("contract.e2") }}</span>

src/views/contract/handicap.vue

@@ -191,7 +191,7 @@ export default {
             this.linkSocket();
         }
         bus.$on('collapse', msg => {
-            this.newPriceObj.price = (msg.close).toFixed(3);
+            this.newPriceObj.price =this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3);
             this.$emit("input", this.newPriceObj);
         });
     },

src/views/contract/index.vue

@@ -115,7 +115,7 @@
               </div>
             </div>
           </div>
-          <div><theme-change /></div>
+          <!-- <div><theme-change /></div> -->
         </div>
         <kline
           :activeCoin="{ pair_name: activeContract.pair_name }"
@@ -271,14 +271,17 @@ export default {
     });
     // console.info(this.$refs)
     bus.$on('collapse', msg => {
-        this.activeContract.price = (msg.close).toFixed(3);
+        this.activeContract.price =this.activeContract.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3);
+        this.holdPositionList.map(item=>{
+            if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price
+        })
     });
   },
   //三秒更新一次数据
   mounted: function () {
       setInterval(() => {
         this.holdPosition();
-      }, 3000)
+      }, 2000)
   },
   methods: {
     ispopover1(item){
@@ -295,7 +298,7 @@ export default {
         let { data, sub,cmd } = res;
 
         if (sub == msg) {
-            // console.info(data)
+            if( data.symbol=='BTC' )(data.price).toFixed(1)
             this.contractList = data;
         }else if (cmd == "ping") {
           this.ws.send({
@@ -334,6 +337,10 @@ export default {
         symbol: (this.holdPositionAll && this.activeSymbol) || ""
       };
       Contract.holdPosition(data, { loading: false }).then(res => {
+        console.info(res)
+        res.map(item=>{
+            if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price
+        })
         this.holdPositionList = res;
       });
     },

src/views/exchange/make-deal.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="col-md-6">
     <div class="px-4 py-2 heading">
-         <theme-change/>
+         <!-- <theme-change/> -->
          <el-tooltip placement="bottom" effect="light">
             <div slot="content" class="market">
                 <div class="coin p-md color-light fn-20">

src/views/option/kline.vue

@@ -156,10 +156,9 @@ methods: {
         
         ws.on("message", (res) => {
             let { data, msg, code, sub, type, status, req, cmd } = res;
-            console.info(this.sub)
             if (sub == this.sub && this.onRealtimeCallback) {
+                if(sub.indexOf("BTC")!= -1) (data.close).toFixed(1)
                 this.onRealtimeCallback(this.getMap(data));
-                // console.info(data)
                 bus.$emit('collapse', data);
             } else if (type == "ping" || cmd == "ping") {
             this.ws.send({

src/views/wallet/exchange-assets.vue

@@ -181,14 +181,15 @@
                           <input class="form-check-input" type="radio" v-model="depositeAdressType" name="deposite—address-type" id="deposite-omni" value="1" />
                           <label class="form-check-label" for="deposite-omni">OMNI</label>
                         </div> -->
-                        <div class="form-check form-check-inline">
-                          <input class="form-check-input" type="radio" v-model="depositeAdressType" name="deposite—address-type" id="deposite-trc20" value="3" />
-                          <label class="form-check-label" for="deposite-trc20">TRC20</label>
-                        </div>
                         <div class="form-check form-check-inline">
                           <input class="form-check-input" type="radio" v-model="depositeAdressType" name="deposite—address-type" id="deposite-erc20" value="2" />
                           <label class="form-check-label" for="deposite-erc20">ERC20</label>
                         </div>
+                        <div class="form-check form-check-inline">
+                          <input class="form-check-input" type="radio" v-model="depositeAdressType" name="deposite—address-type" id="deposite-trc20" value="3" />
+                          <label class="form-check-label" for="deposite-trc20">TRC20</label>
+                        </div>
+                        
                         
                       </template>
 
@@ -317,14 +318,15 @@
                             <input class="form-check-input" type="radio" name="withdraw-address-type" id="withdraw-omni" v-model="withdraw.addressType" value="1" />
                             <label class="form-check-label" for="withdraw-omni">OMNI</label>
                         </div> -->
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input" type="radio" name="withdraw-address-type" id="withdraw-trc20" v-model="withdraw.addressType" value="3" />
-                            <label class="form-check-label" for="withdraw-trc20">TRC20</label>
-                        </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="withdraw-address-type" id="withdraw-erc20" v-model="withdraw.addressType" value="2" />
                             <label class="form-check-label" for="withdraw-erc20">ERC20</label>
                         </div>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input" type="radio" name="withdraw-address-type" id="withdraw-trc20" v-model="withdraw.addressType" value="3" />
+                            <label class="form-check-label" for="withdraw-trc20">TRC20</label>
+                        </div>
+                        
                       </template>
                       <div class="form-group mt-2">
                         <label class="d-flex justify-content-between" for="formGroupExampleInput">
@@ -416,7 +418,7 @@ export default {
         showValue: true, // 默认隐藏资产数值
 
         depositeCoin: null,
-        depositeAdressType: 3, // 默认充值类型 1 为 omin 2 为 erc20
+        depositeAdressType: 2, // 默认充值类型 1 为 omin 2 为 erc20
 
         withdrawCoin: null,
 
@@ -432,7 +434,7 @@ export default {
             coin_id: "",
             amount: "",
             address: "",
-            addressType: 3, // 默认提币类型 1 为 omni； 2 为 erc20,
+            addressType: 2, // 默认提币类型 1 为 omni； 2 为 erc20,
             code_type: 1,
             code: ''
         },