diff --git a/inter/sgp/xml/page_collect_point_3.lxml b/inter/sgp/xml/page_collect_point_3.lxml index 8a792f43..c7435ba3 100644 --- a/inter/sgp/xml/page_collect_point_3.lxml +++ b/inter/sgp/xml/page_collect_point_3.lxml @@ -217,20 +217,23 @@ INT TaobinExpireYear INT TaobinExpireDay - Var TaobinExpireYear = TaobinExpireYear + 543 + ;Var TaobinExpireYear = TaobinExpireYear + 543 EndIf - Var ExpireStrTmp = "" + Var ExpireStrTmp = "EXPIRES IN " Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay Var ExpireStrTmp = ExpireStrTmp + " " Var ExpireStrTmp = ExpireStrTmp + TaobinExpireMonth Var ExpireStrTmp = ExpireStrTmp + " " Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear + DEBUGVAR ExpireStrTmp + Var ExpireCupsDate = " 31/12/" + SystemDateYear + DEBUGVAR ExpireCupsDate If TaobinLevel = "1" Then Var PointMaskState = "Enable" @@ -320,19 +323,19 @@ Var MakeDrinkState = 0 ; X Y taobin - Var ShellXCol1 = 173 + Var ShellXCol1 = 170 Var ShellXCol2 = 268 - Var ShellXCol3 = 365 - Var ShellXCol4 = 462 - Var ShellXCol5 = 557 + Var ShellXCol3 = 367 + Var ShellXCol4 = 467 + Var ShellXCol5 = 562 Var ShellXCol6 = 662 - Var ShellXCol7 = 757 - Var ShellXCol8 = 852 + Var ShellXCol7 = 762 + Var ShellXCol8 = 860 ; 1-8 - Var ShellYRow1 = 1047 + Var ShellYRow1 = 1042 ; 9-16 - Var ShellYRow2 = 1130 + Var ShellYRow2 = 1125 ; 17-24 Var ShellYRow3 = 1213 ; 25-32 @@ -1607,13 +1610,40 @@ ; TaobinLevelDesc2 ; -; expire +; expire-cup 172 1650 PointAlert +; ExpireCupsDate + + 330 + 1655 + 20 + PepsiExtend + WTCWhiteColor + ExpireCupsDate + + + +; ExpireStrTmp +; + + 483 + 960 + 20 + PepsiExtend + WTCMediumBlueColor + ExpireStrTmp + + + + + + + ; ; xPointEndDate ; 1576