feat<central-clearing-system>:调整基础资料菜单

liuye
1 parent 69748a72
Showing 164 changed files with 18444 additions and 12 deletions
central_clearing_system/Config/menu_res_auth_cfg.json
central_clearing_system/ETradeClient.rc
central_clearing_system/Resource.h
doc/各市场版本/20181116/综合业务系统/Config/application_config
doc/各市场版本/20181116/综合业务系统/Config/menu_res_auth_cfg
doc/各市场版本/20181116/综合业务系统/Config/url_cfg
doc/各市场版本/20181116/综合业务系统/Resource/APP.ico
doc/各市场版本/20181116/综合业务系统/Resource/INSTALL.ico
doc/各市场版本/20181116/综合业务系统/Resource/Login/batton.png
doc/各市场版本/20181116/综合业务系统/Resource/Login/error.bmp
doc/各市场版本/20181116/综合业务系统/Resource/Login/error.png
doc/各市场版本/20181116/综合业务系统/Resource/Login/hover.png
doc/各市场版本/20181116/综合业务系统/Resource/Login/login-bg.png
doc/各市场版本/20181116/综合业务系统/Resource/Menu/about.ico
doc/各市场版本/20181116/综合业务系统/Resource/Menu/agreement.ico
doc/各市场版本/20181116/综合业务系统/Resource/Menu/buckle-list.ico
doc/各市场版本/20181116/综合业务系统/Resource/Menu/cash_recharge.ico
doc/各市场版本/20181116/综合业务系统/Resource/Menu/cash_withdraw.ico
doc/各市场版本/20181116/综合业务系统/Resource/Menu/cate_manage.ico
doc/各市场版本/20181116/综合业务系统/Resource/Menu/change_card.ico
@@ -8,14 +8,14 @@
 	{"res_id":20003, 	"auth_id":101003,     "icon":"query_manage.ico", 		"index":[1, 2]},
 	{"res_id":20004, 	"auth_id":101004,     "icon":"special_handle.ico", 		"index":[1, 3]},
 	{"res_id":4, 		"auth_id":1020, 	  "icon":"", 						"index":[2]},
-	{"res_id":40001, 	"auth_id":102001,     "icon":"point_rule.ico", 			"index":[2, 0]},
-	{"res_id":40002, 	"auth_id":102002,     "icon":"cate_manage.ico", 		"index":[2, 1]},
-	{"res_id":40003, 	"auth_id":102003,     "icon":"agreement.ico", 			"index":[2, 2]},
-	{"res_id":40004, 	"auth_id":102004,     "icon":"consign_manage.ico", 		"index":[2, 3]},
-	{"res_id":40006, 	"auth_id":102005,     "icon":"buckle-list.ico", 		"index":[2, 4]},
-	{"res_id":40007, 	"auth_id":102006,     "icon":"pay-black-list.ico", 		"index":[2, 6]},
-	{"res_id":40008, 	"auth_id":102007,     "icon":"pay-white-list.ico", 		"index":[2, 7]},
-	{"res_id":40009, 	"auth_id":102008,     "icon":"pay-mode.ico", 			"index":[2, 8]},
+	{"res_id":40002, 	"auth_id":102002,     "icon":"cate_manage.ico", 		"index":[2, 0]},
+	{"res_id":40003, 	"auth_id":102003,     "icon":"agreement.ico", 			"index":[2, 1]},
+	{"res_id":40004, 	"auth_id":102004,     "icon":"consign_manage.ico", 		"index":[2, 2]},
+	{"res_id":40001, 	"auth_id":102001,     "icon":"point_rule.ico", 			"index":[2, 4]},
+	{"res_id":40006, 	"auth_id":102005,     "icon":"buckle-list.ico", 		"index":[2, 5]},
+	{"res_id":40009, 	"auth_id":102008,     "icon":"pay-mode.ico", 			"index":[2, 7]},
+	{"res_id":40007, 	"auth_id":102006,     "icon":"pay-black-list.ico", 		"index":[2, 8]},
+	{"res_id":40008, 	"auth_id":102007,     "icon":"pay-white-list.ico", 		"index":[2, 9]},
 	{"res_id":5, 		"auth_id":1040, 	  "icon":"", 						"index":[3]},
 	{"res_id":50001, 	"auth_id":104001,     "icon":"user.ico", 				"index":[3, 0]},
 	{"res_id":50002, 	"auth_id":104002,     "icon":"role.ico", 				"index":[3, 1]},
