YOHOBUY / yohobuy-activity · Commits

Go to a project

Authored by ping
Commit 6d733dc3b8f9b19e58748c7f813798324c17b3fd 2 parents 7f95012f 87210bab

Merge branch 'cocacola' into dev

Inline Side-by-side
Showing 7 changed files with 2 additions and 10 deletions
1 -65372 - 20:03:28.184 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineActivityDAO.selectAllActivity","section0":0,"section1":0,"section2":2}  
2 -65373 - 20:03:28.185 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineUserQueueDAO.selectMaxSortByActivityId","section0":0,"section1":14,"section2":0}  
3 -125373 - 20:04:28.185 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineActivityDAO.selectAllActivity","section0":0,"section1":0,"section2":2}  
4 -125373 - 20:04:28.185 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineUserQueueDAO.selectMaxSortByActivityId","section0":0,"section1":14,"section2":0}  
5 -65352 - 20:06:04.610 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineActivityDAO.selectAllActivity","section0":0,"section1":0,"section2":2}  
6 -65353 - 20:06:04.611 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineUserQueueDAO.selectMaxSortByActivityId","section0":0,"section1":14,"section2":0}  
7 -65644 - 20:14:01.990 [Thread-4] INFO DatabaseOperationProfile:83 -- {"dao":"com.yoho.queue.dal.IDrawlineActivityDAO.selectAllActivity","section0":0,"section1":0,"section2":2}  
8 -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 @@ @@ -194,7 +194,7 @@
194 <div class="coupon"> 194 <div class="coupon">
195 <img src="/activity/cocacola/images/cokeCoupon.png"> 195 <img src="/activity/cocacola/images/cokeCoupon.png">
196 </div> 196 </div>
197 - <p class="phone">优惠券已放至账户<span id="mobile"></span></p> 197 + <p class="phone" id="mobile"></p>
198 <p>登录Yoho!Buy有货客户端即可使用</p> 198 <p>登录Yoho!Buy有货客户端即可使用</p>
199 </div> 199 </div>
200 <div class="footer"> 200 <div class="footer">
@@ -259,7 +259,7 @@ @@ -259,7 +259,7 @@
259 return str == null ? "" : str; 259 return str == null ? "" : str;
260 } 260 }
261 $(function() { 261 $(function() {
262 - $("#mobile").html(getQueryStr("mobile")); 262 + $("#mobile").html("优惠券已放至账户" + getQueryStr("mobile"));
263 }); 263 });
264 264
265 265