Browse Source

调整主题颜色,修复商品名字只显示一行的问题

张洋 1 month ago
parent
commit
6e5df2d65e
59 changed files with 217 additions and 182 deletions
  1. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/attention_dlg.xml
  2. 2 2
      bin/Win32/Debug/zhipuzi_pos_windows/skin/chengzhong_wnd.xml
  3. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/chufang_printer_setting.xml
  4. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_wutu.xml
  5. 5 5
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu.xml
  6. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_2.xml
  7. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_3.xml
  8. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_nature_wnd.xml
  9. 7 7
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml
  10. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/dianneiorder_list_page.xml
  11. 6 6
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fulika_shoukuan_wnd.xml
  12. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/fuping_wnd.xml
  13. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/guadan_wnd.xml
  14. 4 4
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_add_wnd.xml
  15. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_bangka_wnd.xml
  16. 21 21
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_chongzhi_wnd.xml
  17. 5 5
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_info_show_wnd.xml
  18. 5 5
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_page.xml
  19. 6 6
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_shoukuan_wnd.xml
  20. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_xiugaimima_wnd.xml
  21. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_xiugaiziliao_wnd.xml
  22. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/image_attention_dlg.xml
  23. 3 3
      bin/Win32/Debug/zhipuzi_pos_windows/skin/login.xml
  24. 3 3
      bin/Win32/Debug/zhipuzi_pos_windows/skin/member_login_dlg.xml
  25. 70 35
      bin/Win32/Debug/zhipuzi_pos_windows/skin/memo_edit_dlg.xml
  26. 2 2
      bin/Win32/Debug/zhipuzi_pos_windows/skin/num_input_dlg.xml
  27. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_cika_dlg.xml
  28. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_quanyika_dlg.xml
  29. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_shangpinquan_dlg.xml
  30. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_youhuiquan_dlg.xml
  31. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/saomashouyin_page.xml
  32. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_create_wnd.xml
  33. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_newtype_wnd.xml
  34. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_update_wnd.xml
  35. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shoukuan_page.xml
  36. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shoukuanorder_list_page.xml
  37. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/tabletype_option.xml
  38. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/third_delivery_select_dlg.xml
  39. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/update.xml
  40. 6 6
      bin/Win32/Debug/zhipuzi_pos_windows/skin/weixinzhifu_shoukuan_wnd.xml
  41. 11 11
      bin/Win32/Debug/zhipuzi_pos_windows/skin/xianjin_shoukuan_wnd.xml
  42. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/youhui_show_dlg.xml
  43. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/yubaozhuangbiaoqian_page.xml
  44. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml
  45. 2 2
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_kaitai_input_dlg.xml
  46. 2 2
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_renshu_dlg.xml
  47. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_saomadiancan_wnd.xml
  48. 1 1
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcanorder_list_page.xml
  49. 6 6
      bin/Win32/Debug/zhipuzi_pos_windows/skin/zidingyi_shoukuan_wnd.xml
  50. 1 1
      zhipuzi_pos_windows/control/CZhengcanTableItemUI.cpp
  51. 2 2
      zhipuzi_pos_windows/page/CAIxuexiPageUI.cpp
  52. 2 2
      zhipuzi_pos_windows/page/CDiandanPageUI.cpp
  53. 3 3
      zhipuzi_pos_windows/page/CHuiyuanPageUI.cpp
  54. 2 2
      zhipuzi_pos_windows/page/CShangpinPageUI.cpp
  55. 2 2
      zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp
  56. 2 2
      zhipuzi_pos_windows/page/CZhengcanPageUI.cpp
  57. BIN
      zhipuzi_pos_windows/resource/skin.zip
  58. 4 4
      zhipuzi_pos_windows/wnd/CHuiyuanInfoShowWnd.cpp
  59. 2 2
      zhipuzi_pos_windows/wnd/CUpdateWnd.cpp

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/attention_dlg.xml

@@ -2,7 +2,7 @@
 <Window size="600,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 2 - 2
bin/Win32/Debug/zhipuzi_pos_windows/skin/chengzhong_wnd.xml

@@ -2,7 +2,7 @@
 <Window size="700,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
@@ -12,7 +12,7 @@
 				<Label name="name" text="商品重量" height="30" width="300" padding="30,50,0,0" align="left"/>
 	
 				<HorizontalLayout height="50" padding="0,30,0,0">
-					<Edit name="content" width="250" height="50" padding="30,0,0,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
+					<Edit name="content" width="250" height="50" padding="30,0,0,0" textcolor="0xFF60B177" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
 					<Label name="name" text="公斤" height="50" width="50" padding="30,0,0,0" align="left"/>
 				</HorizontalLayout>				
 				

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/chufang_printer_setting.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,600" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="chufang_setting_title" text="新建厨房打印机" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF"/>
 			<Button name="chufang_setting_closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_wutu.xml

@@ -4,7 +4,7 @@
 	<DiandanFoodItem name="diandan_fooditem" width="148" height="96" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r8.png' corner='8,8,8,8'">
 		<VerticalLayout width="148" height="96" inset="10,26,10,10" childpadding="5">
 			<Control></Control>
-			<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" valign="top" wordbreak="true" endellipsis="true" align="center"></Label>
+			<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" wordbreak="true" endellipsis="true" align="center"></Label>
 			<Label name="price" height="19" font="113" textcolor="#FFF5623D" valign="top" align="center"></Label>
 			<Control></Control>
 		</VerticalLayout>

+ 5 - 5
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<!-- 样式① 图上文下 148x164:图 140x96 内缩 4 避圆角,文字区 64 高(名字 2 行 + 价格贴底) -->
-	<DiandanFoodItem name="diandan_fooditem" width="148" height="164" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r10.png' corner='10,10,10,10'">
+	<!-- 样式① 图上文下 148x172:图 140x96 内缩 4 避圆角,文字区 72 高(名字 2 行 40 + 价格贴底) -->
+	<DiandanFoodItem name="diandan_fooditem" width="148" height="172" bkcolor="#00000000" bordersize="0" bkimage="file='fc_r10.png' corner='10,10,10,10'">
 		<Control name="image" width="148" height="96" bkimage="file='fc_img_ph.png'"></Control>
-		<Control bkimage="file='fc_topmask.png'" width="148" height="164" float="true" pos="0,0,148,164" mouse="false"/>
+		<Control bkimage="file='fc_topmask.png'" width="148" height="172" float="true" pos="0,0,148,172" mouse="false"/>
 
-		<VerticalLayout width="148" height="64" inset="10,6,10,2">
-			<Label name="foodname" height="36" font="13" textcolor="#FF1F2329" valign="top" wordbreak="true" endellipsis="true"></Label>
+		<VerticalLayout width="148" height="72" inset="10,6,10,2">
+			<Label name="foodname" height="40" font="13" textcolor="#FF1F2329" wordbreak="true" endellipsis="true"></Label>
 			<Control></Control>
 			<Label name="price" height="20" font="114" textcolor="#FFF5623D" valign="top"></Label>
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_2.xml

@@ -6,7 +6,7 @@
 			<Control name="image" width="62" height="62" maxheight="62" bkimage="file='fc_img_ph.png'"></Control>
 
 			<VerticalLayout width="176" height="70" maxheight="70">
-				<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" valign="top" wordbreak="true" endellipsis="true"></Label>
+				<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" wordbreak="true" endellipsis="true"></Label>
 				<Control></Control>
 				<Label name="price" height="19" font="113" textcolor="#FFF5623D" valign="top"></Label>
 			</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_youtu_3.xml

@@ -5,7 +5,7 @@
 		<Control name="image" width="148" height="150" padding="3,3,3,0" bkimage="file='fc_img_ph.png'"></Control>
 
 		<VerticalLayout width="142" height="66" float="true" pos="3,81,145,147" mouse="false" inset="8,5,8,6" childpadding="2">
