张洋 1 day ago
parent
commit
0f51179aee
100 changed files with 350 additions and 343 deletions
  1. BIN
      bin/Win32/Debug/zhipuzi_pos_windows/DuiLib_d.dll
  2. 178 175
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_create_page.xml
  3. 172 168
      bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_update_page.xml
  4. BIN
      bin/Win32/Release/zhipuzi_pos_windows/DuiLib.dll
  5. BIN
      dll/debug/DuiLib_d.dll
  6. BIN
      dll/release/DuiLib.dll
  7. BIN
      res/images/伊丽莎白瓜/Image_1.jpg
  8. BIN
      res/images/伊丽莎白瓜/Image_10.jpg
  9. BIN
      res/images/伊丽莎白瓜/Image_100.jpg
  10. BIN
      res/images/伊丽莎白瓜/Image_101.jpg
  11. BIN
      res/images/伊丽莎白瓜/Image_102.jpg
  12. BIN
      res/images/伊丽莎白瓜/Image_103.jpg
  13. BIN
      res/images/伊丽莎白瓜/Image_104.jpg
  14. BIN
      res/images/伊丽莎白瓜/Image_105.jpg
  15. BIN
      res/images/伊丽莎白瓜/Image_106.jpg
  16. BIN
      res/images/伊丽莎白瓜/Image_107.jpg
  17. BIN
      res/images/伊丽莎白瓜/Image_108.jpg
  18. BIN
      res/images/伊丽莎白瓜/Image_109.jpg
  19. BIN
      res/images/伊丽莎白瓜/Image_11.jpg
  20. BIN
      res/images/伊丽莎白瓜/Image_110.jpg
  21. BIN
      res/images/伊丽莎白瓜/Image_111.jpg
  22. BIN
      res/images/伊丽莎白瓜/Image_112.jpg
  23. BIN
      res/images/伊丽莎白瓜/Image_113.jpg
  24. BIN
      res/images/伊丽莎白瓜/Image_114.jpg
  25. BIN
      res/images/伊丽莎白瓜/Image_115.jpg
  26. BIN
      res/images/伊丽莎白瓜/Image_116.jpg
  27. BIN
      res/images/伊丽莎白瓜/Image_117.jpg
  28. BIN
      res/images/伊丽莎白瓜/Image_118.jpg
  29. BIN
      res/images/伊丽莎白瓜/Image_119.jpg
  30. BIN
      res/images/伊丽莎白瓜/Image_12.jpg
  31. BIN
      res/images/伊丽莎白瓜/Image_120.jpg
  32. BIN
      res/images/伊丽莎白瓜/Image_121.jpg
  33. BIN
      res/images/伊丽莎白瓜/Image_122.jpg
  34. BIN
      res/images/伊丽莎白瓜/Image_123.jpg
  35. BIN
      res/images/伊丽莎白瓜/Image_124.jpg
  36. BIN
      res/images/伊丽莎白瓜/Image_125.jpg
  37. BIN
      res/images/伊丽莎白瓜/Image_126.jpg
  38. BIN
      res/images/伊丽莎白瓜/Image_127.jpg
  39. BIN
      res/images/伊丽莎白瓜/Image_128.jpg
  40. BIN
      res/images/伊丽莎白瓜/Image_129.jpg
  41. BIN
      res/images/伊丽莎白瓜/Image_13.jpg
  42. BIN
      res/images/伊丽莎白瓜/Image_130.jpg
  43. BIN
      res/images/伊丽莎白瓜/Image_131.jpg
  44. BIN
      res/images/伊丽莎白瓜/Image_132.jpg
  45. BIN
      res/images/伊丽莎白瓜/Image_133.jpg
  46. BIN
      res/images/伊丽莎白瓜/Image_134.jpg
  47. BIN
      res/images/伊丽莎白瓜/Image_135.jpg
  48. BIN
      res/images/伊丽莎白瓜/Image_136.jpg
  49. BIN
      res/images/伊丽莎白瓜/Image_137.jpg
  50. BIN
      res/images/伊丽莎白瓜/Image_138.jpg
  51. BIN
      res/images/伊丽莎白瓜/Image_139.jpg
  52. BIN
      res/images/伊丽莎白瓜/Image_14.jpg
  53. BIN
      res/images/伊丽莎白瓜/Image_140.jpg
  54. BIN
      res/images/伊丽莎白瓜/Image_141.jpg
  55. BIN
      res/images/伊丽莎白瓜/Image_142.jpg
  56. BIN
      res/images/伊丽莎白瓜/Image_143.jpg
  57. BIN
      res/images/伊丽莎白瓜/Image_144.jpg
  58. BIN
      res/images/伊丽莎白瓜/Image_145.jpg
  59. BIN
      res/images/伊丽莎白瓜/Image_146.jpg
  60. BIN
      res/images/伊丽莎白瓜/Image_147.jpg
  61. BIN
      res/images/伊丽莎白瓜/Image_148.jpg
  62. BIN
      res/images/伊丽莎白瓜/Image_149.jpg
  63. BIN
      res/images/伊丽莎白瓜/Image_15.jpg
  64. BIN
      res/images/伊丽莎白瓜/Image_150.jpg
  65. BIN
      res/images/伊丽莎白瓜/Image_16.jpg
  66. BIN
      res/images/伊丽莎白瓜/Image_17.jpg
  67. BIN
      res/images/伊丽莎白瓜/Image_18.jpg
  68. BIN
      res/images/伊丽莎白瓜/Image_19.jpg
  69. BIN
      res/images/伊丽莎白瓜/Image_2.jpg
  70. BIN
      res/images/伊丽莎白瓜/Image_20.jpg
  71. BIN
      res/images/伊丽莎白瓜/Image_21.jpg
  72. BIN
      res/images/伊丽莎白瓜/Image_22.jpg
  73. BIN
      res/images/伊丽莎白瓜/Image_23.jpg
  74. BIN
      res/images/伊丽莎白瓜/Image_24.jpg
  75. BIN
      res/images/伊丽莎白瓜/Image_25.jpg
  76. BIN
      res/images/伊丽莎白瓜/Image_26.jpg
  77. BIN
      res/images/伊丽莎白瓜/Image_27.jpg
  78. BIN
      res/images/伊丽莎白瓜/Image_28.jpg
  79. BIN
      res/images/伊丽莎白瓜/Image_29.jpg
  80. BIN
      res/images/伊丽莎白瓜/Image_3.jpg
  81. BIN
      res/images/伊丽莎白瓜/Image_30.jpg
  82. BIN
      res/images/伊丽莎白瓜/Image_31.jpg
  83. BIN
      res/images/伊丽莎白瓜/Image_32.jpg
  84. BIN
      res/images/伊丽莎白瓜/Image_33.jpg
  85. BIN
      res/images/伊丽莎白瓜/Image_34.jpg
  86. BIN
      res/images/伊丽莎白瓜/Image_35.jpg
  87. BIN
      res/images/伊丽莎白瓜/Image_36.jpg
  88. BIN
      res/images/伊丽莎白瓜/Image_37.jpg
  89. BIN
      res/images/伊丽莎白瓜/Image_38.jpg
  90. BIN
      res/images/伊丽莎白瓜/Image_39.jpg
  91. BIN
      res/images/伊丽莎白瓜/Image_4.jpg
  92. BIN
      res/images/伊丽莎白瓜/Image_40.jpg
  93. BIN
      res/images/伊丽莎白瓜/Image_41.jpg
  94. BIN
      res/images/伊丽莎白瓜/Image_42.jpg
  95. BIN
      res/images/伊丽莎白瓜/Image_43.jpg
  96. BIN
      res/images/伊丽莎白瓜/Image_44.jpg
  97. BIN
      res/images/伊丽莎白瓜/Image_45.jpg
  98. BIN
      res/images/伊丽莎白瓜/Image_46.jpg
  99. BIN
      res/images/伊丽莎白瓜/Image_47.jpg
  100. 0 0
      res/images/伊丽莎白瓜/Image_48.jpg

