xxxxxxx

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

@@ -21,7 +21,26 @@
 			padding: 12px;
 			border-radius: 50%;
 			text-align: center;
-			opacity: .9;color: #333;display: none;}
+			opacity: .9;color: #333;
+			display: none;
+			width: 48px;
+			height: 48px;}
+		.cart_fixed {
+			position: fixed;
+			right: 30px;
+			bottom: 135px;
+			background: rgba(0,0,0,.2);
+			padding: 12px;
+			border-radius: 50%;
+			text-align: center;
+			opacity: .5;
+			width: 48px;
+			height: 48px;
+		}
+		.buy-footer>div:first-child img {
+			width: 55%;
+			padding-top: 3px;
+		}
 	</style>
 	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 </head>
@@ -34,8 +53,8 @@
 		&nbsp;&nbsp;加载中...
 	</div>
 </div>
-<div class="mui-content">
-	<div id="tabbar-chanpin-details" class="mui-segmented-control">
+<div class="mui-content" style="background: #fff">
+	<div id="tabbar-chanpin-details" class="mui-segmented-control" style="display: none">
 		<a class="mui-control-item mui-active" href="#item1">
 			商品信息
 		</a>
@@ -43,7 +62,7 @@
                                 商品详情
                             </a> -->
 	</div>
-	<div id="item1" class="mui-control-content mui-active">
+	<div id="item1" class="mui-control-content mui-active" style="margin-top: 0">
 		<div id="detail-slider" class="mui-slider">
 			<!-- 产品轮播图 -->
 			<div class="mui-slider-group mui-slider-loop" id="group-images-div"></div>
@@ -82,7 +101,7 @@
 
 	<div class="buy-footer" id="add_cart_div_back">
 		<div class="go_index">
-			<img id="add_cart_logo_div" src="//s.iamberry.com/watero/images/shop/logo.png" />
+			<img id="add_cart_logo_div" src="//s.iamberry.com/watero/images/shop/logo-blue.png" />
 		</div>
 		<div id="add-cart-div" >加入购物车</div>
 		<div id="shopp-div" >立即购买</div>

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

@@ -10,6 +10,24 @@
 	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/watero/css/mui.min.css?v=2016111701" />
 	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/watero/css/iconfont.css?v=2016111701" />
 	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/watero/css/style.css?v=2017042701" />
+	<style>
+		#pullrefresh_chanpin_list .mui-table-view-chevron .wh-100{padding:0;}
+		.mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-object{background:#f2f2f2;border-radius: 10px;}
+		.mui-pull-caption{font-size: 12px;}
+
+		#pullrefresh_chanpin_list{padding-top: 106px;}
+		#pullrefresh_chanpin_list .mui-table-view-cell{border-bottom: 0;}
+		#pullrefresh_chanpin_list .mui-table-view-chevron .mui-table-view-cell:last-child{border-bottom: 0;}
+		#pullrefresh_chanpin_list .mui-table-view-cell:after{display: none;}
+
+		#pullrefresh_chanpin_list .mui-grid-view{padding:0 10px 10px 0;}
+		#pullrefresh_chanpin_list .mui-grid-view .mui-table-view-cell>a{background: #fff;}
+		#pullrefresh_chanpin_list .mui-grid-view .mui-table-view-cell:nth-of-type(odd){border-right: 0;}
+		#pullrefresh_chanpin_list .mui-grid-view .mui-table-view-cell:nth-of-type(even){border-left: 0;}
+		#pullrefresh_chanpin_list .mui-grid-view .mui-table-view-cell:nth-of-type(odd):last-child{border-bottom: 0;}
+		#pullrefresh_chanpin_list .mui-table-view-chevron .wh-100{padding:0;}
+		#pullrefresh_chanpin_list .mui-grid-view .shop-price {padding:0;}
+	</style>
 	<script type="text/javascript">
         // 屏蔽分享
         window.hiddenAllWechatMenu = true;
@@ -43,7 +61,7 @@
 </nav>
 <header class="mui-bar mui-bar-nav header">
 	<div class="go-index go_index">
-		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
+		<img src="//s.iamberry.com/watero/images/shop/logo-blue.png" />
 	</div>
 	<div class="mui-input-row mui-search my-search">
 		<input id="chanpin-search" type="search" class="mui-input-clear" placeholder="">

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

@@ -48,7 +48,7 @@
 </nav>
 <header class="mui-bar mui-bar-nav header">
 	<div class="go-index go_index">
-		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
+		<img src="//s.iamberry.com/watero/images/shop/logo-blue.png" />
 	</div>
 	<button type="button" class="mui-btn mui-icon mui-icon-search my-right"></button>
 	<div class="search-box">

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

@@ -48,9 +48,9 @@ ul{list-style: none;padding: 0;margin: 0;}
 #footer-bar .mui-tab-item.mui-active .icon-vip:before{content: "\e669";}
 .loading-bg{width: 100%;min-width:100%;height: 100%;min-height:100%; background-color:#F0F0F0;position: fixed;left: 0;top: 0;z-index: 999;}
 .loading-bg .mui-loading{margin-top: 50%;text-align: center;color: #aaa;}
-.go-index{float: left;width: 35%;margin-right:1%;}
-.go-index img{width: 85%;padding-top: 5px;margin-left: 12px;max-height: 42px;max-width: 135px;}
-.header{padding: 7px 0;height: 55px;background: #fff;}
+.go-index{float: left;width: 32%;margin-right:1%;}
+.go-index img{width: 85%;padding-top: 8px;margin-left: 12px;max-height: 42px;max-width: 135px;}
+.header{padding: 7px 0;height: 55px;background: #fff;box-shadow:0 0 0 #fff;}
 .marquee-show{position: fixed;top: 0;left: 0;background: rgba(255,255,255,.7);z-index: 99;white-space: nowrap;height: 40px;line-height: 40px;padding: 0 10px;color: #55c0dc;width:100%;}
 .marquee-show div{position: fixed;top: 0;left: 0;;height: 40px;line-height: 40px;width:100%;background: url(http://static.iamberry.com/watero/images/shop/marquee.png) center center /100% auto no-repeat;}
 
@@ -109,17 +109,6 @@ ul{list-style: none;padding: 0;margin: 0;}
     border-bottom: 2px solid #55c0dc !important;
     color: #55c0dc;
 }
-#pullrefresh_chanpin_list{padding-top: 106px;}
-#pullrefresh_chanpin_list .mui-table-view-cell{border-bottom: 10px solid #f5f7f9;margin-right: 0;}
-#pullrefresh_chanpin_list .mui-table-view-chevron .mui-table-view-cell:last-child{border-bottom: 0;}
-#pullrefresh_chanpin_list .mui-table-view-cell:after{display: none;}
-
-#pullrefresh_chanpin_list .mui-grid-view{padding: 0;}
-#pullrefresh_chanpin_list .mui-grid-view .mui-table-view-cell>a{background: #fff;}
-#pullrefresh_chanpin_list .mui-grid-view .mui-table-view-cell:nth-of-type(odd){border-right: 5px solid #f5f7f9;}
-#pullrefresh_chanpin_list .mui-grid-view .mui-table-view-cell:nth-of-type(even){border-left: 5px solid #f5f7f9;}
-#pullrefresh_chanpin_list .mui-grid-view .mui-table-view-cell:nth-of-type(odd):last-child{border-bottom: 0;}
-#pullrefresh_chanpin_list .mui-table-view-chevron .wh-100{padding: 8px 0;}
 
 .btn-box{display: inline-block;position: absolute;right:0;bottom:12px;width:100%;text-align: left;padding-left:120px;}
 #pullrefresh_chanpin_list .mui-grid-view .btn-box{position: relative;bottom: auto;right: auto; padding-left: 0;}
@@ -140,7 +129,6 @@ ul{list-style: none;padding: 0;margin: 0;}
 .bg-f{background: #fff;}
 .cl-baoyou{color: #55c0dc; margin-left: 10px;font-size:24px;}
 .food-tt>div:last-child:after {content: '';position: absolute;left: 0;top: 10%;width: 1px;height: 80%;background-color: rgba(0,0,0,.15);}
-#detail-slider{border-bottom: 1px solid rgba(228,0,77,.5);}
 #tabbar-chanpin-details{background: #fff;border: 0;height: 50px;}
 #tabbar-chanpin-details .mui-control-item{color:#444;font-weight: 500;border-left: 0;border-bottom: 2px solid transparent;line-height: 50px;font-size: 18px;}
 #tabbar-chanpin-details .mui-control-item.mui-active{color: #55c0dc;border-bottom: 2px solid #55c0dc;background-color: #fff;}
@@ -153,9 +141,9 @@ ul{list-style: none;padding: 0;margin: 0;}
 .video-right img{width: 100%;}
 .chanpin-ditails-dic{padding: 10px;background: #fff;margin: 10px 0 65px 0;color: #444;}
 .chanpin-ditails-dic ul li{padding: 3px 0;}
-.buy-footer {position: fixed;bottom: 0;left: 0;height: 55px;background-color: #f0f0f0;width: 100%;padding: 0;display: table;text-align: center;}
+.buy-footer {position: fixed;bottom: 0;left: 0;height: 55px;background-color: #fff;width: 100%;padding: 0;display: table;text-align: center;}
 .buy-footer>div:first-child {display: table-cell;width: 40%;border-top: 1px solid #55c0dc;vertical-align: middle;}
-.buy-footer>div:first-child img{width: 80%;padding-top: 3px;}
+.buy-footer>div:first-child img{width: 55%;padding-top: 3px;}
 .buy-footer>div:nth-of-type(2) {display: table-cell;width: 30%;background: #a6c8ce;font-size: 18px;color: #fff;vertical-align: middle;}
 .buy-footer>div:last-child {display: table-cell;width: 30%;background: #55c0dc;font-size: 18px;color: #fff;vertical-align: middle;}
 #gwc_list .mui-table-view-cell {padding: 15px 10px;}
@@ -193,11 +181,11 @@ ul{list-style: none;padding: 0;margin: 0;}
 #pullrefresh_chanpin_list .mui-table-view-chevron .mui-table-view-cell>a:not(.mui-btn) {margin-right: -115px;}
 #pullrefresh_chanpin_list .mui-table-view .mui-media-object.mui-pull-left {margin-right: 5px;}
 #pullrefresh_chanpin_list .shop-price {padding:0;text-align: left;}
-#pullrefresh_chanpin_list .mui-grid-view .shop-price {padding:0;text-align:center;}
+#pullrefresh_chanpin_list .mui-grid-view .shop-price {padding:0;}
 .bd-all-1{border: 1px solid rgba(0,0,0,.1);}
 .gwc_null h3 {color: #c3c3c3;padding: 0 0 20px 0;font-size:20px;}
 .gwc_null img{width:80px;}
-.mui-pull {font-weight: 100;}
+.mui-pull {font-weight: 100;font-size: 12px;}
 .ml-5 {margin-left: .5em;}
 .shipping_address {padding: 0 1em 0 0;margin-top: .5em;line-height: 1.5;}
 .price_r {position: absolute;bottom: 8px;text-align: right;right: 1em;color: #666;}