-			<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" valign="top" wordbreak="true" endellipsis="true"></Label>
+			<Label name="foodname" height="34" font="12" textcolor="#FF1F2329" wordbreak="true" endellipsis="true"></Label>
 			<Label name="price" height="19" font="113" textcolor="#FFF5623D" valign="top"></Label>
 		</VerticalLayout>
 		<Label name="nature" visible="false" width="54" height="22" font="12" text="多属性" float="true" pos="10,8,64,30" textcolor="#FFFFFFFF" bkimage="file='fc_chip_grn.png' corner='11,11,11,11'" align="center" valign="center"></Label>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_nature_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,600" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >		
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="diandan_nature_title" text="选择商品属性" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF"/>
 			<Button name="closebtn" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 7 - 7
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -195,12 +195,12 @@
 			</VerticalLayout>
 
 			<!-- ============ 结算面板(默认隐藏,内部保持原样) ============ -->
-			<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFF5F7FA" childpadding="12" visible="false">
+			<HorizontalLayout name="diandan_jiesuan_layout" bkcolor="#FFF5F7FA" inset="8,8,8,8" childpadding="12" visible="false">
 				<VerticalLayout name="diandan_jiesuan_youhui_layout" width="330" bkimage="file='card_r10.png' corner='10,10,10,10'">
 					<HorizontalLayout height="48" inset="18,0,18,0" childvalign="vcenter">
 						<Label text="选择优惠" width="120" height="48" font="16" textcolor="#FF1F2329" valign="center"/>
 						<Control></Control>
-						<Button name="diandan_jiesuan_yincangyouhui_btn" text="隐藏优惠" height="30" maxheight="30" width="80" font="12" textcolor="#FF3CB371" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+						<Button name="diandan_jiesuan_yincangyouhui_btn" text="隐藏优惠" height="30" maxheight="30" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
 					</HorizontalLayout>
 
 					<Control height="1" bkcolor="#FFF0F1F3"/>
@@ -228,7 +228,7 @@
 							<Label text="优惠券:" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
 							<Label name="diandan_jiesuan_youhuiquan_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
 							<Control></Control>
-							<Button name="diandan_jiesuan_youhuiquan_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF3CB371" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+							<Button name="diandan_jiesuan_youhuiquan_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
 							<Button name="diandan_jiesuan_youhuiquan_btn_cancel" visible="false" text="取消使用" height="28" maxheight="28" width="80" font="12" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'"/>
 						</HorizontalLayout>
 
@@ -236,7 +236,7 @@
 							<Label text="商品券:" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
 							<Label name="diandan_jiesuan_shangpinquan_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
 							<Control></Control>
-							<Button name="diandan_jiesuan_shangpinquan_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF3CB371" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+							<Button name="diandan_jiesuan_shangpinquan_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
 							<Button name="diandan_jiesuan_shangpinquan_btn_cancel" visible="false" text="取消使用" height="28" maxheight="28" width="80" font="12" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'"/>
 						</HorizontalLayout>
 
@@ -244,7 +244,7 @@
 							<Label text="次卡:" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
 							<Label name="diandan_jiesuan_cika_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
 							<Control></Control>
-							<Button name="diandan_jiesuan_cika_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF3CB371" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+							<Button name="diandan_jiesuan_cika_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
 							<Button name="diandan_jiesuan_cika_btn_cancel" visible="false" text="取消使用" height="28" maxheight="28" width="80" font="12" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'"/>
 						</HorizontalLayout>
 
@@ -252,7 +252,7 @@
 							<Label text="权益卡:" width="72" maxwidth="72" height="36" font="13" textcolor="#FF5F6368" valign="center"/>
 							<Label name="diandan_jiesuan_quanyika_status" text="未使用" width="60" maxwidth="60" height="36" font="13" textcolor="#FF8A9099" valign="center"/>
 							<Control></Control>
-							<Button name="diandan_jiesuan_quanyika_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF3CB371" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+							<Button name="diandan_jiesuan_quanyika_btn" text="扫码使用" height="28" maxheight="28" width="80" font="12" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
 							<Button name="diandan_jiesuan_quanyika_btn_cancel" visible="false" text="取消使用" height="28" maxheight="28" width="80" font="12" textcolor="#FFE14B4A" normalimage="file='btn_r8_red_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_red_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_red_p.png' corner='8,8,8,8'"/>
 						</HorizontalLayout>
 
@@ -281,7 +281,7 @@
 					<HorizontalLayout height="48">
 						<Label text="账单明细" height="48" padding="18,0,0,0" font="16"/>
 						<Control></Control>
-						<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" visible="false" height="30" maxheight="30" width="80" padding="0,11,18,0" textcolor="#FF3CB371" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
+						<Button name="diandan_jiesuan_xianshiyouhui_btn" text="显示优惠" visible="false" height="30" maxheight="30" width="80" padding="0,11,18,0" textcolor="#FF60B177" normalimage="file='btn_r8_green_n.png' corner='8,8,8,8'" hotimage="file='btn_r8_green_h.png' corner='8,8,8,8'" pushedimage="file='btn_r8_green_p.png' corner='8,8,8,8'"/>
 					</HorizontalLayout>
 
 					<Control height="1" bkcolor="#FFF0F1F3" padding="10,0,10,0"/>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/dianneiorder_list_page.xml

@@ -17,7 +17,7 @@
 			<Control height="1" bkcolor="#FFEAEAEA" padding="0,0,0,0"></Control>
 			
 			<HorizontalLayout bkcolor="#FFFFFFFF" height="70">
-				<Button name="orderlist_diandan_btn" text="点单订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF3CB371"></Button>
+				<Button name="orderlist_diandan_btn" text="点单订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF60B177"></Button>
 				
 				<Button name="orderlist_zhengcan_btn" text="正餐订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
 				

+ 6 - 6
bin/Win32/Debug/zhipuzi_pos_windows/skin/fulika_shoukuan_wnd.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,740" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="福利卡收款" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
 		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" padding="0,20,0,0">			
 			<HorizontalLayout name="shoukuan_money_show_layout" height="50" padding="0,15,0,15">
-				<Label text="¥" font="24" textcolor="0xFF3CB371" float="true" pos="320,24,335,50"/>
-				<Label name="shoukuan_money_show_money" font="40" textcolor="0xFF3CB371" float="true" pos="345,12,620,48"/>
+				<Label text="¥" font="24" textcolor="0xFF60B177" float="true" pos="320,24,335,50"/>
+				<Label name="shoukuan_money_show_money" font="40" textcolor="0xFF60B177" float="true" pos="345,12,620,48"/>
 			</HorizontalLayout>
 			
 			<HorizontalLayout height="40" padding="0,20,0,0">
@@ -92,16 +92,16 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
-			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
 			
-			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/fuping_wnd.xml

@@ -44,7 +44,7 @@
 			</VerticalLayout>
 		</HorizontalLayout>
 		
-		<HorizontalLayout name="shoukuan_title_bkg" height="36" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="36" bkcolor="0xFF60B177">
 			<Control></Control>
 			<Control bkimage="logo_small.png" width="38" height="23" padding="0,6,5,6"></Control>
 			<Label text="智铺子收银系统  www.zhipuzi.com" width="280" textcolor="#FFFFFFFF"></Label>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/guadan_wnd.xml

@@ -2,7 +2,7 @@
 <Window size="700,650" caption="0,0,0,36" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 4 - 4
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_add_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,534" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="添加会员" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
@@ -66,15 +66,15 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
-			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">			
-			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_bangka_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,534" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="绑定实体卡" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>		

+ 21 - 21
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_chongzhi_wnd.xml

@@ -3,7 +3,7 @@
 
 	<VerticalLayout bkcolor="#FFFFFFFF">
 
