liuye / etradeclient · Commits

Commit 04171be41d5fd323d0988dadaf5176deb3ba6f41

Authored by liuye
1 parent becf77a7
build: skipped

feat<card&doc>:新增查询退卡菜单，更新市场版本信息 

Signed-off-by: liuye <liuye@diligrp.com>
Inline Side-by-side
Showing 4 changed files with 26 additions and 16 deletions
doc/各市场版本/各市场版本.txt
  View file @04171be
1 -长春市场-卡务；20170927 1 +长春市场-卡务；4.0.0 20181127
  2 +长春市场-综合业务；4.0.0 20181127
  3 +
2 哈达市场-卡务：4.0.0 20181127 4 哈达市场-卡务：4.0.0 20181127
3 哈达市场-综合业务：4.0.0 20181127 5 哈达市场-综合业务：4.0.0 20181127
  6 +
4 贵阳市场-卡务：20170927 7 贵阳市场-卡务：20170927
5 -牡丹江市场-卡务：20170927 8 +
  9 +牡丹江市场-卡务：4.0.0 20181127
  10 +牡丹江市场-综合业务：4.0.0 20181127
  11 +
6 齐齐哈尔市场-卡务：20170927 12 齐齐哈尔市场-卡务：20170927
  13 +
7 沈阳市场-卡务：20171031 14 沈阳市场-卡务：20171031
8 沈阳市场-商户；20171120 15 沈阳市场-商户；20171120
9 16
etrade_card_client/Config/menu_res_auth_cfg.json
  View file @04171be
@@ -12,12 +12,13 @@ @@ -12,12 +12,13 @@
12 {"res_id":50037, "auth_id":5014, "icon":"restore_card_loss.ico", "index":[2, 10]}, 12 {"res_id":50037, "auth_id":5014, "icon":"restore_card_loss.ico", "index":[2, 10]},
13 {"res_id":50060, "auth_id":5015, "icon":"change_card.ico", "index":[2, 11]}, 13 {"res_id":50060, "auth_id":5015, "icon":"change_card.ico", "index":[2, 11]},
14 {"res_id":50070, "auth_id":5016, "icon":"return_card.ico", "index":[2, 12]}, 14 {"res_id":50070, "auth_id":5016, "icon":"return_card.ico", "index":[2, 12]},
15 - {"res_id":50080, "auth_id":5020, "icon":"modify_card_pwd.ico", "index":[2, 14]},  
16 - {"res_id":50090, "auth_id":5024, "icon":"reset_card_pwd.ico", "index":[2, 15]},  
17 - {"res_id":50100, "auth_id":5028, "icon":"unlock_card.ico", "index":[2, 16]},  
18 - {"res_id":50111, "auth_id":5029, "icon":"about.ico", "index":[2, 17]},  
19 - {"res_id":50112, "auth_id":5030, "icon":"about.ico", "index":[2, 19]},  
20 - {"res_id":50113, "auth_id":5031, "icon":"about.ico", "index":[2, 20]}, 15 + {"res_id":50071, "auth_id":5018, "icon":"return_card.ico", "index":[2, 13]},
  16 + {"res_id":50080, "auth_id":5020, "icon":"modify_card_pwd.ico", "index":[2, 15]},
  17 + {"res_id":50090, "auth_id":5024, "icon":"reset_card_pwd.ico", "index":[2, 16]},
  18 + {"res_id":50100, "auth_id":5028, "icon":"unlock_card.ico", "index":[2, 17]},
  19 + {"res_id":50111, "auth_id":5029, "icon":"about.ico", "index":[2, 18]},
  20 + {"res_id":50112, "auth_id":5030, "icon":"about.ico", "index":[2, 20]},
  21 + {"res_id":50113, "auth_id":5031, "icon":"about.ico", "index":[2, 21]},
21 {"res_id":3, "auth_id":55, "icon":"", "index":[3]}, 22 {"res_id":3, "auth_id":55, "icon":"", "index":[3]},
22 {"res_id":50140, "auth_id":5504, "icon":"cash_recharge.ico", "index":[3, 0]}, 23 {"res_id":50140, "auth_id":5504, "icon":"cash_recharge.ico", "index":[3, 0]},
23 {"res_id":50150, "auth_id":5508, "icon":"cash_withdraw.ico", "index":[3, 1]}, 24 {"res_id":50150, "auth_id":5508, "icon":"cash_withdraw.ico", "index":[3, 1]},
etrade_card_client/ETradeClient.rc
  View file @04171be
@@ -102,6 +102,7 @@ BEGIN @@ -102,6 +102,7 @@ BEGIN
102 MENUITEM "卡片解挂", ID_UNFREEZE_CARD 102 MENUITEM "卡片解挂", ID_UNFREEZE_CARD
103 MENUITEM "卡片换卡", ID_CHANGE_CARD 103 MENUITEM "卡片换卡", ID_CHANGE_CARD
104 MENUITEM "卡片退卡", ID_RETURN_CARD 104 MENUITEM "卡片退卡", ID_RETURN_CARD
  105 + MENUITEM "查询退卡", ID_QUERY_RETURN_CARD