BIN
bin/Win32/Debug/zhipuzi_pos_windows/DuiLib_d.dll


+ 178 - 175
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_create_page.xml

@@ -1,203 +1,206 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 <Window>
 	<ShangpinCreatePage>
 	<ShangpinCreatePage>
-		<VerticalLayout>
-			<HorizontalLayout height="44" bkcolor="#FFFFFFFF" padding="0,0,0,0">
-				<Button name="shangpin_create_page_return_btn" float="true" pos="20,6,120,38" text="返回" textcolor="#FFFFFFFF"/>
-			</HorizontalLayout>
-			
-			<Control height="15"></Control>
-				
-			<HorizontalLayout>
-				<Control width="1" bkcolor="#FFD1D1D1"></Control>
+		<HorizontalLayout>
+			<Control width="1" bkcolor="#FFD1D1D1"></Control>
+
+			<VerticalLayout>
+				<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+					<Button name="shangpin_create_page_return_btn" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+					<Label name="aixuexi_page_name" text="新建商品" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
+				</HorizontalLayout>
 				
 				
-				<VerticalLayout name="shangpin_create_page_info_layout" width="620" bkcolor="#FFFFFFFF" vscrollbar="true">
-					<Label text="基本信息" height="58" padding="20,0,0,0" font="20"></Label>
-						
-					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
-						
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品名字:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_name_edit" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>
+				<Control height="1" bkcolor="#FFEBE8E8"></Control>
 					
 					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品序号:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_xuhao_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="(序号越小,排序越靠前)" width="300" height="44" padding="20,0,0,0"></Label>		
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品分类:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Combo name="shangpin_create_page_foodtype" padding="15,9,0,0" width="300" height="32" tooltip="请点击这里选择您的打印机打印小票联数" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+				<HorizontalLayout>
+					<VerticalLayout name="shangpin_create_page_info_layout" width="620" bkcolor="#FFFFFFFF" vscrollbar="true">
+						<Label text="基本信息" height="58" padding="20,0,0,0" font="20"></Label>
 							
 							
-						</Combo>
-					</HorizontalLayout>
+						<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+							
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品名字:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_name_edit" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品序号:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_xuhao_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="(序号越小,排序越靠前)" width="300" height="44" padding="20,0,0,0"></Label>		
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品分类:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Combo name="shangpin_create_page_foodtype" padding="15,9,0,0" width="300" height="32" tooltip="请点击这里选择您的打印机打印小票联数" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+								
+							</Combo>
+						</HorizontalLayout>
 
 
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品条码:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_barcode_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="(没有可以不填,将随机生成一个)" width="300" height="44" padding="20,0,0,0"></Label>	
-					</HorizontalLayout>	
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品条码:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_barcode_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="(没有可以不填,将随机生成一个)" width="300" height="44" padding="20,0,0,0"></Label>	
+						</HorizontalLayout>	
 
 
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品价格:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_price_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>		
-					</HorizontalLayout>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品价格:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_price_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>		
+						</HorizontalLayout>
 
 
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品单位:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_unit_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>		
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="是否称重类型商品" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>	
-						<CheckBox name="shangpin_create_page_chengzhong" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="条码秤PLU编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0" ></Label>					
-						<Edit name="shangpin_create_page_plu" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="条码秤商品编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_shangpinbianma" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="88" padding="0,30,0,0">
-						<Label text="库存类型:" width="80" height="44" padding="20,0,0,0"></Label>
-						<VerticalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_kucun_open" group="shangpin_create_page_kucun_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="开启商品库存,下单自动扣减库存,库存不足无法下单 " width="600" padding="10,0,0,0"/>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品单位:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_unit_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>		
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="是否称重类型商品" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>	
+							<CheckBox name="shangpin_create_page_chengzhong" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="条码秤PLU编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0" ></Label>					
+							<Edit name="shangpin_create_page_plu" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="条码秤商品编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_shangpinbianma" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="88" padding="0,30,0,0">
+							<Label text="库存类型:" width="80" height="44" padding="20,0,0,0"></Label>
+							<VerticalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_kucun_open" group="shangpin_create_page_kucun_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="开启商品库存,下单自动扣减库存,库存不足无法下单 " width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_kucun_wuxian" group="shangpin_create_page_kucun_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="无限库存模式,下单不扣减库存" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+							</VerticalLayout>					
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="当前库存:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_kucun_now" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品状态:" width="80" height="44" padding="20,0,0,0"></Label>
+							<HorizontalLayout padding="30,0,30,0" width="90" height="44">
+								<CheckBox name="shangpin_create_page_status_normal" group="shangpin_create_page_status_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label text="正常 " width="300" padding="10,0,0,0"/>
 							</HorizontalLayout>
 							</HorizontalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_kucun_wuxian" group="shangpin_create_page_kucun_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="无限库存模式,下单不扣减库存" width="600" padding="10,0,0,0"/>