-		<HorizontalLayout name="shoukuan_title_bkg" height="52" bkcolor="#FF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="52" bkcolor="#FF60B177">
 			<Label text="会员充值" height="52" align="center" valign="center" textcolor="#FFFFFFFF" font="15" />
 			<Button name="closebtn" keyboard="false" float="true" pos="820,18,836,34" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'" />
 		</HorizontalLayout>
@@ -19,7 +19,7 @@
 						<Label text="当前余额" font="13" textcolor="#FF8A9099" width="436" height="20" />
 						<Control width="436" height="2" />
 						<HorizontalLayout width="436" height="44" childvalign="vcenter">
-							<Label name="huiyuan_chongzhi_curbalance" text="¥0.00" font="36" textcolor="#FF3CB371" height="44" maxheight="44" autocalcwidth="true" valign="center" />
+							<Label name="huiyuan_chongzhi_curbalance" text="¥0.00" font="36" textcolor="#FF60B177" height="44" maxheight="44" autocalcwidth="true" valign="center" />
 							<Control width="8" height="44" />
 							<Label text="元" font="16" textcolor="#FF5F6368" width="24" height="44" maxheight="44" valign="center" />
 							<Control width="20" height="44" />
@@ -43,13 +43,13 @@
 						<!-- 快选金额:用明确占位+固定间距,避免 DuiLib childpadding 在首个子控件前额外加 padding 导致 100元 无法与输入框左对齐 -->
 						<HorizontalLayout width="440" height="34" childvalign="vcenter">
 							<Control width="68" height="34" />
-							<Button name="xianjin_kuaijie_100" text="100元" font="13" textcolor="#FF5F6368" width="72" height="34" maxheight="34" bkcolor="#00000000" hotbkcolor="#00000000" pushedbkcolor="#00000000" normalimage="file='tag_normal_72.png'" hotimage="file='tag_hover_72.png'" pushedimage="file='tag_pushed_72.png'" hottextcolor="#FF3CB371" pushedtextcolor="#FFFFFFFF" />
+							<Button name="xianjin_kuaijie_100" text="100元" font="13" textcolor="#FF5F6368" width="72" height="34" maxheight="34" bkcolor="#00000000" hotbkcolor="#00000000" pushedbkcolor="#00000000" normalimage="file='tag_normal_72.png'" hotimage="file='tag_hover_72.png'" pushedimage="file='tag_pushed_72.png'" hottextcolor="#FF60B177" pushedtextcolor="#FFFFFFFF" />
 							<Control width="10" height="34" />
-							<Button name="xianjin_kuaijie_200" text="200元" font="13" textcolor="#FF5F6368" width="72" height="34" maxheight="34" bkcolor="#00000000" hotbkcolor="#00000000" pushedbkcolor="#00000000" normalimage="file='tag_normal_72.png'" hotimage="file='tag_hover_72.png'" pushedimage="file='tag_pushed_72.png'" hottextcolor="#FF3CB371" pushedtextcolor="#FFFFFFFF" />
+							<Button name="xianjin_kuaijie_200" text="200元" font="13" textcolor="#FF5F6368" width="72" height="34" maxheight="34" bkcolor="#00000000" hotbkcolor="#00000000" pushedbkcolor="#00000000" normalimage="file='tag_normal_72.png'" hotimage="file='tag_hover_72.png'" pushedimage="file='tag_pushed_72.png'" hottextcolor="#FF60B177" pushedtextcolor="#FFFFFFFF" />
 							<Control width="10" height="34" />
-							<Button name="xianjin_kuaijie_500" text="500元" font="13" textcolor="#FF5F6368" width="72" height="34" maxheight="34" bkcolor="#00000000" hotbkcolor="#00000000" pushedbkcolor="#00000000" normalimage="file='tag_normal_72.png'" hotimage="file='tag_hover_72.png'" pushedimage="file='tag_pushed_72.png'" hottextcolor="#FF3CB371" pushedtextcolor="#FFFFFFFF" />
+							<Button name="xianjin_kuaijie_500" text="500元" font="13" textcolor="#FF5F6368" width="72" height="34" maxheight="34" bkcolor="#00000000" hotbkcolor="#00000000" pushedbkcolor="#00000000" normalimage="file='tag_normal_72.png'" hotimage="file='tag_hover_72.png'" pushedimage="file='tag_pushed_72.png'" hottextcolor="#FF60B177" pushedtextcolor="#FFFFFFFF" />
 							<Control width="10" height="34" />
-							<Button name="xianjin_kuaijie_1000" text="1000元" font="13" textcolor="#FF5F6368" width="82" height="34" maxheight="34" bkcolor="#00000000" hotbkcolor="#00000000" pushedbkcolor="#00000000" normalimage="file='tag_normal_82.png'" hotimage="file='tag_hover_82.png'" pushedimage="file='tag_pushed_82.png'" hottextcolor="#FF3CB371" pushedtextcolor="#FFFFFFFF" />
+							<Button name="xianjin_kuaijie_1000" text="1000元" font="13" textcolor="#FF5F6368" width="82" height="34" maxheight="34" bkcolor="#00000000" hotbkcolor="#00000000" pushedbkcolor="#00000000" normalimage="file='tag_normal_82.png'" hotimage="file='tag_hover_82.png'" pushedimage="file='tag_pushed_82.png'" hottextcolor="#FF60B177" pushedtextcolor="#FFFFFFFF" />
 						</HorizontalLayout>
 
 						<Control width="440" height="6" />
@@ -106,24 +106,24 @@
 					<Control width="320" height="1" />
 					<VerticalLayout width="320" height="458" childpadding="6">
 						<HorizontalLayout width="320" height="110" childpadding="10">
-							<Button name="jianpan_1" text="1" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
-							<Button name="jianpan_2" text="2" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
-							<Button name="jianpan_3" text="3" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
+							<Button name="jianpan_1" text="1" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+							<Button name="jianpan_2" text="2" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+							<Button name="jianpan_3" text="3" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
 						</HorizontalLayout>
 						<HorizontalLayout width="320" height="110" childpadding="10">
-							<Button name="jianpan_4" text="4" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
-							<Button name="jianpan_5" text="5" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
-							<Button name="jianpan_6" text="6" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
+							<Button name="jianpan_4" text="4" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+							<Button name="jianpan_5" text="5" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+							<Button name="jianpan_6" text="6" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
 						</HorizontalLayout>
 						<HorizontalLayout width="320" height="110" childpadding="10">
-							<Button name="jianpan_7" text="7" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
-							<Button name="jianpan_8" text="8" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
-							<Button name="jianpan_9" text="9" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
+							<Button name="jianpan_7" text="7" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+							<Button name="jianpan_8" text="8" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+							<Button name="jianpan_9" text="9" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
 						</HorizontalLayout>
 						<HorizontalLayout width="320" height="110" childpadding="10">
-							<Button name="jianpan_qingkong" text="清空" font="15" textcolor="#FF5F6368" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
-							<Button name="jianpan_0" text="0" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
-							<Button name="jianpan_x" text="×" font="24" textcolor="#FF5F6368" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF3CB371" />
+							<Button name="jianpan_qingkong" text="清空" font="15" textcolor="#FF5F6368" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+							<Button name="jianpan_0" text="0" font="24" textcolor="#FF1F2329" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
+							<Button name="jianpan_x" text="×" font="24" textcolor="#FF5F6368" width="100" height="110" normalimage="file='key_normal.png' corner='12,12,12,12'" hotimage="file='key_hover.png' corner='12,12,12,12'" pushedimage="file='key_pushed.png' corner='12,12,12,12'" pushedtextcolor="#FF60B177" />
 						</HorizontalLayout>
 					</VerticalLayout>
 					<Control width="320" height="1" />
@@ -157,16 +157,16 @@
 				<Control />
 			</HorizontalLayout>
 
