Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
dbfe9cdc99
19 changed files with 273 additions and 165 deletions
|
|
@ -323,7 +323,7 @@
|
|||
|
||||
|
||||
|
||||
|
||||
Var FromCheckMemberPoint = 0
|
||||
|
||||
|
||||
|
||||
|
|
@ -486,6 +486,13 @@
|
|||
If CouponTypeA = "113" Then
|
||||
Var CouponNameA = "/imgCoupon113.png"
|
||||
EndIf
|
||||
|
||||
If CouponTypeA = "120" Then
|
||||
Var CouponNameA = "/imgCoupon120.png"
|
||||
EndIf
|
||||
If CouponTypeA = "121" Then
|
||||
Var CouponNameA = "/imgCoupon121.png"
|
||||
EndIf
|
||||
|
||||
INT CouponExireA_D
|
||||
INT CouponExireA_Y
|
||||
|
|
@ -598,6 +605,13 @@
|
|||
Var CouponNameB = "/imgCoupon113.png"
|
||||
EndIf
|
||||
|
||||
If CouponTypeB = "120" Then
|
||||
Var CouponNameB = "/imgCoupon120.png"
|
||||
EndIf
|
||||
If CouponTypeB = "121" Then
|
||||
Var CouponNameB = "/imgCoupon121.png"
|
||||
EndIf
|
||||
|
||||
INT CouponExireB_D
|
||||
INT CouponExireB_Y
|
||||
Var CouponExireB_Y = CouponExireB_Y + 0
|
||||
|
|
@ -715,6 +729,13 @@
|
|||
Var CouponNameA = "/imgCoupon113.png"
|
||||
EndIf
|
||||
|
||||
If CouponTypeA = "120" Then
|
||||
Var CouponNameA = "/imgCoupon120.png"
|
||||
EndIf
|
||||
If CouponTypeA = "121" Then
|
||||
Var CouponNameA = "/imgCoupon121.png"
|
||||
EndIf
|
||||
|
||||
INT CouponExireA_D
|
||||
INT CouponExireA_Y
|
||||
Var CouponExireA_Y = CouponExireA_Y + 543
|
||||
|
|
@ -825,6 +846,13 @@
|
|||
Var CouponNameB = "/imgCoupon113.png"
|
||||
EndIf
|
||||
|
||||
If CouponTypeB = "120" Then
|
||||
Var CouponNameB = "/imgCoupon120.png"
|
||||
EndIf
|
||||
If CouponTypeB = "121" Then
|
||||
Var CouponNameB = "/imgCoupon121.png"
|
||||
EndIf
|
||||
|
||||
INT CouponExireB_D
|
||||
INT CouponExireB_Y
|
||||
Var CouponExireB_Y = CouponExireB_Y + 543
|
||||
|
|
@ -1137,22 +1165,25 @@
|
|||
</Text>
|
||||
|
||||
|
||||
;<Button>
|
||||
;<X> 156 </X>
|
||||
;<Y> 1746 </Y>
|
||||
;<Filename> Var( DirImage + "/bn_checkKradong.png" )</Filename>
|
||||
;<FilenamePress> Var( DirImage + "/bp_checkKradong.png" )</FilenamePress>
|
||||
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
;<Volume> SoundVolume </Volume>
|
||||
;<EventClick>
|
||||
; Open "ROOT/taobin_project/xml/page_check_member_point.xml"
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
<Button>
|
||||
<X> 156 </X>
|
||||
<Y> 1746 </Y>
|
||||
<Filename> Var( DirImage + "/bn_checkKradong.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_checkKradong.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
GETACCEXT TNumberTaobinMemberXXX 14
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_check_member_point.xml"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 397 </X>
|
||||
;<X> 630 </X>
|
||||
;<X> 397 </X>
|
||||
<X> 630 </X>
|
||||
<Y> 1746 </Y>
|
||||
<Filename> Var( DirImage + bn_exit )</Filename>
|
||||
<FilenamePress> Var( DirImage + bp_exit )</FilenamePress>
|
||||
|
|
@ -1211,7 +1242,7 @@
|
|||
|
||||
<Text>
|
||||
<X> 372 </X>
|
||||
<Y> 1370 </Y>
|
||||
<Y> 1375 </Y>
|
||||
<Size> 15 </Size>
|
||||
<Width> 600 </Width>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
|
|
@ -1244,7 +1275,7 @@
|
|||
|
||||
<Text>
|
||||
<X> 372 </X>
|
||||
<Y> 1613 </Y>
|
||||
<Y> 1618 </Y>
|
||||
<Size> 15 </Size>
|
||||
<Width> 600 </Width>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue