Merge branch 'sgp_blue' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into sgp_blue

inter/sgp/xml/page_drinkfail_sg.lxml

@@ -177,17 +177,17 @@ EndIf
 
 
 <Image>
-<X> 43 </X>
-<Y> 428 </Y>
+<X> 0 </X>
+<Y> 440 </Y>
 <Filename> Var( DirImage + "/text_11.png" ) </Filename>
 </Image>
 
-<Image>
-<X> 429 </X>
-<Y> 1301 </Y>
-<State> ShowQRByNoMember </State>
-<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
-</Image>
+;<Image>
+;<X> 429 </X>
+;<Y> 1301 </Y>
+;<State> ShowQRByNoMember </State>
+;<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
+;</Image>
 
 ;<Image>
 ;<X> 190 </X>
@@ -197,7 +197,7 @@ EndIf
 
 
 <Button>
-<X> 392 </X>
+<X> 400 </X>
 <Y> 1720 </Y>
 <Filename> Var( DirImage + "/bn_close.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>

inter/sgp/xml/page_show_error.lxml

@@ -280,17 +280,24 @@
 
 <Image>
 <State> show_error_normal </State>
-<X> 69 </X>
-<Y> 642 </Y>
+<X> 0 </X>
+<Y> 897 </Y>
 <Filename> Var(DirImage + "/img1.png") </Filename>
 </Image>
 
-;<Image>
-;<State> show_error_sp1 </State>
-;<X> 69 </X>
-;<Y> 642 </Y>
-;<Filename> Var(DirImage + "/img_error_sgp.png") </Filename>
-;</Image>
+<Image>
+<State> show_error_normal </State>
+<X> 0 </X>
+<Y> 694 </Y>
+<Filename> Var(DirImage + "/text1.png") </Filename>
+</Image>
+;
+<Image>
+<State> show_error_normal </State>
+<X> 0 </X>
+<Y> 1685 </Y>
+<Filename> Var(DirImage + "/text2.png") </Filename>
+</Image>
 
 <Image>
 <State> show_error_sp1 </State>