Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-watero

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/free_collection.html

@@ -243,7 +243,7 @@
 							} else {
 								if(dt.status) {
 									mui.alert(dt.message,function(){
-									    location.href = "/watero/view/coupon_bag.html";
+									    location.href = "/watero/view/coupon_.html";
 									});
 								} else {
 									mui.alert(dt.message, function() {

watero-wechat-web/src/main/webapp/common/shop/css/style.css

@@ -83,7 +83,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 .price-sp {color: #55c0dc;font-size:16px;margin-right: 15px;}
 .shop-price{padding:0;text-align: left;}
 .shop-price s{font-size: 12px;color: #d0d0d0;}
-.tab-with-chanpin-list {background: #fff;border: 0;margin-top: 56px;z-index: 10;}
+.tab-with-chanpin-list {background: #fff;border: 0;margin-top: 55px;z-index: 10;}
 .tab-with-chanpin-list .mui-control-item {
     line-height: 1;
     height: 50px;

watero-wechat-web/src/main/webapp/view/coupon_dec.html

@@ -11,6 +11,8 @@
 	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/watero/css/style.css" />
 	<style>
 		.mui-content img{display: block;width: 100%;}
+		.mui-bar-tab .mui-btn{background: #55c0dc;border:1px solid #55c0dc;color: #fff;margin: 0 20px;width: 124px;}
+		.mui-bar-tab .mui-btn:active{background: #55c0dc;border:1px solid #55c0dc;color: #fff;}
 	</style>
 	<script>
         // 屏蔽分享
@@ -28,6 +30,11 @@
 
 <div class="mui-content" style="background: #fff;">
 	<img src="//s.iamberry.com/watero/images/coupon_dsc.jpg" />
+	<div style="height: 60px;">&nbsp;</div>
+	<nav class="mui-bar mui-bar-tab mui-text-center">
+		<button type="button" class="mui-btn go_web_shop">立即使用</button>
+		<button type="button" class="mui-btn go_coupon_bag">查看我的兑换券</button>
+	</nav>
 </div>
 <script src="//s.iamberry.com/watero/js/mui.min.js"></script>
 <script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
@@ -37,6 +44,9 @@
     mui.ready(function() {
         document.querySelector('.loading-bg').style.display = 'none';
     });
+    $(document).on('tap', '.go_coupon_bag', function() {
+        location.href ='/watero/view/coupon_bag.html';
+    });
 </script>
 </body>
 </html>