YOHOBUY / yohobuy-activity · Commits

Go to a project

Authored by ping
Commit 453a5a72c68c09b18c0e76107b99f785ea867042 2 parents 76f2e12d 6d733dc3

Merge branch 'dev' into test

Inline Side-by-side
Showing 7 changed files with 2 additions and 10 deletions
65372 - 20:03:28.184 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineActivityDAO.selectAllActivity","section0":0,"section1":0,"section2":2}
65373 - 20:03:28.185 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineUserQueueDAO.selectMaxSortByActivityId","section0":0,"section1":14,"section2":0}
125373 - 20:04:28.185 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineActivityDAO.selectAllActivity","section0":0,"section1":0,"section2":2}
125373 - 20:04:28.185 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineUserQueueDAO.selectMaxSortByActivityId","section0":0,"section1":14,"section2":0}
65352 - 20:06:04.610 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineActivityDAO.selectAllActivity","section0":0,"section1":0,"section2":2}
65353 - 20:06:04.611 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineUserQueueDAO.selectMaxSortByActivityId","section0":0,"section1":14,"section2":0}
65644 - 20:14:01.990 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineActivityDAO.selectAllActivity","section0":0,"section1":0,"section2":2}
65645 - 20:14:01.991 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineUserQueueDAO.selectMaxSortByActivityId","section0":0,"section1":14,"section2":0}
This diff could not be displayed because it is too large.
... ... @@ -194,7 +194,7 @@
<div class="coupon">
<img src="/activity/cocacola/images/cokeCoupon.png">
</div>
<p class="phone">优惠券已放至账户<span id="mobile"></span></p>
<p class="phone" id="mobile"></p>
<p>登录Yoho!Buy有货客户端即可使用</p>
</div>
<div class="footer">
... ... @@ -259,7 +259,7 @@
return str == null ? "" : str;
}
$(function() {
$("#mobile").html(getQueryStr("mobile"));
$("#mobile").html("优惠券已放至账户" + getQueryStr("mobile"));
});
... ...