-			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="充值金额:" font="18" textcolor="#FF3CB371" align="center" />
+			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="充值金额:" font="18" textcolor="#FF60B177" align="center" />
 
-			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="14" textcolor="#FF3CB371" align="center" />
+			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="14" textcolor="#FF60B177" align="center" />
 
 			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="14" textcolor="#FF8A9099" wordbreak="true" align="center" />
 		</VerticalLayout>
 
 		<!-- 支付成功 -->
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
-			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="充值成功:" font="18" textcolor="#FF3CB371" align="center" />
+			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="充值成功:" font="18" textcolor="#FF60B177" align="center" />
 
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="14" textcolor="#FF8A9099" wordbreak="true" align="center" />
 		</VerticalLayout>

+ 5 - 5
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_info_show_wnd.xml

@@ -4,7 +4,7 @@
 	<VerticalLayout width="520" height="564" bkcolor="#FFF5F7FA">
 
 		<!-- ==================== 头部(520 x 132,纯色绿,冻结态由代码置灰) ==================== -->
-		<VerticalLayout name="huiyuan_info_head" width="520" height="132" bkcolor="#FF3CB371">
+		<VerticalLayout name="huiyuan_info_head" width="520" height="132" bkcolor="#FF60B177">
 
 			<!-- 标题栏 44:标题在左侧,关闭按钮 float 在右上角 -->
 			<HorizontalLayout width="520" height="44" padding="20,0,20,0" childvalign="center">
@@ -22,7 +22,7 @@
 					<HorizontalLayout width="410" height="22">
 						<Label name="huiyuan_info_level" text="" font="12" textcolor="#FFFFFFFF" width="88" height="22" maxheight="22" align="center" valign="center" bkimage="file='hyinfo_pill_level.png'" />
 						<Control width="8" height="22" />
-						<Label name="huiyuan_info_status" text="" font="12" textcolor="#FF3CB371" width="56" height="22" maxheight="22" align="center" valign="center" bkimage="file='hyinfo_pill_state.png'" />
+						<Label name="huiyuan_info_status" text="" font="12" textcolor="#FF60B177" width="56" height="22" maxheight="22" align="center" valign="center" bkimage="file='hyinfo_pill_state.png'" />
 					</HorizontalLayout>
 				</VerticalLayout>
 			</HorizontalLayout>
@@ -42,7 +42,7 @@
 				<VerticalLayout width="240" height="92" padding="0,18,0,18">
 					<Label text="可用积分" font="13" textcolor="#FF8A9099" width="240" height="20" maxheight="20" align="center" valign="center" />
 					<Control width="240" height="6" />
-					<Label name="huiyuan_info_point" text="0" font="26" textcolor="#FF3CB371" width="240" height="30" maxheight="30" align="center" valign="center" />
+					<Label name="huiyuan_info_point" text="0" font="26" textcolor="#FF60B177" width="240" height="30" maxheight="30" align="center" valign="center" />
 				</VerticalLayout>
 			</HorizontalLayout>
 
@@ -74,7 +74,7 @@
 					</HorizontalLayout>
 					<HorizontalLayout width="222" height="42" childvalign="vcenter">
 						<Label text="密码支付" font="13" textcolor="#FF8A9099" width="74" height="30" maxheight="30" valign="center" />
-						<Label name="huiyuan_info_pay_password" text="已开启" font="12" textcolor="#FF3CB371" width="52" height="22" maxheight="22" align="center" valign="center" bkimage="file='hyinfo_tag_on.png'" />
+						<Label name="huiyuan_info_pay_password" text="已开启" font="12" textcolor="#FF60B177" width="52" height="22" maxheight="22" align="center" valign="center" bkimage="file='hyinfo_tag_on.png'" />
 					</HorizontalLayout>
 				</HorizontalLayout>
 
@@ -82,7 +82,7 @@
 				<HorizontalLayout width="444" height="42">
 					<HorizontalLayout width="222" height="42" childvalign="vcenter">
 						<Label text="实体卡" font="13" textcolor="#FF8A9099" width="74" height="30" maxheight="30" valign="center" />
-						<Label name="huiyuan_info_shitika" text="已绑定" font="12" textcolor="#FF3CB371" width="52" height="22" maxheight="22" align="center" valign="center" bkimage="file='hyinfo_tag_on.png'" />
+						<Label name="huiyuan_info_shitika" text="已绑定" font="12" textcolor="#FF60B177" width="52" height="22" maxheight="22" align="center" valign="center" bkimage="file='hyinfo_tag_on.png'" />
 					</HorizontalLayout>
 					<HorizontalLayout width="222" height="42" childvalign="vcenter">
 						<Label text="会员卡号" font="13" textcolor="#FF8A9099" width="74" height="30" maxheight="30" valign="center" />

+ 5 - 5
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_page.xml

@@ -21,7 +21,7 @@
 
 				<Control />
 
-				<Button name="huiyuan_page_add_btn" height="50" text="+  添加会员" font="15" textcolor="#FF3CB371" normalimage="file='btn_border_green.png' corner='8,8,8,8'" hotimage="file='btn_border_green_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_green_Click.png' corner='8,8,8,8'" />
+				<Button name="huiyuan_page_add_btn" height="50" text="+  添加会员" font="15" textcolor="#FF60B177" normalimage="file='btn_border_green.png' corner='8,8,8,8'" hotimage="file='btn_border_green_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_green_Click.png' corner='8,8,8,8'" />
 			</VerticalLayout>
 
 			<Control width="16" />
@@ -59,7 +59,7 @@
 						<!-- 会员头部:头像 + 姓名徽章 + 余额 -->
 						<HorizontalLayout height="64" childvalign="vcenter">
 							<VerticalLayout name="huiyuan_avatar_layout" width="64" height="64" maxheight="64" bkcolor="#FFE8F5EE" borderround="64,64" childvalign="vcenter">
-								<Label name="huiyuan_avatar_text" text="会" font="22" textcolor="#FF3CB371" height="30" maxheight="30" align="center" valign="center" />
+								<Label name="huiyuan_avatar_text" text="会" font="22" textcolor="#FF60B177" height="30" maxheight="30" align="center" valign="center" />
 							</VerticalLayout>
 
 							<Control width="15" />
@@ -77,7 +77,7 @@
 
 							<VerticalLayout width="170" childvalign="vcenter">
 								<Label text="当前余额" font="12" textcolor="#FF8A9099" height="20" align="right" />
-								<Label name="huiyuan_yue" text="¥0.00" font="26" textcolor="#FF3CB371" height="38" align="right" />
+								<Label name="huiyuan_yue" text="¥0.00" font="26" textcolor="#FF60B177" height="38" align="right" />
 							</VerticalLayout>
 						</HorizontalLayout>
 
@@ -124,7 +124,7 @@
 							</VerticalLayout>
 							<VerticalLayout bkcolor="#FFFAFBFC" borderround="16,16" inset="15,0,15,0" childvalign="vcenter">
 								<Label text="会员状态" font="12" textcolor="#FF8A9099" height="18" />
-								<Label name="huiyuan_status" text="--" font="14" textcolor="#FF3CB371" height="24" />
+								<Label name="huiyuan_status" text="--" font="14" textcolor="#FF60B177" height="24" />
 							</VerticalLayout>
 						</HorizontalLayout>
 					</VerticalLayout>
@@ -135,7 +135,7 @@
 						<Control height="10" />
 						<HorizontalLayout height="40" childpadding="10">
 							<Button name="huiiyuan_page_chongzhi_btn" width="110" height="40" text="会员充值" font="15" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" disabledimage="file='btn_gray_disabled.png' corner='8,8,8,8'" />
