Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

oem/tss/locales/extras/zh-CN.json

@@ -21,7 +21,7 @@
         "orderbuy": "预订",
         "transferbuy": "回购",
         "ordersell": "取消预订",
-        "transfersell": "取消回购",
+        "transfersell": "回购",
         "buy": "预订",
         "selll": "回购",
         "goods": {

src/packages/mobile/views/pricing/trade/Index.vue

@@ -116,7 +116,7 @@
         <div class="g-form__footer">
             <template v-if="formData.BuyOrSell === BuyOrSell.Buy">
                 <Button type="danger" block square :disabled="!formData.OrderQty"
-                    @click="onBeforeSubmit(BuildType.Open)" v-if="!quote?.iscannotbuy">{{ $t('quote.orderbuy') }}</Button>
+                    @click="onBeforeSubmit(BuildType.Open)" v-if="!quote?.iscannotbuy">{{ $t('operation.order') }}</Button>
                 <!-- <Button color="#199e00" block square
                     :disabled="!formData.OrderQty || !sellQty || (formData.OrderQty > sellQty)"
                     @click="onBeforeSubmit(BuildType.Close)" v-if="!isTrademode16">
@@ -127,7 +127,7 @@
             <template v-if="formData.BuyOrSell === BuyOrSell.Sell">
                 <Button type="danger" block square :disabled="!formData.OrderQty"
                     @click="onBeforeSubmit(BuildType.Open)"
-                    v-if="!isTrademode16 && !quote?.iscannotsell">{{ $t('quote.ordersell') }}</Button>
+                    v-if="!isTrademode16 && !quote?.iscannotsell">{{ $t('operation.order') }}</Button>
                 <!-- <Button color="#199e00" block square
                     :disabled="!formData.OrderQty || !buyQty || (formData.OrderQty > buyQty)"
                     @click="onBeforeSubmit(BuildType.Close)">

src/packages/tss/views/mine/Index.vue

@@ -23,7 +23,7 @@
                     <div class="profile-account">
                         <div class="profile-account-first">
                             <span>{{ $t('account.account') }}</span>
-                            <Icon name="passed" size="14" color="#CC0000" ></Icon>
+                            <Icon name="checked" size="14" color="#CC0000" ></Icon>
                         </div>
                         <span>{{ currentAccount.accountid ?? 0 }}</span>
                     </div>