+							<HorizontalLayout padding="30,0,30,0" width="90" height="44">
+								<CheckBox name="shangpin_create_page_status_xiajia" group="shangpin_create_page_status_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label text="下架" width="300" padding="10,0,0,0"/>
 							</HorizontalLayout>
 							</HorizontalLayout>
-						</VerticalLayout>					
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="当前库存:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_kucun_now" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品状态:" width="80" height="44" padding="20,0,0,0"></Label>
-						<HorizontalLayout padding="30,0,30,0" width="90" height="44">
-							<CheckBox name="shangpin_create_page_status_normal" group="shangpin_create_page_status_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-							<Label text="正常 " width="300" padding="10,0,0,0"/>
 						</HorizontalLayout>
 						</HorizontalLayout>
-						<HorizontalLayout padding="30,0,30,0" width="90" height="44">
-							<CheckBox name="shangpin_create_page_status_xiajia" group="shangpin_create_page_status_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-							<Label text="下架" width="300" padding="10,0,0,0"/>
-						</HorizontalLayout>
-					</HorizontalLayout>
-					
-					<Label text="高级信息" height="58" padding="20,30,0,0" font="20"></Label>
 						
 						
-					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+						<Label text="高级信息" height="58" padding="20,30,0,0" font="20"></Label>
+							
+						<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
 
 
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="进货价:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_buyingprice_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>	
-					</HorizontalLayout>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="进货价:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_buyingprice_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>	
+						</HorizontalLayout>
 
 
-					<HorizontalLayout height="88" padding="0,30,0,0">
-						<Label text="进货价模式:" width="80" height="44" padding="20,0,0,0"></Label>
-						<VerticalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_jinhuojia_normal" group="shangpin_create_page_jinhuojia_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="按当前商品进货价 (一般用于临时加工销售的商品) " width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_jinhuojia_jiaquan" group="shangpin_create_page_jinhuojia_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="按加权平均库存成本价 (一般用于采购入库销售的商品)" width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-						</VerticalLayout>					
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="在哪些地方显示:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
+						<HorizontalLayout height="88" padding="0,30,0,0">
+							<Label text="进货价模式:" width="80" height="44" padding="20,0,0,0"></Label>
+							<VerticalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_jinhuojia_normal" group="shangpin_create_page_jinhuojia_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="按当前商品进货价 (一般用于临时加工销售的商品) " width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_jinhuojia_jiaquan" group="shangpin_create_page_jinhuojia_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="按加权平均库存成本价 (一般用于采购入库销售的商品)" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+							</VerticalLayout>					
+						</HorizontalLayout>
 						
 						
-						<CheckBox name="shangpin_create_page_showplace_shouyinji" selected="true" padding="15,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
-						<Label text="收银机" width="100" padding="10,0,0,0"/>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="在哪些地方显示:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
+							
+							<CheckBox name="shangpin_create_page_showplace_shouyinji" selected="true" padding="15,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
+							<Label text="收银机" width="100" padding="10,0,0,0"/>
+							
+							<CheckBox name="shangpin_create_page_showplace_waimai" selected="true" padding="0,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
+							<Label text="外卖" width="100" padding="10,0,0,0"/>
+							
+							<CheckBox name="shangpin_create_page_showplace_saomadiancan" selected="true" padding="0,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
+							<Label text="扫码点餐" width="100" padding="10,0,0,0"/>
+						</HorizontalLayout>
 						
 						
-						<CheckBox name="shangpin_create_page_showplace_waimai" selected="true" padding="0,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
-						<Label text="外卖" width="100" padding="10,0,0,0"/>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="是否开启打包费" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
+							<CheckBox name="shangpin_create_page_is_dabao" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+						</HorizontalLayout>
 						
 						
-						<CheckBox name="shangpin_create_page_showplace_saomadiancan" selected="true" padding="0,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
-						<Label text="扫码点餐" width="100" padding="10,0,0,0"/>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="是否开启打包费" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
-						<CheckBox name="shangpin_create_page_is_dabao" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="打包费金额:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_dabao_money" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>	
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="132" padding="0,30,0,0">
-						<Label text="商品加工方式:" width="80" height="44" padding="20,0,0,0"></Label>
-						<VerticalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_fangan_1" group="shangpin_create_page_fangan_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="方案一:门店直接采购成品,不需要加工" width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_fangan_2" group="shangpin_create_page_fangan_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="方案二:门店采购原料,提前加工为成品" width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_fangan_3" group="shangpin_create_page_fangan_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="方案三:门店采购原料,临时加工为成品" width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-						</VerticalLayout>					
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="60" padding="0,50,0,50">
-						<Control></Control>
-						<Button name="shangpin_create_page_save_btn" width="400" height="60" text="保存" 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'" />
-						<Control></Control>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="40" padding="0,20,0,20">
-						<Control></Control>
-						<Label name="shangpin_create_page_save_result" width="500" align="center" textcolor="#FFFF0000"></Label>
-						<Control></Control>
-					</HorizontalLayout>
-				</VerticalLayout>
-				
-				<Control width="1" bkcolor="#FFEBE8E8"></Control>
-				
-				<HorizontalLayout name="shangpin_create_page_no_layout">
-					<Control></Control>
-					<VerticalLayout width="280">
-						<Control></Control>
-						<HorizontalLayout height="127">
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="打包费金额:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_dabao_money" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>	
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="132" padding="0,30,0,0">
+							<Label text="商品加工方式:" width="80" height="44" padding="20,0,0,0"></Label>
+							<VerticalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_fangan_1" group="shangpin_create_page_fangan_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="方案一:门店直接采购成品,不需要加工" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_fangan_2" group="shangpin_create_page_fangan_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="方案二:门店采购原料,提前加工为成品" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_fangan_3" group="shangpin_create_page_fangan_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="方案三:门店采购原料,临时加工为成品" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+							</VerticalLayout>					
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="60" padding="0,50,0,50">
 							<Control></Control>
 							<Control></Control>
-							<Control bkimage="qrcode_attention.png" width="129" height="127"></Control>
+							<Button name="shangpin_create_page_save_btn" width="400" height="60" text="保存" 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'" />
 							<Control></Control>
 							<Control></Control>
 						</HorizontalLayout>
 						</HorizontalLayout>
-						<HorizontalLayout height="60" padding="0,50,0,50">
+						
+						<HorizontalLayout height="40" padding="0,20,0,20">
 							<Control></Control>
 							<Control></Control>
-							<Button name="shangpin_create_page_saoma_btn" width="280" height="60" text="扫码快速录入" 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'" />
+							<Label name="shangpin_create_page_save_result" width="500" align="center" textcolor="#FFFF0000"></Label>
 							<Control></Control>
 							<Control></Control>
 						</HorizontalLayout>
 						</HorizontalLayout>
-						<Label height="60" wordbreak="true" text="若您要新建的商品为国家标准商品库的商品,可以直接扫描商品条码快速获取商品的名字、价格、单位等信息" textcolor="#FF666666" heiht="30" padding="20,20,20,0" align="center"></Label>
-						<Control></Control>
 					</VerticalLayout>
 					</VerticalLayout>
-					<Control></Control>
+					
+					<Control width="1" bkcolor="#FFEBE8E8"></Control>
+					
+					<HorizontalLayout name="shangpin_create_page_no_layout">
+						<Control></Control>
+						<VerticalLayout width="280">
+							<Control></Control>
+							<HorizontalLayout height="127">
+								<Control></Control>
+								<Control bkimage="qrcode_attention.png" width="129" height="127"></Control>
+								<Control></Control>
+							</HorizontalLayout>
+							<HorizontalLayout height="60" padding="0,50,0,50">
+								<Control></Control>
+								<Button name="shangpin_create_page_saoma_btn" width="280" height="60" text="扫码快速录入" 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'" />
+								<Control></Control>
+							</HorizontalLayout>
+							<Label height="60" wordbreak="true" text="若您要新建的商品为国家标准商品库的商品,可以直接扫描商品条码快速获取商品的名字、价格、单位等信息" textcolor="#FF666666" heiht="30" padding="20,20,20,0" align="center"></Label>
+							<Control></Control>
+						</VerticalLayout>
+						<Control></Control>
+					</HorizontalLayout>
 				</HorizontalLayout>
 				</HorizontalLayout>
-			</HorizontalLayout>
-		</VerticalLayout>
+			</VerticalLayout>
+		</HorizontalLayout>
 	</ShangpinCreatePage>
 	</ShangpinCreatePage>
 </Window>
 </Window>

+ 172 - 168
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_update_page.xml

@@ -1,194 +1,198 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
 <Window>
 	<ShangpinUpdatePage>
 	<ShangpinUpdatePage>
-		<VerticalLayout>
-			<HorizontalLayout height="44" bkcolor="#FFFFFFFF" padding="0,0,0,0">
-				<Button name="shangpin_create_page_return_btn" float="true" pos="20,6,120,38" text="返回" textcolor="#FFFFFFFF"/>
-			</HorizontalLayout>
-			
-			<Control height="15"></Control>
-			<HorizontalLayout>
-				<Control width="1" bkcolor="#FFD1D1D1"></Control>
+		<HorizontalLayout>
+			<Control width="1" bkcolor="#FFD1D1D1"></Control>
+
+			<VerticalLayout>
+				<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+					<Button name="shangpin_create_page_return_btn" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+					<Label name="aixuexi_page_name" text="修改商品" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
+				</HorizontalLayout>
 				
 				
-				<VerticalLayout name="shangpin_create_page_info_layout" width="620" bkcolor="#FFFFFFFF" vscrollbar="true">
-					<Label text="基本信息" height="58" padding="20,0,0,0" font="20"></Label>
+				<Control height="1" bkcolor="#FFEBE8E8"></Control>
+
+				<HorizontalLayout>					
+					<VerticalLayout name="shangpin_create_page_info_layout" width="620" bkcolor="#FFFFFFFF" vscrollbar="true">
+						<Label text="基本信息" height="58" padding="20,0,0,0" font="20"></Label>
+							
+						<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+							
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品名字:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_name_edit" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>
 						
 						
-					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品序号:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_xuhao_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="(序号越小,排序越靠前)" width="300" height="44" padding="20,0,0,0"></Label>		
+						</HorizontalLayout>
 						
 						
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品名字:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_name_edit" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品序号:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_xuhao_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="(序号越小,排序越靠前)" width="300" height="44" padding="20,0,0,0"></Label>		
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品分类:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Combo name="shangpin_create_page_foodtype" padding="15,9,0,0" width="300" height="32" tooltip="请点击这里选择您的打印机打印小票联数" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
-							
-						</Combo>
-					</HorizontalLayout>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品分类:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Combo name="shangpin_create_page_foodtype" padding="15,9,0,0" width="300" height="32" tooltip="请点击这里选择您的打印机打印小票联数" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+								
+							</Combo>
+						</HorizontalLayout>
 
 
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品条码:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_barcode_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="(没有可以不填,将随机生成一个)" width="300" height="44" padding="20,0,0,0"></Label>	
-					</HorizontalLayout>	
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品条码:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_barcode_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="(没有可以不填,将随机生成一个)" width="300" height="44" padding="20,0,0,0"></Label>	
+						</HorizontalLayout>	
 
 
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品价格:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_price_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>		
-					</HorizontalLayout>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品价格:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_price_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>		
+						</HorizontalLayout>
 
 
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品单位:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_unit_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>		
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="是否称重类型商品" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>	
-						<CheckBox name="shangpin_create_page_chengzhong" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="条码秤PLU编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0" ></Label>					
-						<Edit name="shangpin_create_page_plu" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="条码秤商品编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_shangpinbianma" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="88" padding="0,30,0,0">
-						<Label text="库存类型:" width="80" height="44" padding="20,0,0,0"></Label>
-						<VerticalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_kucun_open" group="shangpin_create_page_kucun_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="开启商品库存,下单自动扣减库存,库存不足无法下单 " width="600" padding="10,0,0,0"/>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品单位:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_unit_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>		
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="是否称重类型商品" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>	
+							<CheckBox name="shangpin_create_page_chengzhong" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="条码秤PLU编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0" ></Label>					
+							<Edit name="shangpin_create_page_plu" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="条码秤商品编码:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_shangpinbianma" width="400" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="88" padding="0,30,0,0">
+							<Label text="库存类型:" width="80" height="44" padding="20,0,0,0"></Label>
+							<VerticalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_kucun_open" group="shangpin_create_page_kucun_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="开启商品库存,下单自动扣减库存,库存不足无法下单 " width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_kucun_wuxian" group="shangpin_create_page_kucun_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="无限库存模式,下单不扣减库存" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+							</VerticalLayout>					
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="当前库存:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_kucun_now" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="商品状态:" width="80" height="44" padding="20,0,0,0"></Label>
+							<HorizontalLayout padding="30,0,30,0" width="90" height="44">
+								<CheckBox name="shangpin_create_page_status_normal" group="shangpin_create_page_status_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label text="正常 " width="300" padding="10,0,0,0"/>
 							</HorizontalLayout>
 							</HorizontalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_kucun_wuxian" group="shangpin_create_page_kucun_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="无限库存模式,下单不扣减库存" width="600" padding="10,0,0,0"/>
+							<HorizontalLayout padding="30,0,30,0" width="90" height="44">
+								<CheckBox name="shangpin_create_page_status_xiajia" group="shangpin_create_page_status_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+								<Label text="下架" width="300" padding="10,0,0,0"/>
 							</HorizontalLayout>
 							</HorizontalLayout>