-							<Button name="huiiyuan_page_xiugaiziliao_btn" width="100" height="40" text="修改资料" font="15" textcolor="#FF3CB371" normalimage="file='btn_border_green.png' corner='8,8,8,8'" hotimage="file='btn_border_green_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_green_Click.png' corner='8,8,8,8'" />
+							<Button name="huiiyuan_page_xiugaiziliao_btn" width="100" height="40" text="修改资料" font="15" textcolor="#FF60B177" normalimage="file='btn_border_green.png' corner='8,8,8,8'" hotimage="file='btn_border_green_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_green_Click.png' corner='8,8,8,8'" />
 							<Button name="huiiyuan_page_xiugaipassword_btn" width="118" height="40" text="修改登录密码" font="15" textcolor="#FF5F6368" normalimage="file='btn_border_gray.png' corner='8,8,8,8'" hotimage="file='btn_border_gray_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_gray_Click.png' corner='8,8,8,8'" />
 							<Button name="huiiyuan_page_bangka_btn" width="100" height="40" text="绑定实体卡" font="15" textcolor="#FF5F6368" normalimage="file='btn_border_gray.png' corner='8,8,8,8'" hotimage="file='btn_border_gray_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_gray_Click.png' corner='8,8,8,8'" disabledimage="file='btn_gray_disabled.png' corner='8,8,8,8'" />
 							<Button name="huiiyuan_page_guashi_btn" width="100" height="40" text="挂失实体卡" font="15" textcolor="#FF5F6368" normalimage="file='btn_border_gray.png' corner='8,8,8,8'" hotimage="file='btn_border_gray_Hover.png' corner='8,8,8,8'" pushedimage="file='btn_border_gray_Click.png' corner='8,8,8,8'" disabledimage="file='btn_gray_disabled.png' corner='8,8,8,8'" />

+ 6 - 6
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_shoukuan_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="700,560" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="会员收款" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
@@ -9,8 +9,8 @@
 		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" padding="0,0,0,0">			
 			<HorizontalLayout name="shoukuan_money_show_layout" height="50" padding="0,25,0,15">\
 				<Control></Control>
-				<Label text="¥" font="34" textcolor="0xFF3CB371" width="25"/>
-				<Label name="shoukuan_money_show_money" font="34" textcolor="0xFF3CB371" width="130"/>
+				<Label text="¥" font="34" textcolor="0xFF60B177" width="25"/>
+				<Label name="shoukuan_money_show_money" font="34" textcolor="0xFF60B177" width="130"/>
 				<Control></Control>
 			</HorizontalLayout>
 			
@@ -47,16 +47,16 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
-			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
 			
-			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_xiugaimima_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,534" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="修改登录密码" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>		

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/huiyuan_xiugaiziliao_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,536" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="修改会员资料" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>		

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/image_attention_dlg.xml

@@ -2,7 +2,7 @@
 <Window size="700,550" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 3 - 3
bin/Win32/Debug/zhipuzi_pos_windows/skin/login.xml

@@ -136,8 +136,8 @@
 				  itemfont="13" itemalign="left" itemvalign="vcenter"
 				  itemtextpadding="12,0,12,0"
 				  itemtextcolor="#FF1F2329"
-				  itemhottextcolor="#FF3CB371" itemhotbkcolor="#FFF2F7F4"
-				  itemselectedtextcolor="#FF3CB371" itemselectedbkcolor="#FFE8F5EE" />
+				  itemhottextcolor="#FF60B177" itemhotbkcolor="#FFF2F7F4"
+				  itemselectedtextcolor="#FF60B177" itemselectedbkcolor="#FFE8F5EE" />
 
 			<!-- 【不要给 Edit 加 bkcolor="#00000000"】
 			     CEditUI::CEditUI() 构造函数里有一句 SetBkColor(0xFFFFFFFF)(UIEdit.cpp:249),
@@ -221,7 +221,7 @@
 			<HorizontalLayout height="48">
 				<Control />
 				<Button name="guanwang" text="www.zhipuzi.com" width="160" height="48"
-						font="13" textcolor="#FF8A9099" hottextcolor="#FF3CB371"
+						font="13" textcolor="#FF8A9099" hottextcolor="#FF60B177"
 						align="center" valign="vcenter" />
 				<Control />
 			</HorizontalLayout>

+ 3 - 3
bin/Win32/Debug/zhipuzi_pos_windows/skin/member_login_dlg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="720,536" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="会员登录" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
@@ -94,12 +94,12 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求登录中..." textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求登录中..." textcolor="0xFF60B177" align="center"></Label>
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">
 			
-			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="登录成功:" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,180,0,20" name="shoukuan_pay_success_money" text="登录成功:" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>

+ 70 - 35
bin/Win32/Debug/zhipuzi_pos_windows/skin/memo_edit_dlg.xml

@@ -1,36 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Window size="700,446" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">

-	

-	<VerticalLayout bkimage="shoukuan_bkg.png" >

-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">

-			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>

-			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>

-		</HorizontalLayout>

-		

-		<HorizontalLayout>

-			<VerticalLayout>

-				<HorizontalLayout height="22" padding="30,16,30,0">

-					<Label name="preset_title" text="快捷选择" maxheight="22" width="80" align="left" valign="center" font="13" textcolor="#FF5F6368"/>

-					<Label name="preset_count" text="已选 0 条" maxheight="22" align="right" valign="center" font="12" textcolor="#FF2E9B5C"/>

-				</HorizontalLayout>

-

-				<TileLayout name="memo_preset" height="154" padding="30,10,30,0" itemsize="98,34" childpadding="6"/>

-

-				<Label name="name" text="补充说明(可不填)" height="22" padding="30,16,30,0" align="left" font="13" textcolor="#FF5F6368"/>

-

-				<Edit name="content" width="640" height="50" padding="30,8,30,0" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="22"/>

-

-				<Label name="errinfo" text="" height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>

-

-				<HorizontalLayout height="56" padding="30,16,30,20">

-					<Control></Control>

-					<Button name="cancel" text="取消" textcolor="#FF5F6368" maxheight="50" width="200" font="15" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>

-					<Control width="20"></Control>

-					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" maxheight="50" width="200" font="15" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />

-					<Control></Control>

-				</HorizontalLayout>

-			</VerticalLayout>

-		</HorizontalLayout>

-		

-	</VerticalLayout>

+<?xml version="1.0" encoding="UTF-8"?>
+
+<Window size="700,446" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
+
+	0xFF60B177
+
+	<VerticalLayout bkimage="shoukuan_bkg.png" >
+
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
+
+			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
+
+			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
+
+		</HorizontalLayout>
+
+		
+
+		<HorizontalLayout>
+
+			<VerticalLayout>
+
+				<HorizontalLayout height="22" padding="30,16,30,0">
+
+					<Label name="preset_title" text="快捷选择" maxheight="22" width="80" align="left" valign="center" font="13" textcolor="#FF5F6368"/>
+
+					<Label name="preset_count" text="已选 0 条" maxheight="22" align="right" valign="center" font="12" textcolor="#FF2E9B5C"/>
+
+				</HorizontalLayout>
+
+
+
+				<TileLayout name="memo_preset" height="154" padding="30,10,30,0" itemsize="98,34" childpadding="6"/>
+
+
+
+				<Label name="name" text="补充说明(可不填)" height="22" padding="30,16,30,0" align="left" font="13" textcolor="#FF5F6368"/>
+
+
+
+				<Edit name="content" width="640" height="50" padding="30,8,30,0" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="22"/>
+
+
+
+				<Label name="errinfo" text="" height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
+
+
+
+				<HorizontalLayout height="56" padding="30,16,30,20">
+
+					<Control></Control>
+
+					<Button name="cancel" text="取消" textcolor="#FF5F6368" maxheight="50" width="200" font="15" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'"/>
+
+					<Control width="20"></Control>
+
+					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" maxheight="50" width="200" font="15" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+
+					<Control></Control>
+
+				</HorizontalLayout>
+
+			</VerticalLayout>
+
+		</HorizontalLayout>
+
+		
+
+	</VerticalLayout>
+
 </Window>

