li.shaoyi 1 rok pred
rodič
commit
8a2f588348

+ 2 - 2
oem/tss/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.tss",
   "appName": "TCE",
-  "version": "1.0.2",
-  "versionCode": "100002",
+  "version": "1.0.4",
+  "versionCode": "100004",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

+ 2 - 13
src/constants/order.ts

@@ -85,15 +85,7 @@ export function getBuyOrSellList() {
  * @returns 
  */
 export function getTradeStatusList() {
-    return [
-        { label: '正常', value: TradeStatus.Normal },
-        { label: '受限', value: TradeStatus.Limit },
-        { label: '冻结', value: TradeStatus.Freeze },
-        { label: '禁止建仓(人工受限)', value: TradeStatus.NoOpen },
-        { label: '禁止交易(人工冻结)', value: TradeStatus.NoTrade },
-        { label: '待激活', value: TradeStatus.UnActivate },
-        { label: '已注销', value: TradeStatus.LoginOut },
-    ]
+    return getEnumTypeList('traderstatus')
 }
 
 /**
@@ -420,10 +412,7 @@ export function getHandleStatusName(value: number) {
  * @returns 
  */
 export function getPayStatusList() {
-    return [
-        { label: '未支付', value: PayStatus.UnPay },
-        { label: '已支付', value: PayStatus.Pay },
-    ]
+    return getEnumTypeList('ePayFlag')
 }
 
 /**

+ 2 - 2
src/filters/index.ts

@@ -271,8 +271,8 @@ export function formatMsgDate(value?: string) {
  * @returns
  */
 export function changeUnit(value: number) {
-    const k = 10000
-    const sizes = ['', '万', '亿', '万亿']
+    const k = 1000
+    const sizes = ['', 'K', 'M', 'B']
 
     if (value > k) {
         /**

+ 1 - 1
src/stores/modules/enum.ts

@@ -13,7 +13,7 @@ export interface EnumType {
     bankmappedvalue?: string
 }
 
-const enumKeys = ['confirmStatus', 'executetype', 'currency', 'operatetypesearch', 'deliveryPayMode', 'applystatus', 'deliveryStatus', 'operateType', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'gt_kksjdw', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus', 'transferapplystatus'] as const
+const enumKeys = ['confirmStatus', 'executetype', 'currency', 'operatetypesearch', 'deliveryPayMode', 'applystatus', 'deliveryStatus', 'operateType', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'gt_kksjdw', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus', 'traderstatus', 'transferapplystatus', 'ePayFlag'] as const
 
 const enumMap = new Map<typeof enumKeys[number], ShallowRef<Model.EnumRsp[]>>()