-						</VerticalLayout>					
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="当前库存:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_kucun_now" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="商品状态:" width="80" height="44" padding="20,0,0,0"></Label>
-						<HorizontalLayout padding="30,0,30,0" width="90" height="44">
-							<CheckBox name="shangpin_create_page_status_normal" group="shangpin_create_page_status_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-							<Label text="正常 " width="300" padding="10,0,0,0"/>
 						</HorizontalLayout>
 						</HorizontalLayout>
-						<HorizontalLayout padding="30,0,30,0" width="90" height="44">
-							<CheckBox name="shangpin_create_page_status_xiajia" group="shangpin_create_page_status_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-							<Label text="下架" width="300" padding="10,0,0,0"/>
-						</HorizontalLayout>
-					</HorizontalLayout>
-					
-					<Label text="高级信息" height="58" padding="20,30,0,0" font="20"></Label>
 						
 						
-					<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
+						<Label text="高级信息" height="58" padding="20,30,0,0" font="20"></Label>
+							
+						<Control height="1" bkcolor="#FFEBE8E8" padding="10,0,10,0"></Control>
 
 
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="进货价:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_buyingprice_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>	
-					</HorizontalLayout>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="进货价:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_buyingprice_edit" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>	
+						</HorizontalLayout>
 
 
-					<HorizontalLayout height="88" padding="0,30,0,0">
-						<Label text="进货价模式:" width="80" height="44" padding="20,0,0,0"></Label>
-						<VerticalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_jinhuojia_normal" group="shangpin_create_page_jinhuojia_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="按当前商品进货价 (一般用于临时加工销售的商品) " width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_jinhuojia_jiaquan" group="shangpin_create_page_jinhuojia_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="按加权平均库存成本价 (一般用于采购入库销售的商品)" width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-						</VerticalLayout>					
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="在哪些地方显示:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
+						<HorizontalLayout height="88" padding="0,30,0,0">
+							<Label text="进货价模式:" width="80" height="44" padding="20,0,0,0"></Label>
+							<VerticalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_jinhuojia_normal" group="shangpin_create_page_jinhuojia_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="按当前商品进货价 (一般用于临时加工销售的商品) " width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_jinhuojia_jiaquan" group="shangpin_create_page_jinhuojia_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="按加权平均库存成本价 (一般用于采购入库销售的商品)" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+							</VerticalLayout>					
+						</HorizontalLayout>
 						
 						
-						<CheckBox name="shangpin_create_page_showplace_shouyinji" selected="true" padding="15,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
-						<Label text="收银机" width="100" padding="10,0,0,0"/>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="在哪些地方显示:" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
+							
+							<CheckBox name="shangpin_create_page_showplace_shouyinji" selected="true" padding="15,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
+							<Label text="收银机" width="100" padding="10,0,0,0"/>
+							
+							<CheckBox name="shangpin_create_page_showplace_waimai" selected="true" padding="0,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
+							<Label text="外卖" width="100" padding="10,0,0,0"/>
+							
+							<CheckBox name="shangpin_create_page_showplace_saomadiancan" selected="true" padding="0,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
+							<Label text="扫码点餐" width="100" padding="10,0,0,0"/>
+						</HorizontalLayout>
 						
 						
-						<CheckBox name="shangpin_create_page_showplace_waimai" selected="true" padding="0,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
-						<Label text="外卖" width="100" padding="10,0,0,0"/>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="是否开启打包费" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
+							<CheckBox name="shangpin_create_page_is_dabao" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+						</HorizontalLayout>
 						
 						
-						<CheckBox name="shangpin_create_page_showplace_saomadiancan" selected="true" padding="0,14,0,14" width="16" height="16" normalimage="file='Setting_CheckBox_Normal.png'" hotimage="file='Setting_CheckBox_Hover.png'" selectedimage="file='Setting_CheckBox_Click.png'"/>
-						<Label text="扫码点餐" width="100" padding="10,0,0,0"/>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="是否开启打包费" wordbreak="true" width="80" height="44" padding="20,0,0,0"></Label>
-						<CheckBox name="shangpin_create_page_is_dabao" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="44" padding="0,30,0,0">
-						<Label text="打包费金额:" width="80" height="44" padding="20,0,0,0"></Label>					
-						<Edit name="shangpin_create_page_dabao_money" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
-						<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>	
-					</HorizontalLayout>
-					
-					<HorizontalLayout height="132" padding="0,30,0,0">
-						<Label text="商品加工方式:" width="80" height="44" padding="20,0,0,0"></Label>
-						<VerticalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_fangan_1" group="shangpin_create_page_fangan_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="方案一:门店直接采购成品,不需要加工" width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_fangan_2" group="shangpin_create_page_fangan_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="方案二:门店采购原料,提前加工为成品" width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-							<HorizontalLayout padding="30,0,30,0" width="600" height="44">
-								<CheckBox name="shangpin_create_page_fangan_3" group="shangpin_create_page_fangan_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
-								<Label text="方案三:门店采购原料,临时加工为成品" width="600" padding="10,0,0,0"/>
-							</HorizontalLayout>
-						</VerticalLayout>					
-					</HorizontalLayout>
+						<HorizontalLayout height="44" padding="0,30,0,0">
+							<Label text="打包费金额:" width="80" height="44" padding="20,0,0,0"></Label>					
+							<Edit name="shangpin_create_page_dabao_money" width="200" height="44" padding="15,0,0,0" borderround="10,10" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" />
+							<Label text="元" width="80" height="44" padding="20,0,0,0"></Label>	
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="132" padding="0,30,0,0">
+							<Label text="商品加工方式:" width="80" height="44" padding="20,0,0,0"></Label>
+							<VerticalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_fangan_1" group="shangpin_create_page_fangan_type" selected="true" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="方案一:门店直接采购成品,不需要加工" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_fangan_2" group="shangpin_create_page_fangan_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="方案二:门店采购原料,提前加工为成品" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+								<HorizontalLayout padding="30,0,30,0" width="600" height="44">
+									<CheckBox name="shangpin_create_page_fangan_3" group="shangpin_create_page_fangan_type" padding="0,15,0,15" width="13" height="13" normalimage="file='RadioBtnNon.png'" hotimage="file='RadioBtnNon.png'" selectedimage="file='RadioBtnSel.png'"/>
+									<Label text="方案三:门店采购原料,临时加工为成品" width="600" padding="10,0,0,0"/>
+								</HorizontalLayout>
+							</VerticalLayout>					
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="60" padding="0,50,0,50">
+							<Control></Control>
+							<Button name="shangpin_create_page_save_btn" width="400" height="60" text="保存" 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'" />
+							<Control></Control>
+						</HorizontalLayout>
+						
+						<HorizontalLayout height="40" padding="0,20,0,20">
+							<Control></Control>
+							<Label name="shangpin_create_page_save_result" width="500" align="center" textcolor="#FFFF0000"></Label>
+							<Control></Control>
+						</HorizontalLayout>
+					</VerticalLayout>
 					
 					
-					<HorizontalLayout height="60" padding="0,50,0,50">
-						<Control></Control>
-						<Button name="shangpin_create_page_save_btn" width="400" height="60" text="保存" 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'" />
-						<Control></Control>
-					</HorizontalLayout>
+					<Control width="1" bkcolor="#FFEBE8E8"></Control>
 					
 					
-					<HorizontalLayout height="40" padding="0,20,0,20">
+					<HorizontalLayout name="shangpin_create_page_no_layout">
 						<Control></Control>
 						<Control></Control>