+ 2 - 2
bin/Win32/Debug/zhipuzi_pos_windows/skin/num_input_dlg.xml

@@ -2,7 +2,7 @@
 <Window size="700,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="dlg_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="dlg_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
@@ -12,7 +12,7 @@
 				<Label name="attention" text="请输入折扣值(1到100之间的整数)" height="30" width="300" padding="30,50,0,0" align="left"/>
 	
 				<HorizontalLayout height="50" padding="0,30,0,0">
-					<Edit name="content" width="250" height="50" padding="30,0,0,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
+					<Edit name="content" width="250" height="50" padding="30,0,0,0" textcolor="0xFF60B177" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
 				</HorizontalLayout>
 				
 				<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_cika_dlg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="620,544" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="20"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_quanyika_dlg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="620,544" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="20"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_shangpinquan_dlg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="620,544" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="20"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_youhuiquan_dlg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="620,544" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="20"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/saomashouyin_page.xml

@@ -44,7 +44,7 @@
 					
 					<HorizontalLayout name="saomashouyin_page_youhui_tishi_layout" height="40" bkcolor="#FFFBEEEE" visible="false">
 						<Label name="saomashouyin_page_youhui_tishi" text="已优惠10元" textcolor="#FFFF3838" padding="15,0,0,0" width="270" height="40"></Label>
-						<Button name="btn_saomashouyin_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF3CB371" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+						<Button name="btn_saomashouyin_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF60B177" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
 					</HorizontalLayout>
 
 					<Control height="1" bkcolor="#FFEBE8E8"></Control>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_create_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="750,680" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="新建商品" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="20"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_newtype_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="620,544" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="新建商品分类" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="20"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_update_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="750,680" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="修改商品" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="20"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shoukuan_page.xml

@@ -8,7 +8,7 @@
 				<Label text="收款金额" font="20" width="150" height="30" padding="40,14,10,10"></Label>
 				
 				<HorizontalLayout height="68">
-					<Button name="shoukuan_page_money_edit" align="left" font="32" width="340" height="68" padding="40,0,40,0" textpadding="10,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF" textcolor="0xFF3CB371"/>
+					<Button name="shoukuan_page_money_edit" align="left" font="32" width="340" height="68" padding="40,0,40,0" textpadding="10,0,0,0" normalimage="" hotimage="" pushedimage="" bordersize="1" bordercolor="#FFA9A9A9" bkcolor="#00FFFFFF" textcolor="0xFF60B177"/>
 				</HorizontalLayout>
 				
 				<HorizontalLayout width="340" height="416" bkcolor="#FFF3F3F3" padding="40,30,40,10">

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shoukuanorder_list_page.xml

@@ -21,7 +21,7 @@
 				
 				<Button name="orderlist_zhengcan_btn" text="正餐订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
 				
-				<Button name="orderlist_shoukuan_btn" text="收款订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF3CB371"></Button>
+				<Button name="orderlist_shoukuan_btn" text="收款订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF60B177"></Button>
 			</HorizontalLayout>
 
 			<HorizontalLayout>										

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/tabletype_option.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<TabletypeOption endellipsis="true" align="center" valign="center" width="120" height="42" float="true" padding="15,19,0,0" bkcolor="#FFECECEC" selectedtextcolor="#FFFFFFFF" selectedbkcolor="#FF3CB371">
+	<TabletypeOption endellipsis="true" align="center" valign="center" width="120" height="42" float="true" padding="15,19,0,0" bkcolor="#FFECECEC" selectedtextcolor="#FFFFFFFF" selectedbkcolor="#FF60B177">
 	</TabletypeOption>
 </Window>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/third_delivery_select_dlg.xml

@@ -2,7 +2,7 @@
 <Window size="500,580" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/update.xml

@@ -48,7 +48,7 @@
 				<Label name="update_size_text" text="0.0 MB / 0.0 MB" width="200" height="16" maxheight="16"
 					   font="12" textcolor="#FF8A9099" align="left" valign="vcenter" />
 				<Label name="update_percent_text" text="0%" width="100" height="16" maxheight="16"
-					   font="12" textcolor="#FF3CB371" align="right" valign="vcenter" />
+					   font="12" textcolor="#FF60B177" align="right" valign="vcenter" />
 			</HorizontalLayout>
 
 			<!-- 重新下载:仅失败态显示。图 212x54,可视按钮 (6,0)-(206,40),

+ 6 - 6
bin/Win32/Debug/zhipuzi_pos_windows/skin/weixinzhifu_shoukuan_wnd.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="620,544" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="收款" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="20"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
 		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" height="500" padding="0,20,0,0">			
 			<HorizontalLayout name="shoukuan_money_show_layout" height="50" padding="0,15,0,15">
-				<Label text="¥" font="24" textcolor="0xFF3CB371" float="true" pos="250,24,265,50"/>
-				<Label name="shoukuan_money_show_money" font="40" textcolor="0xFF3CB371" float="true" pos="275,12,550,48"/>
+				<Label text="¥" font="24" textcolor="0xFF60B177" float="true" pos="250,24,265,50"/>
+				<Label name="shoukuan_money_show_money" font="40" textcolor="0xFF60B177" float="true" pos="275,12,550,48"/>
 			</HorizontalLayout>
 			
 			<HorizontalLayout padding="0,20,0,0" height="129">
@@ -40,9 +40,9 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
-			<Label height="32" padding="0,20,0,10" name="shoukuan_paying_status" text="请求支付中..." font="20" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="32" padding="0,20,0,10" name="shoukuan_paying_status" text="请求支付中..." font="20" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="20" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
@@ -66,7 +66,7 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,20,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="20" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>

+ 11 - 11
bin/Win32/Debug/zhipuzi_pos_windows/skin/xianjin_shoukuan_wnd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="800,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="现金收款" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
@@ -9,8 +9,8 @@
 		<HorizontalLayout visible="true" name="shoukuan_before_pay_layout">
 			<VerticalLayout height="520" padding="0,20,0,0">			
 				<HorizontalLayout name="shoukuan_money_show_layout" height="50" padding="0,0,0,15">
-					<Label text="¥" font="24" textcolor="0xFF3CB371" float="true" pos="170,24,245,50"/>
-					<Label name="shoukuan_money_show_money" font="40" textcolor="0xFF3CB371" float="true" pos="195,12,530,48"/>
+					<Label text="¥" font="24" textcolor="0xFF60B177" float="true" pos="170,24,245,50"/>
+					<Label name="shoukuan_money_show_money" font="40" textcolor="0xFF60B177" float="true" pos="195,12,530,48"/>
 				</HorizontalLayout>
 				
 				<HorizontalLayout height="50" padding="0,0,0,0">
@@ -21,11 +21,11 @@
 				
 				<HorizontalLayout height="50" padding="0,15,0,0">
 					<Label text="快选:" font="18" float="true" pos="30,12,180,40"/>
-					<Button name="xianjin_kuaijie_10" font="14" text="10元" heiht="36" width="55" padding="100,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-					<Button name="xianjin_kuaijie_20" font="14" text="20元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-					<Button name="xianjin_kuaijie_50" font="14" text="50元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-					<Button name="xianjin_kuaijie_100" font="14" text="100元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
-					<Button name="xianjin_kuaijie_200" font="14" text="200元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF3CB371"></Button>
+					<Button name="xianjin_kuaijie_10" font="14" text="10元" heiht="36" width="55" padding="100,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF60B177"></Button>
+					<Button name="xianjin_kuaijie_20" font="14" text="20元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF60B177"></Button>
+					<Button name="xianjin_kuaijie_50" font="14" text="50元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF60B177"></Button>
+					<Button name="xianjin_kuaijie_100" font="14" text="100元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF60B177"></Button>
+					<Button name="xianjin_kuaijie_200" font="14" text="200元" heiht="36" width="55" padding="14,10,0,0" textcolor="#FFFFFFFF" normalimage="" hotimage="" pushedimage="" bordersize="0" bordercolor="#FFC1C1C1" bkcolor="#FF60B177"></Button>
 				</HorizontalLayout>
 				
 				<HorizontalLayout height="50" padding="0,15,0,0">
