优化

git-svn-id: svn://svn7.apicloud.com/A6007457911931/%E5%9C%88%E5%A4%9A%E5%A4%9A@672 0e1a2743-8d03-4e5a-a60c-7e26af42b145

html/home/hoteldtl.html

@@ -13,7 +13,7 @@
 		<link rel="stylesheet" type="text/css" href="../../css/iconfont.css" />
 		<link rel="stylesheet" type="text/css" href="../../css/style.css?v=1.2" />
 		<style>
-	.feed-item{
+			.feed-item{
         width: 99%;
         border-bottom:1px solid #e8e8e8;
         position:relative;
@@ -313,10 +313,10 @@
         #store_phone a, #store_phone a:hover {
           color: #d9251c;
         }
-        .m-bottom {
-           height: 0.86rem;
-           line-height: 0.86rem;
-           border-radius: 0.15rem;
+        .footerbtn {
+			position: fixed;
+			bottom: 20px;
+			z-index: 999;
         }
         .fixed_top .hotel-top-search, .fixed_top .hotel-top-back {
            background-color: rgba(0, 0, 0, 0.5);
@@ -403,7 +403,7 @@
 							<div class="hotel-top-back"><span class="iconfont">&#xe61e;</span></div>
 						</li>
 						<li class="flex-1" style="padding: 0 0.1rem;">
-							<div class="hotel-top-search"><img src="../../image/search_2.png"/> 搜索商品</div>
+							<div class="hotel-top-search"><img src="../../image/search_2.png" /> 搜索商品</div>
 						</li>
 						<li style="width: 0.61rem;padding-right: 0.04rem;">
 							<div class="hotel-top-back" id="share-btn" style="float:right;"><span class="iconfont">&#xe648;</span></div>
@@ -419,8 +419,6 @@
 			<div id="store_description"></div>
 		</section>
 		<div class="h10"></div>
-		<!-- <div class="business-time" style="padding-bottom: 0.3rem;"></div> -->
-		<!-- <div class="back-h10" style="height: 0.2rem;"></div> -->
 		<div class="weui-tab tabh" style="padding: 0;">
 			<div class="weui-navbar">
 				<div class="weui-navbar__item weui-bar__item_on" href="#tab1">
@@ -461,7 +459,9 @@
 							<div class="h20"></div>
 						</section>
 					</div>
-					<div class="m-bottom" feedback="false" style="position: fixed;bottom: 0.2rem;width: 6.86rem;">您的入住意见反馈(反馈送圈币)</div>
+					<div class="footerbtn">
+						<div class="m-bottom" feedback="false" style="width:6.86rem;border-radius: 0.15rem;">您的入住意见反馈(反馈送圈币)</div>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -479,28 +479,27 @@
 			<div class="h10"></div>
 			<div class="goods-list" page="1"></div>
 		</section>
-	</body>
-	<div class="h50"></div>
-	<div class="share-item mask-hidden">
-		<div>
-			<div class="share-item-tips">分享至</div>
-			<div class="share-item-cent">
-				<ul>
-					<li class="share-item-friend"><img src="../../image/share_friend.png" />
-						<p>微信好友</p>
-					</li>
-					<li class="share-item-cale"><img src="../../image/share_cale.png" />
-						<p>微信朋友圈</p>
-					</li>
-					<li class="share-item-qq"><img src="../../image/share_qq.png" />
-						<p>QQ</p>
-					</li>
-				</ul>
+		<div class="h50"></div>
+		<div class="share-item mask-hidden">
+			<div>
+				<div class="share-item-tips">分享至</div>
+				<div class="share-item-cent">
+					<ul>
+						<li class="share-item-friend"><img src="../../image/share_friend.png" />
+							<p>微信好友</p>
+						</li>
+						<li class="share-item-cale"><img src="../../image/share_cale.png" />
+							<p>微信朋友圈</p>
+						</li>
+						<li class="share-item-qq"><img src="../../image/share_qq.png" />
+							<p>QQ</p>
+						</li>
+					</ul>
+				</div>
+				<div class="share-item-cancel">取消</div>
 			</div>
-			<div class="share-item-cancel">取消</div>
 		</div>
-	</div>
-	<div class="back-top mask-hidden" id="fix1"></div>
+		<div class="back-top mask-hidden" id="fix1"></div>
 	</body>
 	<script type="text/javascript" src="../../script/api.js"></script>
 	<script type="text/javascript" src="../../script/swiper.min.js"></script>
@@ -523,7 +522,8 @@
 		var imgUrl = "";
 		apiready = function() {
 			_storeid = api.pageParam.keyid;
-			 $(".ft").css("top",'3px');
+			$api.fixTabBar($api.byId('footerbtn'))
+			$(".ft").css("top", '3px');
 			$(".goods-list").attr("page", "1");
 			setIosTopBar();
 			getstoreCategory();
@@ -544,7 +544,6 @@
 				}
 			});
 		};
