ソースを参照

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

li.shaoyi 1 年間 前
コミット
cd7b0c0cf9

+ 5 - 5
oem/tss/locales/extras/en-US.json

@@ -215,13 +215,13 @@
         }
     },
     "mine": {
-        "fundsinfo": "Account information",
-        "banksign": "My bank card",
-        "delivery": "Delivery pickup",
+        "fundsinfo": "Account Information",
+        "banksign": "My Bank Card",
+        "delivery": "Delivery PickUp",
         "cashin": "Deposit",
         "cashout": "WithDrawal",
-        "myposition": "Held orders",
-        "myorder": "Historical orders",
+        "myposition": "Held Orders",
+        "myorder": "Historical Orders",
         "setting": {
             "orderBuyOrSell": "Default"
         }

+ 81 - 81
public/locales/en-US.json

@@ -58,7 +58,7 @@
         "tips15": "Confirmation successful.",
         "tips16": "Confirmation failed:",
         "tips17": "Operation timed out",
-        "tips18": "Login expired, please log in again.",
+        "tips18": "Login expired, please login again.",
         "tips19": "Request timed out, please try again later.",
         "tips20": "An error occurred, please try again later.",
         "tips21": "Network or server error.",
@@ -88,15 +88,15 @@
         "trade": "Trade"
     },
     "routes": {
-        "news": "Market news",
+        "news": "Market News",
         "notice": "Announcement",
-        "capital": "Fund information",
-        "sign": "Signing account",
-        "profile": "Personal information",
+        "capital": "Fund Information",
+        "sign": "Signing Account",
+        "profile": "Personal Information",
         "setting": "Settings",
         "about": "About Us",
-        "modifypwd": "Change password",
-        "usercancel": "Cancel service"
+        "modifypwd": "Modify Password",
+        "usercancel": "Cancel Service"
     },
     "operation": {
         "add": "Add",
@@ -109,21 +109,21 @@
         "save": "Save",
         "order": "Order",
         "cancel": "Cancel",
-        "cancel1": "Quick cancel",
+        "cancel1": "Quick Cancel",
         "cancel2": "Revoke",
         "transfer": "Transfer",
         "delivery": "Delivery",
         "listing": "Listing",
-        "listing1": "Seeking to purchase",
+        "listing1": "Seeking Purchase",
         "delisting": "Delisting",
         "pickup": "Pick Up",
         "details": "Details",
-        "deposit": "Make up the deposit",
-        "deposit2": "Additional deposit",
+        "deposit": "Make Up Deposit",
+        "deposit2": "Additional Deposit",
         "close": "Close",
         "close1": "Close",
         "default": "Breach of contract",
-        "default1": "Set as default",
+        "default1": "Set Default",
         "default2": "Apply for breach of contract",
         "modify": "Edit",
         "modify2": "Edit information",
@@ -212,7 +212,7 @@
         "averageprice": "Average price",
         "spec": "Specification",
         "last": "Latest price",
-        "rise": "Rise and fall",
+        "rise": "Rise & fall",
         "change": "Range",
         "opened": "Opening price",
         "presettle": "Previous close",
@@ -258,7 +258,7 @@
         "ask3": "Ask3",
         "ask4": "Ask4",
         "ask5": "Ask5",
-        "marketstatus": "Market status:",
+        "marketstatus": "Market Status:",
         "unopening": "Market not open",
         "ballot": {
             "title": "Subscription",
@@ -743,7 +743,7 @@
                 "enableqty": "Available quantity",
                 "holderqty": "HolderQty",
                 "freezeqty": "FreezeQty",
-                "holderprice": "Position price",
+                "holderprice": "PositionPrice",
                 "holderamount": "HolderAmount",
                 "usedMargin": "UsedMargin",
                 "profitLoss": "ProfitLoss",
@@ -787,8 +787,8 @@
             "tips8": "Please enter the delivery address",
             "tips9": "Please select a delivery area",
             "tips10": "Please enter contact information",
-            "tips11": "Please enter the contact person",
-            "tips12": "Please enter the pickup quantity",
+            "tips11": "Please enter contact person",
+            "tips12": "Please enter pickup quantity",
             "receipttype": "Invoice type:",
             "username": "Invoice title:",
             "taxpayerid": "Tax identification number:",
@@ -876,13 +876,13 @@
             "title": "Price fixing positions",
             "goodsname": "Product code/name",
             "buyorsell": "BuyOrSell",
-            "lastprice": "Current price",
+            "lastprice": "CurrentPrice",
             "curpositionqty": "Holding amount",
             "averageprice": "AveragePrice",
-            "averageprice1": "Order price",
+            "averageprice1": "OrderPrice",
             "frozenqty": "FrozenQty",
             "curholderamount": "CurHolderAmount",
-            "enableqty": "Available quantity",
+            "enableqty": "Available Quantity",
             "closepl": "ClosePl",
             "tips1": "Do you want to cancel all orders?"
         }
@@ -1147,7 +1147,7 @@
         "zcxy": "User Registration Agreement",
         "yszc": "About Privacy",
         "ryszc": "Privacy Policy",
-        "fwrx": "Customer service hotline",
+        "fwrx": "Customer Service HotLine",
         "zrxy": "Transfer Agreement"
     },
     "mine": {
@@ -1164,19 +1164,19 @@
         "myposition": "My Positions",
         "myorder": "My Orders",
         "delivery": "Pick Up",
-        "performance": "Performance information",
+        "performance": "Performance Information",
         "fundsinfo": "Funds Infos",
-        "authentication": "Real-name authentication",
+        "authentication": "Real-name Authentication",
         "banksign": "Bank Management",
-        "personalinformation": "Personal information",
+        "personalinformation": "Personal Information",
         "settings": "Settings",
         "aboutus": "About Us",
-        "protocol": "Market entry agreement",
-        "positiontransfer": "Position transfer",
+        "protocol": "Market Entry Agreement",
+        "positiontransfer": "Position Transfer",
         "profile": {
-            "title": "Personal information",
-            "invoiceinfo": "Invoice information",
-            "addressinfo": "Delivery address",
+            "title": "Personal Information",
+            "invoiceinfo": "Invoice Information",
+            "addressinfo": "Delivery Address",
             "wechat": "WeChat",
             "email": "Email",
             "tips1": "Please enter your WeChat ID"
@@ -1225,7 +1225,7 @@
             "tradesettings": "Order settings",
             "tipssetting": "Notification settings",
             "others": "Other settings",
-            "language": "Language settings",
+            "language": "Language Settings",
             "chinese": "简体中文",
             "english": "English",
             "enth": "ภาษาไทย",
@@ -1252,15 +1252,15 @@
         "accountname": "Name",
         "accountname1": "Bank card account name",
         "OpenBankAccId": "Bank account",
-        "cardtype": "Document type",
-        "cardno": "Document number",
-        "cusbankname": "Custodian bank",
+        "cardtype": "Document Type",
+        "cardno": "Document Number",
+        "cusbankname": "Custodian Bank",
         "bankaccountno1": "Contract bank account number",
         "currency": "Currency",
-        "bankname": "Contract bank",
+        "bankname": "Contract Bank",
         "bankname1": "Bank Name",
         "bankno": "Bank CardNo",
-        "bankaccountname": "Name",
+        "bankaccountname": "Account Name",
         "mobilephone": "PhoneNo",
         "branchbankname": "Branch Name",
         "remark": "Remarks",
@@ -1280,7 +1280,7 @@
         "fundstype": "Fund type",
         "pleasechoicefundstype": "Please select the fund type",
         "time": "Time",
-        "operatetype": "Operation type",
+        "operatetype": "Operation Type",
         "amount": "Amount",
         "bankaccountno": "Bank CardNo",
         "verificationcode": "Get verification code",
@@ -1315,7 +1315,7 @@
         "capital": {
             "title": "Funds",
             "title2": "FundsInfo",
-            "title3": "Fund flow",
+            "title3": "FundFlow",
             "title4": "Settlement sheet",
             "accountid": "Fund account number",
             "createtime": "Time",
@@ -1391,10 +1391,10 @@
             "username": "Username",
             "username1": "Username/Account",
             "password": "Password",
-            "login": "Log in",
-            "forgetpassword": "Forgot password?",
+            "login": "Login",
+            "forgetpassword": "Forgot Password?",
             "rulesyszc": "Privacy Policy",
-            "register": "User registration",
+            "register": "User Registration",
             "ruleszcxy": "User registration agreement",
             "rulesyhkhfxgzs": "User account opening risk notification",
             "checked": "I have read and agree",
@@ -1413,16 +1413,16 @@
             "tips7": "Dear user: Hello, please complete the full payment for the pre-order before 04:00 on Saturday for shipment, otherwise, the platform will cancel the pre-order as per the agreement."
         },
         "register": {
-            "title": "User registration",
+            "title": "User Registration",
             "title1": "Scan to register",
             "mobile": "PhoneNo",
-            "vcode": "SMS verification code",
+            "vcode": "SMS Verifiy Code",
             "sendagain": "Resend",
-            "getsmscode": "Get verification code",
-            "freeregister": "Free registration",
-            "logipwd": "Login password",
-            "confirmpwd": "Confirm password",
-            "registercode": "Registration code",
+            "getsmscode": "Verifiy Code",
+            "freeregister": "Free Registration",
+            "logipwd": "Login Pwd",
+            "confirmpwd": "Confirm Pwd",
+            "registercode": "Registration Code",
             "checked": "I have read and agree",
             "ruleszcxy": "User registration agreement",
             "rulesfxgzs": "Risk notification letter",
@@ -1439,26 +1439,26 @@
             "tips10": "Please agree to the registration terms first"
         },
         "password": {
-            "title": "Change password",
-            "title1": "Change login password",
+            "title": "Change Pwd",
+            "title1": "Change login Pwd",
             "newpwd": "New password",
-            "confirmpwd": "Confirm password",
-            "oldpwd": "Original password",
+            "confirmpwd": "Confirm Pwd",
+            "oldpwd": "Original Pwd",
             "tips1": "Please enter the original password",
             "tips2": "Please enter the new password",
             "tips3": "Please re-enter the new password",
             "tips4": "Password entries do not match!",
-            "tips5": "Password changed successfully, please log in again."
+            "tips5": "Password changed successfully, please login again."
         },
         "forget": {
-            "title": "Reset login password",
+            "title": "Reset Login Pwd",
             "mobile": "PhoneNo",
-            "vcode": "SMS verification code",
+            "vcode": "SMS Verifiy code",
             "sendagain": "Resend",
-            "getsmscode": "Get verification code",
-            "newpwd": "New password",
-            "confirmpwd": "Confirm password",
-            "resetpwd": "Reset password",
+            "getsmscode": "Verifiy code",
+            "newpwd": "New Pwd",
+            "confirmpwd": "Confirm Pwd",
+            "resetpwd": "Reset Pwd",
             "tips1": "Please enter your phoneNo",
             "tips2": "Please enter the SMS verification code",
             "tips3": "Please enter the new password",
@@ -1466,7 +1466,7 @@
             "tips5": "Password must be a combination of at least two types of characters and at least 6 characters long",
             "tips6": "New password and confirm password do not match",
             "tips7": "Sending failed",
-            "tips8": "Password reset successfully, please log in again."
+            "tips8": "Password reset successfully, please login again."
         },
         "cancel": {
             "title": "Cancel service",
@@ -1502,7 +1502,7 @@
         "avater": {
             "title": "Profile picture",
             "cardbackphotourl": "User profile picture",
-            "tips": "Please select the correct image type",
+            "tips": "Please select correct image type",
             "tips1": "Please upload a profile picture"
         }
     },
@@ -1518,36 +1518,36 @@
         "closepl": "ClosePl",
         "reckonpl": "ReckonPl",
         "paycharge": "Trade service fee",
-        "oriusedmargin": "Occupied funds",
-        "orioutamountfreeze": "Frozen funds",
+        "oriusedmargin": "Occupied Funds",
+        "orioutamountfreeze": "Frozen Funds",
         "avaiableoutmoney": "Available funds for withdrawal",
-        "ordersumary": "Order summary",
+        "ordersumary": "Order Summary",
         "inoutamountdetail": "Deposit and withdrawal details",
-        "fundsinfo": "Fund information",
-        "accountinfo": "Account information",
-        "reckondate": "Settlement date",
-        "reportdetail": "Report details",
-        "balance": "Beginning balance",
-        "currentbalance": "Ending balance",
-        "avaiablemoney": "Available funds",
-        "day": "Daily report",
-        "month": "Monthly report",
+        "fundsinfo": "Fund Information",
+        "accountinfo": "Account Information",
+        "reckondate": "Settlement Date",
+        "reportdetail": "Report Details",
+        "balance": "Beginning Balance",
+        "currentbalance": "Ending Balance",
+        "avaiablemoney": "Available Funds",
+        "day": "Daily Report",
+        "month": "Monthly Report",
         "trade": {
             "goodsdisplay": "Goods",
             "buyorselldisplay": "BuyOrSell",
             "tradeqty": "Quantity",
             "tradeprice": "Price",
-            "tradeamount": "Transaction amount",
-            "charge": "Service charge",
+            "tradeamount": "Transaction Amount",
+            "charge": "Service Charge",
             "tradetime": "Time"
         },
         "position": {
             "goodsdisplay": "Goods",
             "buyorselldisplay": "BuyOrSell",
-            "curpositionqty": "Holding amount",
+            "curpositionqty": "Holding Amount",
             "frozenqty": "FrozenQty",
-            "curholderamount": "Order amount",
-            "avagepricedisplay": "Average price"
+            "curholderamount": "Order Amount",
+            "avagepricedisplay": "Average Price"
         },
         "bank": {
             "updatetime": "Time",
@@ -1557,16 +1557,16 @@
         }
     },
     "notices": {
-        "title": "Notification announcement",
-        "title1": "System announcement",
+        "title": "Notification Announcement",
+        "title1": "System Announcement",
         "notice": "Notice",
         "announcement": "Announcement",
-        "details": "Announcement details"
+        "details": "Announcement Details"
     },
     "news": {
         "source": "Source:",
         "numbers": "Views:",
-        "hotnews": "Popular news",
+        "hotnews": "Popular News",
         "author": "Author:"
     },
     "slider": {

+ 2 - 1
src/packages/mobile/views/bank/sign/Index.vue

@@ -5,7 +5,7 @@
         </template>
         <div class="bank-sign__container" v-if="bankInfo">
             <CellGroup>
-                <Cell :title="$t('banksign.bankname')" :value="bankInfo.bankname" />
+                <Cell :title="$t('banksign.bankname')" :value="handleNoneValue(bankInfo.bankname)" />
                 <Cell :title="$t('banksign.bankaccountno')" :value="bankInfo.bankaccountno" />
                 <template v-if="bankInfo.signstatus === SignStatus.Signed">
                     <Cell :title="$t('banksign.bankaccountname')" :value="bankInfo.bankaccountname" />
@@ -49,6 +49,7 @@ import { useRequest } from '@/hooks/request'
 import { queryCusBankSignBank } from '@/services/api/bank'
 import { shallowRef } from 'vue'
 import { i18n } from "@/stores"
+import { handleNoneValue } from '@/filters'
 
 const componentMap = new Map<string, unknown>([
     ['edit', defineAsyncComponent(() => import('./components/edit/Index.vue'))],

+ 0 - 3
src/packages/mobile/views/mine/Index.vue

@@ -191,7 +191,6 @@ const doInOutMoney = (tab: string) => {
                     dialog({
                         message: t('banksign.tips1'),
                         showCancelButton: true,
-                        cancelButtonText: t('operation.cancel'),
                         confirmButtonText: t('banksign.tips2')
                     }).then(() => {
                         router.push({ name: 'bank-sign' })
@@ -205,7 +204,6 @@ const doInOutMoney = (tab: string) => {
         dialog({
             message: t('banksign.tips3'),
             showCancelButton: true,
-            cancelButtonText: t('operation.cancel'),
             confirmButtonText: t('banksign.tips4')
         }).then(() => {
             router.push({ name: 'account-certification' })
@@ -217,7 +215,6 @@ const userLogout = () => {
     dialog({
         message: t('banksign.tips5'),
         showCancelButton: true,
-        cancelButtonText: t('operation.cancel'),
         confirmButtonText: t('operation.confirm'),
     }).then(() => {
         loginStore.clearAutoLoginData()

+ 0 - 2
src/packages/mobile/views/order/list/components/pricingorder/detail/Index.vue

@@ -52,8 +52,6 @@ const onCancelSumit = () => {
     console.log('goodsid')
     dialog({
         message: t('order.pricingorder.tips1'),
-        confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         const { marketid, goodsid } = props.selectedRow

+ 0 - 1
src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue

@@ -99,7 +99,6 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
     dialog({
         message: t('order.pricingorder.tips1'),
         confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }

+ 0 - 2
src/packages/mobile/views/order/position/components/pricing/detail2/components/delivery/Index.vue

@@ -142,8 +142,6 @@ const contactChange = (item: Model.UserReceiveInfoRsp) => {
 const onDeliverySumit = () => {
     dialog({
         message: t('position.goods.tips5'),
-        confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         const { buyOrSell, tradeID } = props.selectedRow.tHDetailEx

+ 0 - 2
src/packages/mobile/views/order/position/components/pricing/detail2/components/transfer/Index.vue

@@ -159,8 +159,6 @@ const formRules: { [key: string]: FieldRule[] } = {
 const onCloseSumit = () => {
     dialog({
         message: t('position.goods.tips3'),
-        confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
 

+ 0 - 1
src/packages/mobile/views/pricing/trade/components/cancel/Index.vue

@@ -91,7 +91,6 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
     dialog({
         message: t('order.pricingorder.tips1'),
         confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }

+ 6 - 6
src/packages/mobile/views/pricing/trade/v2/Index.vue

@@ -284,12 +284,12 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
     }],
 }
 
-const onPriceModeChanged = () => {
-    if (formData.PriceMode === PriceMode.Limit) {
-        const { ask = 0, bid = 0 } = quote.value ?? {}
-        formData.OrderPrice = formData.BuyOrSell === BuyOrSell.Buy ? ask : bid
-    }
-}
+// const onPriceModeChanged = () => {
+//     if (formData.PriceMode === PriceMode.Limit) {
+//         const { ask = 0, bid = 0 } = quote.value ?? {}
+//         formData.OrderPrice = formData.BuyOrSell === BuyOrSell.Buy ? ask : bid
+//     }
+// }
 
 const onBeforeSubmit = (buildType: BuildType) => {
     formData.BuildType = buildType

+ 0 - 1
src/packages/mobile/views/user/cancel/Index.vue

@@ -36,7 +36,6 @@ const onSubmit = () => {
         message: t('user.cancel.submitmessage'),
         showCancelButton: true,
         confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         messageAlign: 'left'
     }).then(() => {
         fullloading((hideLoading) => {

+ 1 - 1
src/packages/mobile/views/user/register/Index.vue

@@ -77,7 +77,7 @@
 
 <script lang="ts" setup>
 import { reactive, shallowRef, ref, computed, onMounted } from 'vue'
-import { CellGroup, Cell, Button, Icon, Field, Form, FormInstance, Checkbox, showFailToast, showToast, FieldRule, Popup, Picker, PickerConfirmEventParams } from 'vant'
+import { CellGroup, Cell, Button, Field, Form, FormInstance, Checkbox, showFailToast, showToast, FieldRule, Popup, Picker, PickerConfirmEventParams } from 'vant'
 import { useCountDown } from '@vant/use'
 import { fullloading, dialog } from '@/utils/vant'
 import { validateRules } from '@/constants/regex'

+ 2 - 2
src/packages/pc/components/modules/goods-detail/chart/index.vue

@@ -5,7 +5,7 @@
         </div>
         <el-scrollbar class="block-right">
             <Price v-bind="{ goodsCode }" />
-            <Forex v-if="quote?.trademode != 10" v-bind="{ goodsCode }" />
+            <Forex v-if="![10, 53].includes(trademode)" v-bind="{ goodsCode }" />
             <Tik v-bind="{ goodsCode }" />
         </el-scrollbar>
     </div>
@@ -27,7 +27,7 @@ const props = defineProps({
 })
 
 const futuresStore = useFuturesStore()
-const quote = futuresStore.getGoodsQuote(props.goodsCode)
+const { trademode = 10 } = futuresStore.getGoodsQuote(props.goodsCode).value ?? {}
 
 </script>
 

+ 2 - 1
src/packages/pc/components/modules/quote/price/index.vue

@@ -6,7 +6,8 @@
             </div>
             <div class="block-bottom">
                 <div class="block-bottom-left">
-                    <span :class="quote.lastColor" v-if="quote.trademode != 10">{{ handleNumberValue(quote.last.toFixed(quote.decimalplace)) }}</span>
+                    <span :class="quote.lastColor" v-if="[10].includes(quote.trademode)">{{ handleNumberValue(quote.last.toFixed(quote.decimalplace)) }}</span>
+                    <span v-else-if="[53].includes(quote.trademode)" />
                     <div v-else>
                         <span :class="quote.askColor">{{ handleNumberValue(quote.ask.toFixed(quote.decimalplace)) }}</span>
                         <span>{{ ' / ' }}</span>

+ 1 - 1
src/packages/pc/views/footer/presell/transferposition/giveup/index.vue

@@ -78,7 +78,7 @@ const onConfirm = () => {
             formData.GoodsID = goodsid
             
             onSubmit().then(() => {
-                ElMessage.success(t('position.transfer.tips1'))
+                ElMessage.success(t('position.transfer.tips2'))
                 onCancel(true)
             }).catch((err) => {
                 ElMessage.error(t('common.submitfailure') + err)

+ 0 - 4
src/packages/tss/views/mine/Index.vue

@@ -167,7 +167,6 @@ const doInOutMoney = (tab: string) => {
                     dialog({
                         message: t('banksign.tips1'),
                         showCancelButton: true,
-                        cancelButtonText: t('operation.cancel'),
                         confirmButtonText: t('banksign.tips2')
                     }).then(() => {
                         router.push({ name: 'bank-sign' })
@@ -181,7 +180,6 @@ const doInOutMoney = (tab: string) => {
         dialog({
             message: t('banksign.tips3'),
             showCancelButton: true,
-            cancelButtonText: t('operation.cancel'),
             confirmButtonText: t('banksign.tips4')
         }).then(() => {
             router.push({ name: 'account-certification' })
@@ -192,8 +190,6 @@ const doInOutMoney = (tab: string) => {
 const userLogout = () => {
     dialog({
         message: t('banksign.tips5'),
-        // cancelButtonText: t('operation.cancel'),
-        // confirmButtonText: t('operation.confirm'),
         showCancelButton: true
     }).then(() => {
         loginStore.clearAutoLoginData()

+ 1 - 1
src/packages/tss/views/product/list/components/waterfall-list/index.vue

@@ -9,7 +9,7 @@
                 <div class="goods-info">
                     <div class="goods-info__title">{{ item.goodscode }}</div>
                     <div class="goods-info__price">
-                        <span :class="['integer', item.askColor]">{{ handleNumberValue(formatDecimal(item.ask)) }}</span>
+                        <span :class="['integer', item.askColor]">{{ handleNumberValue(formatDecimal(item.ask), item.decimalplace) }}</span>
                     </div>
                 </div>
             </div>