@@ -78,15 +78,15 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
-			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">			
-			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,100,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/youhui_show_dlg.xml

@@ -2,7 +2,7 @@
 <Window size="502,500" caption="0,0,0,36" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="优惠明细" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/yubaozhuangbiaoqian_page.xml

@@ -16,7 +16,7 @@
 					</VerticalLayout>							
 
 					<HorizontalLayout width="200">
-						<Label name="yubaozhuangbiaoqian_page_label_chengzhong_value" text="0.000" align="right" width="135" height="40" padding="0,35,0,0" textcolor="#FF3CB371" font="140"></Label>
+						<Label name="yubaozhuangbiaoqian_page_label_chengzhong_value" text="0.000" align="right" width="135" height="40" padding="0,35,0,0" textcolor="#FF60B177" font="140"></Label>
 						<Label name="yubaozhuangbiaoqian_page_label_chengzhong_unit" text="公斤" height="30" padding="15,40,0,0" font="16"></Label>
 					</HorizontalLayout>
 

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml

@@ -51,7 +51,7 @@
 							
 							<HorizontalLayout name="diandan_page_youhui_tishi_layout" height="40" bkcolor="#FFFBEEEE" visible="false">
 								<Label name="diandan_page_youhui_tishi" text="已优惠10元" textcolor="#FFFF3838" padding="15,0,0,0" width="270" hegiht="40"></Label>
-								<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF3CB371" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
+								<Button name="btn_diandan_chakanyouhui" text="查看优惠>" height="30" width="80" padding="5,6,25,0" textcolor="#FF60B177" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#00FFFFFF"></Button>
 							</HorizontalLayout>
 
 							<Control height="1" bkcolor="#FFEBE8E8"></Control>

+ 2 - 2
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_kaitai_input_dlg.xml

@@ -2,7 +2,7 @@
 <Window size="700,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
@@ -11,7 +11,7 @@
 			<VerticalLayout width="370">
 				<Label name="name" text="请输入用餐人数" height="30" width="250" padding="30,50,0,0" align="left"/>
 	
-				<Edit name="content" width="250" height="50" padding="30,30,0,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
+				<Edit name="content" width="250" height="50" padding="30,30,0,0" textcolor="0xFF60B177" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
 				
 				<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
 				

+ 2 - 2
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_renshu_dlg.xml

@@ -2,7 +2,7 @@
 <Window size="700,434" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="22"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
@@ -11,7 +11,7 @@
 			<VerticalLayout width="370">
 				<Label name="name" text="请输入用餐人数" height="30" width="250" padding="30,50,0,0" align="left"/>
 	
-				<Edit name="content" width="250" height="50" padding="30,30,0,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
+				<Edit name="content" width="250" height="50" padding="30,30,0,0" textcolor="0xFF60B177" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="32"/>
 				
 				<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
 				

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_saomadiancan_wnd.xml

@@ -2,7 +2,7 @@
 <Window size="700,650" caption="0,0,0,36" roundcorner="4,4" shadowsize="3" showshadow="true">
 	
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>

+ 1 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcanorder_list_page.xml

@@ -19,7 +19,7 @@
 			<HorizontalLayout bkcolor="#FFFFFFFF" height="70">
 				<Button name="orderlist_diandan_btn" text="点单订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
 				
-				<Button name="orderlist_zhengcan_btn" text="正餐订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF3CB371"></Button>
+				<Button name="orderlist_zhengcan_btn" text="正餐订单" textcolor="#FFFFFFFF" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FF60B177"></Button>
 				
 				<Button name="orderlist_shoukuan_btn" text="收款订单" height="50" width="160" padding="20,10,10,0" normalimage="" hotimage="" pushedimage="" bordersize="0" bkcolor="#FFECECEC"></Button>
 			</HorizontalLayout>

+ 6 - 6
bin/Win32/Debug/zhipuzi_pos_windows/skin/zidingyi_shoukuan_wnd.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="580,450" caption="0,0,0,44" roundcorner="4,4" shadowsize="3" showshadow="true">
 	<VerticalLayout bkimage="shoukuan_bkg.png" >
-		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF60B177">
 			<Label name="shoukuan_version" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="18"/>
 			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
 		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" height="520" padding="0,20,0,0">			
 			<HorizontalLayout name="shoukuan_money_show_layout" height="50" padding="0,15,0,15">
-				<Label text="¥" font="24" textcolor="0xFF3CB371" float="true" pos="230,24,245,50"/>
-				<Label name="shoukuan_money_show_money" font="40" textcolor="0xFF3CB371" float="true" pos="255,12,530,48"/>
+				<Label text="¥" font="24" textcolor="0xFF60B177" float="true" pos="230,24,245,50"/>
+				<Label name="shoukuan_money_show_money" font="40" textcolor="0xFF60B177" float="true" pos="255,12,530,48"/>
 			</HorizontalLayout>
 			
 			<HorizontalLayout height="50" padding="0,15,0,0">
@@ -42,15 +42,15 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,10,0,10" name="shoukuan_paying_money" text="收款金额:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
-			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="32" padding="0,10,0,10" name="shoukuan_paying_status" text="请求支付中..." font="18" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_paying_attention" text="如果用户没有支付成功,则请确认客户不再进行支付时再关闭此窗口,按【Esc】取消本次支付" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>
 		
 		<VerticalLayout name="shoukuan_pay_success_layout" visible="false">			
-			<Label height="40" padding="0,80,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF3CB371" align="center"></Label>
+			<Label height="40" padding="0,80,0,20" name="shoukuan_pay_success_money" text="成功收款:" font="32" textcolor="0xFF60B177" align="center"></Label>
 			
 			<Label height="60" padding="20,30,20,0" name="shouyin_pay_success_attention" text="按任意键关闭窗口" font="18" textcolor="0xFF808080" wordbreak="true" align="center" />
 		</VerticalLayout>

+ 1 - 1
zhipuzi_pos_windows/control/CZhengcanTableItemUI.cpp