-						<Label name="shangpin_create_page_save_result" width="500" align="center" textcolor="#FFFF0000"></Label>
+						<VerticalLayout width="280">
+							<Control></Control>
+							<Button name="shangpin_create_page_print_btn" width="280" height="60" text="打印条码" 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'" />
+							<Control height="20"></Control>
+							<Button name="shangpin_create_page_delete_btn" width="280" height="60" text="删除商品" textcolor="#FFFFFFFF" normalimage="file='btn_red_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_red_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_red_dianji.png' corner='5,5,5,5'" />
+							<Control></Control>
+						</VerticalLayout>
 						<Control></Control>
 						<Control></Control>
 					</HorizontalLayout>
 					</HorizontalLayout>
-				</VerticalLayout>
-				
-				<Control width="1" bkcolor="#FFEBE8E8"></Control>
-				
-				<HorizontalLayout name="shangpin_create_page_no_layout">
-					<Control></Control>
-					<VerticalLayout width="280">
-						<Control></Control>
-						<Button name="shangpin_create_page_print_btn" width="280" height="60" text="打印条码" 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'" />
-						<Control height="20"></Control>
-						<Button name="shangpin_create_page_delete_btn" width="280" height="60" text="删除商品" textcolor="#FFFFFFFF" normalimage="file='btn_red_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_red_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_red_dianji.png' corner='5,5,5,5'" />
-						<Control></Control>
-					</VerticalLayout>
-					<Control></Control>
 				</HorizontalLayout>
 				</HorizontalLayout>
-			</HorizontalLayout>
-		</VerticalLayout>
+			</VerticalLayout>
+		</HorizontalLayout>
 	</ShangpinUpdatePage>
 	</ShangpinUpdatePage>
 </Window>
 </Window>

BIN
bin/Win32/Release/zhipuzi_pos_windows/DuiLib.dll


BIN
dll/debug/DuiLib_d.dll


BIN
dll/release/DuiLib.dll


BIN
res/images/伊丽莎白瓜/Image_1.jpg


BIN
res/images/伊丽莎白瓜/Image_10.jpg


BIN
res/images/伊丽莎白瓜/Image_100.jpg


BIN
res/images/伊丽莎白瓜/Image_101.jpg


BIN
res/images/伊丽莎白瓜/Image_102.jpg


BIN
res/images/伊丽莎白瓜/Image_103.jpg


BIN
res/images/伊丽莎白瓜/Image_104.jpg


BIN
res/images/伊丽莎白瓜/Image_105.jpg


BIN
res/images/伊丽莎白瓜/Image_106.jpg


BIN
res/images/伊丽莎白瓜/Image_107.jpg


BIN
res/images/伊丽莎白瓜/Image_108.jpg


BIN
res/images/伊丽莎白瓜/Image_109.jpg


BIN
res/images/伊丽莎白瓜/Image_11.jpg


BIN
res/images/伊丽莎白瓜/Image_110.jpg


BIN
res/images/伊丽莎白瓜/Image_111.jpg


BIN
res/images/伊丽莎白瓜/Image_112.jpg


BIN
res/images/伊丽莎白瓜/Image_113.jpg


BIN
res/images/伊丽莎白瓜/Image_114.jpg


BIN
res/images/伊丽莎白瓜/Image_115.jpg


