更新文字

i18n/lang/en.json

@@ -261,7 +261,7 @@
     "c3": "Buy",
     "c4": "Sell",
     "c5": "Quantity",
-    "c6": "Sold at the best market price",
+    "c6": "Best market transaction",
     "c7": "Total Price",
     "c8": "Available Quantity",
     "c9": "Total Value",
@@ -271,8 +271,8 @@
     "d3": "Latest Transaction",
     "d4": "Time",
     "d5": "Direction",
-    "d6": "Limit Price",
+    "d6": "Limit order",
-    "d7": "Market Price",
+    "d7": "Market order",
     "d8": "Please enter the price",
     "d9": "Please enter the quantity",
     "e0": "Please enter the total price",
@@ -748,7 +748,7 @@
       "a1":"Contact Us",
       "a2":"Welcome!",
       "a3":"TP/SL for position",
-      "a4":"Trade at current latest price",
+      "a4":"Best market transaction",
       "a5":"Positions",
       "a6":"Order management",
       "a7":"Open Orders",

pages/exchange/exchange-transaction.vue

@@ -91,7 +91,7 @@
                     :placeholder="$t('exchange.c5')"
                   >
                     <template #right>
-                      <view class="color-default fn-bold color-light">{{
+                      <view class="color-default color-light">{{
                         activeCoin.coin_name
                       }}</view>
                     </template>
@@ -102,7 +102,7 @@
                 <view>
                   <v-input
                     disabled
-                    class="h-30 p-x-sm rounded p-y-xxs fn-center color-light bg-form-panel-3"
+                    class="h-30 rounded p-y-xxs fn-center color-light bg-form-panel-3"
                     :placeholder="$t('exchange.c6')"
                   ></v-input>
                 </view>
@@ -117,8 +117,8 @@
                     "
                   >
                     <template #right>
-                      <view class="color-default fn-bold color-light" v-show="form.direction == 'sell'">{{currentCoin}}</view>
+                      <view class="color-default color-light" v-show="form.direction == 'sell'">{{currentCoin}}</view>
-                      <view class="color-default fn-bold color-light" v-show="form.direction == 'buy'">{{targetCoin}}</view>
+                      <view class="color-default color-light" v-show="form.direction == 'buy'">{{targetCoin}}</view>
                     </template>
                   </v-input>
                 </view>
@@ -616,6 +616,7 @@ export default {
             4
           );
         } else if (this.form.type == 1) {
+					// 市价
           this.form.amount = this.form.amount = math.multiple(
             this.targetBalance.usable_balance,
             num,

pages/exchange/open-position.vue

@@ -116,7 +116,7 @@
                 v-if="form.type == 1"
                 disabled
                 :value='$t("first.a4")'
-                class="h-30 p-y-xxs rounded fn-center fn-bold color-light bg-form-panel-3 p-x-xs"
+                class="h-30 p-y-xxs rounded fn-center color-light bg-form-panel-3 p-x-xs"
               ></v-input>
             </view>
             <view>
@@ -129,7 +129,7 @@
                 class="h-30 p-x-sm p-y-xxs rounded bg-form-panel-3"
               >
                 <template #right>
-                  <span class="color-light fn-bold">
+                  <span class="color-light">
 					<!-- {{ $t("contract.d8") }} -->
 					USDT
 				  </span>
@@ -795,8 +795,10 @@ export default {
       popshow:false,
       contractInstruction:'',
       commissionTypes:[
-          { label: this.$t("contract.f6"), value: 1 },
+          // { label: this.$t("contract.f6"), value: 1 },
-          { label: this.$t("exchange.d6")+this.$t("contract.g5"), value: 0 }
+          // { label: this.$t("exchange.d6")+this.$t("contract.g5"), value: 0 }
+          { label: this.$t("exchange.d7"), value: 1 },
+          { label: this.$t("exchange.d6"), value: 0 }
         ],
       shixian:[
 		  { label: this.$t("contract.d7"), value: 2 },
@@ -888,8 +890,10 @@ export default {
     isShow(n) {
         this.$emit("symbols",this.symbol)
         this.commissionTypes=[
-          { label: this.$t("contract.f6"), value: 1 },
+          // { label: this.$t("contract.f6"), value: 1 },
-          { label: this.$t("contract.f5"), value: 0 }
+          // { label: this.$t("contract.f5"), value: 0 },
+					{ label: this.$t("exchange.d7"), value: 1 },
+					{ label: this.$t("exchange.d6"), value: 0 }
         ]
       if (n&&this.isLogin) {
         // this.generalizeInfo()