-		///////////
 
 		$(function() {
 			$('.weui-navbar__item').on('click', function() {
@@ -620,9 +619,10 @@
 						if (datas.data.store_slide.length > 0) {
 							$.each(datas.data.store_slide, function(index, item) {
 								if (item.indexOf('jpg') != -1) {
-									$(".swiper-wrapper").append('<div class="swiper-slide" type="0" keyid="0"><img src="'+item+'"/></div>');
+									$(".swiper-wrapper").append('<div class="swiper-slide" type="0" keyid="0"><img src="' + item +
+										'"/></div>');
 									// $(".swiper-wrapper").append('<div class="swiper-slide bg-full" style="background: url(' + item + ');">');
-								}						
+								}
 							})
 						}
 						var swiper = new Swiper('.swiper-container', {
@@ -756,17 +756,18 @@
 			});
 			return false;
 		})
-		function openImg(_this){
-			var imgs=$(_this).data('imgs').split(',');
-			var index=$(_this).data('index');
-			var imageBrowser = api.require('imageBrowser');
-			imageBrowser.openImages({
+
+		function openImg(_this) {
+			var imgs = $(_this).data('imgs').split(',');
+			var index = $(_this).data('index');
+			var imageBrowser = api.require('imageBrowser');
+			imageBrowser.openImages({
 				imageUrls: imgs,
-				activeIndex:index
+				activeIndex: index
 			});
 		}
 		// $("#tab2").on("tap", "img", function() {
-			
+
 		// 	// gallery_qz($(this).attr("src"));
 		// });
 
@@ -967,7 +968,8 @@
 								_html += '<ul><li>' + item.content + '</li></ul><ul style="margin-top: 0.25rem;"><li>';
 								if (_imglist.length > 0) {
 									for (var i = 0; i < _imglist.length; i++) {
-										_html += '<img onclick="openImg(this)" data-index="'+i+'" data-imgs="'+_imglist+'" src="' + _imglist[i] + '" style="width: 1.2rem;height: 1.2rem;margin-right: 0.3rem;"/>';
+										_html += '<img onclick="openImg(this)" data-index="' + i + '" data-imgs="' + _imglist + '" src="' +
+											_imglist[i] + '" style="width: 1.2rem;height: 1.2rem;margin-right: 0.3rem;"/>';
 									}
 								}
 								_html += '</li></ul><div class="h50"></div></div>';
@@ -1103,7 +1105,7 @@
 			return false;
 		})
 		$(".share-item-friend").on("tap", function() {
-			
+
 			var wx = api.require('wx');
 			api.download({
 				url: imgUrl,
@@ -1112,12 +1114,12 @@
 				cache: true,
 				allowResume: true
 			}, function(ret, err) {
-				var str=ret.savePath.slice(-3);
-				var str2="";
-				if(str=='png'){
-					str2=ret.savePath;
-				}else{
-					str2="widget://image/logo3.png";
+				var str = ret.savePath.slice(-3);
+				var str2 = "";
+				if (str == 'png') {
+					str2 = ret.savePath;
+				} else {
+					str2 = "widget://image/logo3.png";
 				}
 				if (ret.state == 1) {
 					wx.shareProgram({
@@ -1171,10 +1173,11 @@
 				contentUrl: _shareurl
 			}, function(ret, err) {
 				if (ret.status) {
-					api.toast({msg: '分享成功！'});
+					api.toast({
+						msg: '分享成功！'
+					});
 					setPoint();
-				} else {
-				}
+				} else {}
 			});
 			$(".share-item").slideUp(500, function() {});
 			$(".weui-mask").remove();

html/home/showgoods.html

@@ -136,7 +136,9 @@
         }
         .mask-goods{
           position:fixed;
-          left:0px;right:0px;bottom: 1.001rem;
+          left:0px;
+		  right:0px;
+		  bottom: 1.001rem;
           background: rgba(0, 0, 0, 0.5);
           z-index:999999;
         }
@@ -241,6 +243,7 @@
         #goods-issue{
          width: 100%;
          word-wrap:break-word;
+		 margin-bottom: 1rem;
         }
        .share-item{
          position:fixed;
@@ -466,8 +469,8 @@
         </div>
         <div class="section">
             <div id="goods-content" class="goods-tab2 goods-tab-c"></div>
-			<div class="hei" style="height: 0.59rem;"></div>
             <div id="goods-issue" class="mask-hidden goods-tab2 goods-tab-d"></div>
+			<div class="hei" style="height: 0.65rem;"></div>
         </div>
     </div>
     <div class="buy-btn" id="footer2">
@@ -514,7 +517,7 @@
                    <li><span class="close-goods-size iconfont">&#xeb6a;</span></li>
                </ul>
            </div>
-           <div class="h2" style="padding-top: 0.33rem;"></div>
+           <div class="h2" style="padding-top: 0.33rem;margin-bottom: 0.15rem;"></div>
            <div class="goods-size-item">
            </div>
            <div class="goods-tag-item"><span>数量</span>
@@ -560,7 +563,8 @@ var imgUrl="";
 apiready = function() {
 	$api.fixIos7Bar($api.byId('header'));
 	if($api.fixTabBar($api.byId('footer2'))>48){
-		$(".hei").css("height","1.2rem")
+		$(".hei").css("height","1.2rem");
+		$(".mask-goods").css("bottom","1.5rem");
 	}
     _keyid = api.pageParam.keyid;
     _storeid = api.pageParam.storeid;

html/order/orderdtl.html

@@ -219,8 +219,8 @@
 		apiready = function() {
 			_keyid = api.pageParam.keyid;
 			setFixStatusBar();
-			getRouteData(_keyid);
-			// getAddrData(_keyid);
+			// getRouteData(_keyid)
+
 			api.addEventListener({
 				name: 'resume'
 			}, function(ret, err) {
@@ -321,22 +321,26 @@
 					}
 					if (item.order_state == 10) {
 						$("#state-btn").append(
-							'<div class="order-btn"><ul><li  id="order-cancel" >取消订单</li><li class="to-pay" keyid="' + item.order_id +
+							'<div class="order-btn" id="footer2"><ul><li  id="order-cancel" >取消订单</li><li class="to-pay" keyid="' + item.order_id +
 							'">去付款(￥' + item.order_amount + ')</li></ul></div>');
+						$api.fixTabBar($api.byId('footer2'))	
 					}
 					if (item.order_state == 20) {
 						if (item.shipping_type == 0) {
 							$("#state-btn").append('<div  class="order-btn"  id="order-cancel" ><ul><li class="o-refund" keyid="' + item.order_id +
 								'">退款</li><li class="urge" keyid="' + item.order_id + '">催单</li></ul></div>');
+							$api.fixTabBar($api.byId('order-cancel'))
 						} else {
 							$("#state-btn").append('<div  class="order-btn"  id="order-cancel" ><ul><li class="o-refund" keyid="' + item.order_id +
 								'">退款</li><li class="contacthotel" keyid="' + item.order_id + '">联系酒店</li></ul></div>');
+							$api.fixTabBar($api.byId('order-cancel'))
 						}
 					}
 					if (item.order_state == 30) {
 						$("#state-btn").append(
 							'<div  class="order-btn"  id="order-cancel" ><ul><li class="confirm" style="width:100%;border-right:none;">确认收货</li></ul></div>'
 						);
+						$api.fixTabBar($api.byId('order-cancel'))
 					}
 					if (item.order_state == 40) {
 						if (item.refund_state == 0) {
@@ -344,28 +348,27 @@
 								$("#state-btn").append(
 									'<div class="order-btn" id="order-return"><ul><li class="evaluate" style="width: 100%">去评价</li></ul></div>'
 								);
-							} else {
-								//$("#state-btn").append('<div class="order-btn" id="order-return"><ul><li style="width: 100%">退换货申请</li></ul></div>');
 							}
-							// if (item.status = '已完成') {
-							//     $("#state-btn").append('<div  class="order-btn"  id="order-del" ><ul><li style="width:100%;border-right:none;">删除订单</li></ul></div>');
-							// }
+							$api.fixTabBar($api.byId('order-return'))
 						}
 						if (item.refund_state == 4 && item.evaluation_state == 0) {
 							$("#state-btn").append(
 								'<div class="order-btn" id="order-return"><ul><li class="evaluate" style="width: 100%">去评价</li></ul></div>'
 							);
+							$api.fixTabBar($api.byId('order-return'))
 						}
 						if (item.refund_state == 2 || item.refund_state == 3 || item.refund_state == 4) {
 							$("#state-btn").append(
 								'<div  class="order-btn"  id="order-del" ><ul><li style="width:100%;border-right:none;">删除订单</li></ul></div>'
 							);
+							$api.fixTabBar($api.byId('order-del'))
 						}
 					}
 					if (item.order_state == 0) {
 						$("#state-btn").append(
 							'<div  class="order-btn"  id="order-del" ><ul><li style="width:100%;border-right:none;">删除订单</li></ul></div>'
 						);
+						$api.fixTabBar($api.byId('order-del'))
 					}
 				}
 			});