@@ -113,7 +113,7 @@ void CZhengcanTableItemUI::UpdateShow()
 		if (m_order_id == "0")
 		{
 			//说明还未下单,处于待下单状态,用绿色
-			this->SetBkColor(0xFF3CB371);
+			this->SetBkColor(0xFF60B177);
 			pBottom->SetBkColor(0xFF28A25E);
 
 			pStatus->SetText(L"待下单");

+ 2 - 2
zhipuzi_pos_windows/page/CAIxuexiPageUI.cpp

@@ -148,7 +148,7 @@ void CAIxuexiPageUI::InitFoodtypeShow()
 
 	if (m_curFoodtypeOption != NULL)
 	{
-		m_curFoodtypeOption->SetBkColor(0xFF3CB371);
+		m_curFoodtypeOption->SetBkColor(0xFF60B177);
 	}
 
 	//如果不是一个分类都没有,选中第一个分类
@@ -418,7 +418,7 @@ void CAIxuexiPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 			//切换了商品分类
 			m_curFoodtypeOption->SetBkColor(0xFFECECEC);
 
-			msg.pSender->SetBkColor(0xFF3CB371);
+			msg.pSender->SetBkColor(0xFF60B177);
 
 			m_curFoodtypeOption = static_cast<CControlUI*>(msg.pSender);
 

+ 2 - 2
zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -301,10 +301,10 @@ void CDiandanPageUI::InitFoodShow()
 
 	if (setting_xianshi_is_youtu == "1")
 	{
-		//样式① 图上文下:5 列 x 148,卡片高 164
+		//样式① 图上文下:5 列 x 148,卡片高 172(名字区 2 行 40 + 价格贴底)
 		SIZE itemsize;
 		itemsize.cx = 148;
-		itemsize.cy = 164;
+		itemsize.cy = 172;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem_youtu.xml");

+ 3 - 3
zhipuzi_pos_windows/page/CHuiyuanPageUI.cpp

@@ -287,12 +287,12 @@ void CHuiyuanPageUI::StartHuiyuanSousuo()
 
 		//冻结时头像与余额一起置灰
 		this->FindSubControl(L"huiyuan_avatar_layout")->SetBkColor(is_frozen ? 0xFFF0F1F3 : 0xFFE8F5EE);
-		static_cast<CLabelUI*>(this->FindSubControl(L"huiyuan_avatar_text"))->SetTextColor(is_frozen ? 0xFFA8ADB3 : 0xFF3CB371);
-		static_cast<CLabelUI*>(this->FindSubControl(L"huiyuan_yue"))->SetTextColor(is_frozen ? 0xFFA8ADB3 : 0xFF3CB371);
+		static_cast<CLabelUI*>(this->FindSubControl(L"huiyuan_avatar_text"))->SetTextColor(is_frozen ? 0xFFA8ADB3 : 0xFF60B177);
+		static_cast<CLabelUI*>(this->FindSubControl(L"huiyuan_yue"))->SetTextColor(is_frozen ? 0xFFA8ADB3 : 0xFF60B177);
 
 		CLabelUI* pStatusLabel = static_cast<CLabelUI*>(this->FindSubControl(L"huiyuan_status"));
 		pStatusLabel->SetText(is_frozen ? L"已冻结" : L"正常");
-		pStatusLabel->SetTextColor(is_frozen ? 0xFFC93A38 : 0xFF3CB371);
+		pStatusLabel->SetTextColor(is_frozen ? 0xFFC93A38 : 0xFF60B177);
 
 		//冻结/解冻按钮互斥;冻结后禁用充值、绑卡、挂失这类交易操作
 		this->FindSubControl(L"huiiyuan_page_dongjie_btn")->SetVisible(!is_frozen);

+ 2 - 2
zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -84,7 +84,7 @@ void CShangpinPageUI::InitFoodtypeShow()
 
 	if (m_curFoodtypeOption != NULL)
 	{
-		m_curFoodtypeOption->SetBkColor(0xFF3CB371);
+		m_curFoodtypeOption->SetBkColor(0xFF60B177);
 	}
 
 	//如果不是一个分类都没有,选中第一个分类
@@ -335,7 +335,7 @@ void CShangpinPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 			//切换了商品分类
 			m_curFoodtypeOption->SetBkColor(0xFFECECEC);
 
-			msg.pSender->SetBkColor(0xFF3CB371);
+			msg.pSender->SetBkColor(0xFF60B177);
 
 			m_curFoodtypeOption = static_cast<CControlUI*>(msg.pSender);
 

+ 2 - 2
zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -292,7 +292,7 @@ void CZhengcanDiandanPageUI::InitFoodtypeShow()
 
 	if (m_curFoodtypeOption != NULL)
 	{
-		m_curFoodtypeOption->SetBkColor(0xFF3CB371);
+		m_curFoodtypeOption->SetBkColor(0xFF60B177);
 	}
 
 	//如果不是一个分类都没有,选中第一个分类
@@ -1134,7 +1134,7 @@ void CZhengcanDiandanPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 			//切换了商品分类
 			m_curFoodtypeOption->SetBkColor(0xFFECECEC);
 
-			msg.pSender->SetBkColor(0xFF3CB371);
+			msg.pSender->SetBkColor(0xFF60B177);
 
 			m_curFoodtypeOption = static_cast<CControlUI*>(msg.pSender);
 

+ 2 - 2
zhipuzi_pos_windows/page/CZhengcanPageUI.cpp

@@ -82,7 +82,7 @@ void CZhengcanPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 			//切换了商品分类
 			m_curZhuozitypeOption->SetBkColor(0xFFECECEC);
 
-			msg.pSender->SetBkColor(0xFF3CB371);
+			msg.pSender->SetBkColor(0xFF60B177);
 
 			m_curZhuozitypeOption = static_cast<CControlUI*>(msg.pSender);
 
@@ -188,7 +188,7 @@ void CZhengcanPageUI::InitTabletypeShow()
 
 	if (m_curZhuozitypeOption != NULL)
 	{
-		m_curZhuozitypeOption->SetBkColor(0xFF3CB371);
+		m_curZhuozitypeOption->SetBkColor(0xFF60B177);
 	}
 
 	//如果不是一个分类都没有,选中第一个分类

BIN
zhipuzi_pos_windows/resource/skin.zip


+ 4 - 4
zhipuzi_pos_windows/wnd/CHuiyuanInfoShowWnd.cpp

@@ -211,14 +211,14 @@ void CHuiyuanInfoShowWnd::UpdateHuiyuanInfo()
 	else
 	{
 		pStatus->SetText(L"正常");
-		pStatus->SetTextColor(0xFF3CB371);
+		pStatus->SetTextColor(0xFF60B177);
 	}
 
 	//头部背景:正常纯绿 #3CB371,冻结置灰 #9AA0A6
 	CControlUI* pHead = m_pm.FindControl(L"huiyuan_info_head");
 	if (pHead != NULL)
 	{
-		pHead->SetBkColor(is_frozen ? 0xFF9AA0A6 : 0xFF3CB371);
+		pHead->SetBkColor(is_frozen ? 0xFF9AA0A6 : 0xFF60B177);
 	}
 
 	//手机号(脱敏)
@@ -239,7 +239,7 @@ void CHuiyuanInfoShowWnd::UpdateHuiyuanInfo()
 
 	CLabelUI* pPoint = static_cast<CLabelUI*>(m_pm.FindControl(L"huiyuan_info_point"));
 	pPoint->SetText(this->FormatPoint(m_point).c_str());
-	pPoint->SetTextColor(is_frozen ? 0xFFA8ADB3 : 0xFF3CB371);
+	pPoint->SetTextColor(is_frozen ? 0xFFA8ADB3 : 0xFF60B177);
 
 	//冻结提示:正常态隐藏提示条并缩小窗口;冻结态显示提示条并使用较大窗口
 	//内容区高度:正常 392 = 16+92+14+190+16+44+20;冻结 432 = 正常 + 40
@@ -480,7 +480,7 @@ void CHuiyuanInfoShowWnd::SetInfoTag(LPCTSTR control_name, bool is_on, LPCTSTR o
 	if (is_on)
 	{
 		pLabel->SetText(on_text);
-		pLabel->SetTextColor(0xFF3CB371);
+		pLabel->SetTextColor(0xFF60B177);
 		pLabel->SetAttribute(L"bkimage", L"file='hyinfo_tag_on.png'");
 	}
 	else

+ 2 - 2
zhipuzi_pos_windows/wnd/CUpdateWnd.cpp

@@ -144,7 +144,7 @@ void CUpdateWnd::ShowDownloading()
 
     if(pPercent)
     {
-        pPercent->SetTextColor(0xFF3CB371);
+        pPercent->SetTextColor(0xFF60B177);
     }
 
     CButtonUI* pRetry = static_cast<CButtonUI*>(m_pm.FindControl(_T("update_retry_btn")));
@@ -223,7 +223,7 @@ void CUpdateWnd::ShowFinish()
     if(pPercent)
     {
         pPercent->SetText(_T("100%"));
-        pPercent->SetTextColor(0xFF3CB371);
+        pPercent->SetTextColor(0xFF60B177);
     }
 
     CButtonUI* pRetry = static_cast<CButtonUI*>(m_pm.FindControl(_T("update_retry_btn")));