105 MENUITEM SEPARATOR 106 MENUITEM SEPARATOR
106 MENUITEM "更改密码", ID_MODIFY_CARD_PWD 107 MENUITEM "更改密码", ID_MODIFY_CARD_PWD
107 MENUITEM "重置密码", ID_RESET_CARD_PWD 108 MENUITEM "重置密码", ID_RESET_CARD_PWD
@@ -245,8 +246,8 @@ END @@ -245,8 +246,8 @@ END
245 // 246 //
246 247
247 VS_VERSION_INFO VERSIONINFO 248 VS_VERSION_INFO VERSIONINFO
248 - FILEVERSION 4,0,0,0  
249 - PRODUCTVERSION 4,0,0,0 249 + FILEVERSION 4,0,1,0
  250 + PRODUCTVERSION 4,0,1,0
250 FILEFLAGSMASK 0x3fL 251 FILEFLAGSMASK 0x3fL
251 #ifdef _DEBUG 252 #ifdef _DEBUG
252 FILEFLAGS 0x1L 253 FILEFLAGS 0x1L
@@ -263,12 +264,12 @@ BEGIN @@ -263,12 +264,12 @@ BEGIN
263 BEGIN 264 BEGIN
264 VALUE "CompanyName", "地利集团【DILI GROUP】" 265 VALUE "CompanyName", "地利集团【DILI GROUP】"
265 VALUE "FileDescription", "电子交易结算柜员系统【ETradeClient】" 266 VALUE "FileDescription", "电子交易结算柜员系统【ETradeClient】"
266 - VALUE "FileVersion", "4.0.0.0"  
267 - VALUE "InternalName", "电子交易结算柜员系统v4.0.0" 267 + VALUE "FileVersion", "4.0.1.0"
  268 + VALUE "InternalName", "电子交易结算柜员系统"
268 VALUE "LegalCopyright", "(C) 地利集团保留所有权利。" 269 VALUE "LegalCopyright", "(C) 地利集团保留所有权利。"
269 - VALUE "OriginalFilename", "电子交易结算柜员系统v4.0.0" 270 + VALUE "OriginalFilename", "电子交易结算柜员系统"
270 VALUE "ProductName", "电子交易结算柜员系统" 271 VALUE "ProductName", "电子交易结算柜员系统"
271 - VALUE "ProductVersion", "4.0.0" 272 + VALUE "ProductVersion", "4.0.1.0"
272 END 273 END
273 END 274 END
274 BLOCK "VarFileInfo" 275 BLOCK "VarFileInfo"
etrade_card_client/resource.h
  View file @04171be
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
46 #define ID_RESTORE_CARD_LOSS 50050 46 #define ID_RESTORE_CARD_LOSS 50050
47 #define ID_CHANGE_CARD 50060 47 #define ID_CHANGE_CARD 50060
48 #define ID_RETURN_CARD 50070 48 #define ID_RETURN_CARD 50070
  49 +#define ID_QUERY_RETURN_CARD 50071
49 #define ID_MODIFY_CARD_PWD 50080 50 #define ID_MODIFY_CARD_PWD 50080
50 #define ID_RESET_CARD_PWD 50090 51 #define ID_RESET_CARD_PWD 50090
51 #define ID_UNLOCK_CARD 50100 52 #define ID_UNLOCK_CARD 50100
@@ -59,11 +60,11 @@ @@ -59,11 +60,11 @@
59 #define ID_FEE_PAYMENT 50160 60 #define ID_FEE_PAYMENT 50160
60 #define ID_SETTLE_ACCOUNTS_APPLY 50170 61 #define ID_SETTLE_ACCOUNTS_APPLY 50170
61 #define ID_CUSTOMER_QUERY 50180 62 #define ID_CUSTOMER_QUERY 50180
62 -#define ID_OPERATING_RECORD 50185  
63 #define ID_CUS_MANAGE 50181 63 #define ID_CUS_MANAGE 50181
64 #define ID_ETC_QUERY 50182 64 #define ID_ETC_QUERY 50182
65 #define ID_ETC_SERVICE 50183 65 #define ID_ETC_SERVICE 50183
66 #define ID_KING_CARD 50184 66 #define ID_KING_CARD 50184
  67 +#define ID_OPERATING_RECORD 50185
67 #define ID_ACCOUNT_TRANSFER 50190 68 #define ID_ACCOUNT_TRANSFER 50190
68 #define ID_OPER_LOG_QUERY 50190 69 #define ID_OPER_LOG_QUERY 50190
69 #define ID_INDICATOR_TIME 59142 70 #define ID_INDICATOR_TIME 59142
@@ -73,7 +74,7 @@ @@ -73,7 +74,7 @@
73 #ifdef APSTUDIO_INVOKED 74 #ifdef APSTUDIO_INVOKED
74 #ifndef APSTUDIO_READONLY_SYMBOLS 75 #ifndef APSTUDIO_READONLY_SYMBOLS
75 #define _APS_NEXT_RESOURCE_VALUE 326 76 #define _APS_NEXT_RESOURCE_VALUE 326
76 -#define _APS_NEXT_COMMAND_VALUE 32842 77 +#define _APS_NEXT_COMMAND_VALUE 32845
77 #define _APS_NEXT_CONTROL_VALUE 1018 78 #define _APS_NEXT_CONTROL_VALUE 1018
78 #define _APS_NEXT_SYMED_VALUE 311 79 #define _APS_NEXT_SYMED_VALUE 311
79 #endif 80 #endif