Merge branch 'dev' into test
Showing
4 changed files
with
12 additions
and
9 deletions
| @@ -52,4 +52,4 @@ gateway.url=http://192.168.102.205:8080/gateway | @@ -52,4 +52,4 @@ gateway.url=http://192.168.102.205:8080/gateway | ||
| 52 | #调用运维发送短信接口时的，需要传入的密码（AES加密） | 52 | #调用运维发送短信接口时的，需要传入的密码（AES加密） |
| 53 | sendSMS.password=7jVEde87bLffoTnt6tGxmw== | 53 | sendSMS.password=7jVEde87bLffoTnt6tGxmw== |
| 54 | #可口可乐活动，微信分享地址 | 54 | #可口可乐活动，微信分享地址 |
| 55 | -cocacola.wechat.share.url=http://devservice.yoho.cn:58077/activity/cocacola/html/index1.html | ||
| 55 | +cocacola.wechat.share.url=http://testservice.yoho.cn/activity/cocacola/html/index1.html |
| @@ -311,7 +311,7 @@ | @@ -311,7 +311,7 @@ | ||
| 311 | if (typeof(wx) == "undefined") { | 311 | if (typeof(wx) == "undefined") { |
| 312 | return; | 312 | return; |
| 313 | } | 313 | } |
| 314 | - /* var shareUrl = ""; | 314 | + var shareUrl = ""; |
| 315 | $.ajax({ | 315 | $.ajax({ |
| 316 | async : false, | 316 | async : false, |
| 317 | url : "/activity/cocacola/CocacolaController/getWechatShareUrl", | 317 | url : "/activity/cocacola/CocacolaController/getWechatShareUrl", |
| @@ -322,12 +322,13 @@ | @@ -322,12 +322,13 @@ | ||
| 322 | } | 322 | } |
| 323 | shareUrl = data.data.wechatShareUrl; | 323 | shareUrl = data.data.wechatShareUrl; |
| 324 | } | 324 | } |
| 325 | - }); */ | 325 | + }); |
| 326 | var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage'; | 326 | var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage'; |
| 327 | var shareTitle = '来Yoho!Buy有货玩潮流，潮流逛不停'; | 327 | var shareTitle = '来Yoho!Buy有货玩潮流，潮流逛不停'; |
| 328 | var shareImg = 'http://img12.static.yhbimg.com/activity/2016/04/07/11/02b3b297581ace1ca6251f7f9e67ca7937.jpg'; | 328 | var shareImg = 'http://img12.static.yhbimg.com/activity/2016/04/07/11/02b3b297581ace1ca6251f7f9e67ca7937.jpg'; |
| 329 | var shareDesc = '揭盖赢福利，潮流逛不停'; | 329 | var shareDesc = '揭盖赢福利，潮流逛不停'; |
| 330 | - var shareLink = "http://feature.yoho.cn/activity/cocacola/index.html"; | 330 | + //var shareLink = "http://feature.yoho.cn/activity/cocacola/index.html"; |
| 331 | + var shareLink = shareUrl; | ||
| 331 | $.getJSON(_weChatInterface + '?pageurl=' + | 332 | $.getJSON(_weChatInterface + '?pageurl=' + |
| 332 | encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) { | 333 | encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) { |
| 333 | var _appId, _timestamp, _nonceStr, _signature; | 334 | var _appId, _timestamp, _nonceStr, _signature; |
| @@ -362,7 +362,7 @@ $('#verification').bind('input propertychange', function(){ | @@ -362,7 +362,7 @@ $('#verification').bind('input propertychange', function(){ | ||
| 362 | if (typeof(wx) == "undefined") { | 362 | if (typeof(wx) == "undefined") { |
| 363 | return; | 363 | return; |
| 364 | } | 364 | } |
| 365 | - /* var shareUrl = ""; | 365 | + var shareUrl = ""; |
| 366 | $.ajax({ | 366 | $.ajax({ |
| 367 | async : false, | 367 | async : false, |
| 368 | url : "/activity/cocacola/CocacolaController/getWechatShareUrl", | 368 | url : "/activity/cocacola/CocacolaController/getWechatShareUrl", |
| @@ -373,12 +373,13 @@ $('#verification').bind('input propertychange', function(){ | @@ -373,12 +373,13 @@ $('#verification').bind('input propertychange', function(){ | ||
| 373 | } | 373 | } |
| 374 | shareUrl = data.data.wechatShareUrl; | 374 | shareUrl = data.data.wechatShareUrl; |
| 375 | } | 375 | } |
| 376 | - }); */ | 376 | + }); |
| 377 | var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage'; | 377 | var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage'; |
| 378 | var shareTitle = '来Yoho!Buy有货玩潮流，潮流逛不停'; | 378 | var shareTitle = '来Yoho!Buy有货玩潮流，潮流逛不停'; |
| 379 | var shareImg = 'http://img12.static.yhbimg.com/activity/2016/04/07/11/02b3b297581ace1ca6251f7f9e67ca7937.jpg'; | 379 | var shareImg = 'http://img12.static.yhbimg.com/activity/2016/04/07/11/02b3b297581ace1ca6251f7f9e67ca7937.jpg'; |
| 380 | var shareDesc = '揭盖赢福利，潮流逛不停'; | 380 | var shareDesc = '揭盖赢福利，潮流逛不停'; |
| 381 | - var shareLink = "http://feature.yoho.cn/activity/cocacola/index.html"; | 381 | + //var shareLink = "http://feature.yoho.cn/activity/cocacola/index.html"; |
| 382 | + var shareLink = shareUrl; | ||
| 382 | $.getJSON(_weChatInterface + '?pageurl=' + | 383 | $.getJSON(_weChatInterface + '?pageurl=' + |
| 383 | encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) { | 384 | encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) { |
| 384 | var _appId, _timestamp, _nonceStr, _signature; | 385 | var _appId, _timestamp, _nonceStr, _signature; |
| @@ -17,11 +17,11 @@ | @@ -17,11 +17,11 @@ | ||
| 17 | html,body{ | 17 | html,body{ |
| 18 | width: 100%; | 18 | width: 100%; |
| 19 | height: 100%; | 19 | height: 100%; |
| 20 | + background: #e10c1e; | ||
| 20 | } | 21 | } |
| 21 | .page{ | 22 | .page{ |
| 22 | width: 100%; | 23 | width: 100%; |
| 23 | height: 100%; | 24 | height: 100%; |
| 24 | - overflow: hidden; | ||
| 25 | background: #e10c1e; | 25 | background: #e10c1e; |
| 26 | } | 26 | } |
| 27 | .banner{ | 27 | .banner{ |
| @@ -79,6 +79,7 @@ | @@ -79,6 +79,7 @@ | ||
| 79 | width: 100%; | 79 | width: 100%; |
| 80 | height: auto; | 80 | height: auto; |
| 81 | overflow: hidden; | 81 | overflow: hidden; |
| 82 | + padding-bottom: 2rem; | ||
| 82 | } | 83 | } |
| 83 | .footer .btn{ | 84 | .footer .btn{ |
| 84 | width: 81.25%; | 85 | width: 81.25%; |
| @@ -145,7 +146,7 @@ | @@ -145,7 +146,7 @@ | ||
| 145 | </div> | 146 | </div> |
| 146 | <div class="footer"> | 147 | <div class="footer"> |
| 147 | <div class="btn"> | 148 | <div class="btn"> |
| 148 | - <img src="/activity/cocacola/images/cokeBtn.png"> | 149 | + <a href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho"><img src="/activity/cocacola/images/cokeBtn.png"></a> |
| 149 | </div> | 150 | </div> |
| 150 | <span>活动说明</span> | 151 | <span>活动说明</span> |
| 151 | </div> | 152 | </div> |
-
Please register or login to post a comment