@@ -91,15 +91,16 @@ BEGIN
     END
     POPUP "基础资料"
     BEGIN
-        MENUITEM "扣点规则",                        ID_POINT_RULE
         MENUITEM "品类管理",                        ID_CATEGORY_RULE
         MENUITEM "免密协议",                        ID_AGREEMENT
         MENUITEM "代卖货管理",                       ID_TAPE_HANDLE
+        MENUITEM SEPARATOR
+        MENUITEM "扣点规则",                        ID_POINT_RULE
         MENUITEM "扣点白名单",                       ID_KOUDIAN_WHITE_LIST
         MENUITEM SEPARATOR
+        MENUITEM "支付方式管理",                      ID_PAY_MANAGE
         MENUITEM "支付黑名单",                       ID_PAY_BLACK_LIST
         MENUITEM "支付白名单",                       ID_PAY_WHITE_LIST
-        MENUITEM "支付方式管理",                      ID_PAY_MANAGE
     END
     POPUP "系统设置"
     BEGIN
@@ -92,6 +92,7 @@
 #define ID_ACCELERATOR_F                32886
 #define ID_ACCELERATOR_X                32887
 #define ID_ACCELERATOR_A                32895
+#define ID_Menu                         32909
 #define ID_POINT_RULE                   40001
 #define ID_CATEGORY_RULE                40002
 #define ID_AGREEMENT                    40003
@@ -106,13 +107,12 @@
 #define ID_PARAM_SET                    50003
 #define ID_LOG                          50004
-
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        333
-#define _APS_NEXT_COMMAND_VALUE         32909
+#define _APS_NEXT_COMMAND_VALUE         32910
 #define _APS_NEXT_CONTROL_VALUE         1055
 #define _APS_NEXT_SYMED_VALUE           311
 #endif
+`®˜ÍDÌgýiÅ¶"X	©—ß3ŒHç[i*°Í·dx–X	Ž²*7/B¤ÁžUø´>C“ž…èd
F9WîˆF³'ƒå
+t)MpEOÄwOï+ Gâïvž¢+oãLYGyìÔYC¹
$‰Íì/_Jh‘íÒüM•,ßŠB÷@@„;q¼;u0o„Ÿƒ5Z5u
˜kŠŠì¶î4ô*Û¤´O/óÚ¾A”˜ô1ÕˆÎåaœAêÜæcAª% ›š\æ±'7çÕG©Áo	Ô…ÍÄø¶ªVqö¾’ kÞöÛýqsµ3¾¿e¿&òMcc;vÚÂ-!T³¦&¯=WryªŠÊ:çüÍ;Q4,åq^K“ÆAÑ	:s“èñF!m(7wfEEò+²TžR¸uác°PÅß¤î>ÔN}èY–Í4Îƒ*kÒÏrM^nGÙ²¾œ}2™&Q~÷æÌâû«98Æ
²@WU´Ãñ!]ÉÇù>(× Œ„•ô?®Ìë>¬ç:kR=jªvÞ,¾\né+þ8£²è(+Ü\^ºÖX”½Ô¸«#
¨Ë]ˆãè®û~RWb
è%Ã;Dû…ãÞË,ãªµTŽ	Šø5ªøfÙ«´¥tscÿök®úÊÑà¢¯Ë}
+é”t'®KHhbÇi3
ÌåÊý,tÎªº96_–wû…AˆÏÝbFìÀwN”{8)†Òp60Z(YÄIQ¢ÍqºRV=[gËŒø×‰O“q#:#‚à"Ù1wTØ†íìRò}ß(½SSÂ’ßp›{óõ –%ÚÐ6lßQ[ëâÐ¸óD„ÿ¶³¤˜‰1öDÃÍäž¢zÛœÆ²ÿ0_=ícbø–£$£ËãÊv¼IŠB:ù«DB~Y*'»=Å>3“Ë°qÊ®]oiïã¸‚Õ‹
 \ No newline at end of file
+更新内容：
+1.修复了打开客户端时，提示缺少动态链接库的问题；
 \ No newline at end of file