BIN
res/images/伊丽莎白瓜/Image_116.jpg


BIN
res/images/伊丽莎白瓜/Image_117.jpg


BIN
res/images/伊丽莎白瓜/Image_118.jpg


BIN
res/images/伊丽莎白瓜/Image_119.jpg


BIN
res/images/伊丽莎白瓜/Image_12.jpg


BIN
res/images/伊丽莎白瓜/Image_120.jpg


BIN
res/images/伊丽莎白瓜/Image_121.jpg


BIN
res/images/伊丽莎白瓜/Image_122.jpg


BIN
res/images/伊丽莎白瓜/Image_123.jpg


BIN
res/images/伊丽莎白瓜/Image_124.jpg


BIN
res/images/伊丽莎白瓜/Image_125.jpg


BIN
res/images/伊丽莎白瓜/Image_126.jpg


BIN
res/images/伊丽莎白瓜/Image_127.jpg


BIN
res/images/伊丽莎白瓜/Image_128.jpg


BIN
res/images/伊丽莎白瓜/Image_129.jpg


BIN
res/images/伊丽莎白瓜/Image_13.jpg


BIN
res/images/伊丽莎白瓜/Image_130.jpg


BIN
res/images/伊丽莎白瓜/Image_131.jpg


BIN
res/images/伊丽莎白瓜/Image_132.jpg


BIN
res/images/伊丽莎白瓜/Image_133.jpg


BIN
res/images/伊丽莎白瓜/Image_134.jpg


BIN
res/images/伊丽莎白瓜/Image_135.jpg


BIN
res/images/伊丽莎白瓜/Image_136.jpg


BIN
res/images/伊丽莎白瓜/Image_137.jpg


BIN
res/images/伊丽莎白瓜/Image_138.jpg


BIN
res/images/伊丽莎白瓜/Image_139.jpg


BIN
res/images/伊丽莎白瓜/Image_14.jpg


BIN
res/images/伊丽莎白瓜/Image_140.jpg


BIN
res/images/伊丽莎白瓜/Image_141.jpg


BIN
res/images/伊丽莎白瓜/Image_142.jpg


BIN
res/images/伊丽莎白瓜/Image_143.jpg


BIN
res/images/伊丽莎白瓜/Image_144.jpg


BIN
res/images/伊丽莎白瓜/Image_145.jpg


BIN
res/images/伊丽莎白瓜/Image_146.jpg


BIN
res/images/伊丽莎白瓜/Image_147.jpg


BIN
res/images/伊丽莎白瓜/Image_148.jpg


BIN
res/images/伊丽莎白瓜/Image_149.jpg


BIN
res/images/伊丽莎白瓜/Image_15.jpg


BIN
res/images/伊丽莎白瓜/Image_150.jpg


BIN
res/images/伊丽莎白瓜/Image_16.jpg


BIN
res/images/伊丽莎白瓜/Image_17.jpg


BIN
res/images/伊丽莎白瓜/Image_18.jpg


BIN
res/images/伊丽莎白瓜/Image_19.jpg


BIN
res/images/伊丽莎白瓜/Image_2.jpg


BIN
res/images/伊丽莎白瓜/Image_20.jpg


BIN
res/images/伊丽莎白瓜/Image_21.jpg


BIN
res/images/伊丽莎白瓜/Image_22.jpg


BIN
res/images/伊丽莎白瓜/Image_23.jpg


BIN
res/images/伊丽莎白瓜/Image_24.jpg


BIN
res/images/伊丽莎白瓜/Image_25.jpg


BIN
res/images/伊丽莎白瓜/Image_26.jpg


BIN
res/images/伊丽莎白瓜/Image_27.jpg


BIN
res/images/伊丽莎白瓜/Image_28.jpg


BIN
res/images/伊丽莎白瓜/Image_29.jpg


BIN
res/images/伊丽莎白瓜/Image_3.jpg


BIN
res/images/伊丽莎白瓜/Image_30.jpg


BIN
res/images/伊丽莎白瓜/Image_31.jpg


BIN
res/images/伊丽莎白瓜/Image_32.jpg


BIN
res/images/伊丽莎白瓜/Image_33.jpg


BIN
res/images/伊丽莎白瓜/Image_34.jpg


BIN
res/images/伊丽莎白瓜/Image_35.jpg


BIN
res/images/伊丽莎白瓜/Image_36.jpg


BIN
res/images/伊丽莎白瓜/Image_37.jpg


BIN
res/images/伊丽莎白瓜/Image_38.jpg


BIN
res/images/伊丽莎白瓜/Image_39.jpg


BIN
res/images/伊丽莎白瓜/Image_4.jpg


BIN
res/images/伊丽莎白瓜/Image_40.jpg


BIN
res/images/伊丽莎白瓜/Image_41.jpg


BIN
res/images/伊丽莎白瓜/Image_42.jpg


BIN
res/images/伊丽莎白瓜/Image_43.jpg


BIN
res/images/伊丽莎白瓜/Image_44.jpg


BIN
res/images/伊丽莎白瓜/Image_45.jpg


BIN
res/images/伊丽莎白瓜/Image_46.jpg


BIN
res/images/伊丽莎白瓜/Image_47.jpg


+ 0 - 0
res/images/伊丽莎白瓜/Image_48.jpg


Some files were not shown because too many files changed in this diff