Home Explore Help
Sign In
guojy
/
qzw_app
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

9.26

git-svn-id: svn://svn7.apicloud.com/A6007457911931/%E5%9C%88%E5%A4%9A%E5%A4%9A@676 0e1a2743-8d03-4e5a-a60c-7e26af42b145
1149931599@qq.com 4 years ago
parent
d58b483a51
commit
1ceee135c9
5 changed files with 52 additions and 33 deletions
Unified View Show Diff Stats
  1. 1 0
      css/style.css
  2. 8 2
      html/frame0.html
  3. 29 25
      html/home/hoteldtl.html
  4. 13 4
      html/home/showgoods.html
  5. 1 2
      html/my/orderlist.html

+ 1 - 0
css/style.css
View File 

@@ -501,6 +501,7 @@ section {
 
     width: 100%;

     width: 100%;

     height: 3.3rem;

     height: 3.3rem;

     background: #e8e8e8;

     background: #e8e8e8;

+	margin-top: 2.4rem;

 }

 }

 

 

 .home-nearby {

 .home-nearby {

+ 8 - 2
html/frame0.html
View File 

@@ -210,7 +210,7 @@
 
 				</div>
 
 				</div>
 
 				<div class="home-search" style="margin-bottom: 0.2rem;"><img src="../image/search.png"> 搜索您入住的酒店</div>
 
 				<div class="home-search" style="margin-bottom: 0.2rem;"><img src="../image/search.png"> 搜索您入住的酒店</div>
 
 			</div>
 
 			</div>
 
-			<div class="h10" style="height: 2.5rem;"></div>
 
+			<!-- <div class="h10" style="height: 2.5rem;"></div> -->
 
 			<div class="home-ads" style="border-radius: 0.1rem;">
 
 			<div class="home-ads" style="border-radius: 0.1rem;">
 
 				<div class="swiper-container" id="swiper" style="border-radius: 0.1rem;">
 
 				<div class="swiper-container" id="swiper" style="border-radius: 0.1rem;">
 
 					<div class="swiper-wrapper">
 
 					<div class="swiper-wrapper">
 
@@ -265,6 +265,11 @@
 
 		apiready = function() {
 
 		apiready = function() {
 
 			var $header = $api.byId('header');
 
 			var $header = $api.byId('header');
 
 			$api.fixIos7Bar($header);
 
 			$api.fixIos7Bar($header);
 
+			var deviceModel = api.deviceModel;
 
+			var num=deviceModel.substr(deviceModel.length-4,2)+""+deviceModel.substr(deviceModel.length-1,1)
 
+			if(num<=105){
 
+				$(".home-ads").css("margin-top","2rem")
 
+			}
 
 			_webinkeyid = api.pageParam.keyid;
 
 			_webinkeyid = api.pageParam.keyid;
 
 			_webinstoreid = api.pageParam.storeid;
 
 			_webinstoreid = api.pageParam.storeid;
 
 			_adv_type = api.pageParam.advtype;
 
 			_adv_type = api.pageParam.advtype;
 
@@ -596,6 +601,7 @@
 
 		}
 
 		}
 
 
 
 		function getRouteHotelData() {
 
 		function getRouteHotelData() {
 
+			console.log("进来了");
 
 			if (_lon == '0') {
 
 			if (_lon == '0') {
 
 				$(".border-none").removeClass("mask-hidden");
 
 				$(".border-none").removeClass("mask-hidden");
 
 				return false;
 
 				return false;
 
@@ -609,7 +615,7 @@
 
 				url: siteurl + 'v2/entry/storeList',
 
 				url: siteurl + 'v2/entry/storeList',
 
 				data: {
 
 				data: {
 
 					page: _page,
 
 					page: _page,
 
-					page_size: '8',
 
+					page_size: '10',
 
 					minid: _minid,
 
 					minid: _minid,
 
 					lon: _lon,
 
 					lon: _lon,
 
 					lat: _lat
 
 					lat: _lat

+ 29 - 25
html/home/hoteldtl.html
View File 

@@ -60,6 +60,7 @@
 
        background: url('../../image/881649.jpg') ;

        background: url('../../image/881649.jpg') ;

        background-repeat:no-repeat;

        background-repeat:no-repeat;

        background-size:100% 100%;

        background-size:100% 100%;

+	   position: relative;

      }

      }

      .hotel-top-line{

      .hotel-top-line{

        width:100%

        width:100%

@@ -357,12 +358,12 @@
 
         }

         }

 		.ft{

 		.ft{

 			position: fixed;

 			position: fixed;

-			z-index: 501;

 			left: 0;

 			left: 0;

 			right: 0;

 			right: 0;

-			top:0;

+			top:10px;

 			z-index: 999;

 			z-index: 999;

 			transform: translateZ(0);-webkit-transform: translateZ(0);

 			transform: translateZ(0);-webkit-transform: translateZ(0);

+			/* background-color: #fff; */

 		}

 		}

     </style>

     </style>

 		<script>

 		<script>

@@ -389,28 +390,27 @@
 
 

 

 	<body>

 	<body>

 		<div class="topbar"></div>

 		<div class="topbar"></div>

+		<section class="ft" style="padding: 0;padding-bottom: 0.2rem;" id="ft">

+			<div class="hotel-top-line">

+				<ul class="flex-box flex-v-ce">

+					<li style="width: 0.61rem;padding-left: 0.04rem;" class="back-btn">

+						<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>

+					</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>

+					</li>

+				</ul>

+			</div>

+		</section>

 		<div class="hotel-top" id="div_top">

 		<div class="hotel-top" id="div_top">

 			<div class="swiper-container">

 			<div class="swiper-container">

 				<div class="swiper-wrapper">

 				<div class="swiper-wrapper">

 				</div>

 				</div>

 				<div class="swiper-pagination"></div>

 				<div class="swiper-pagination"></div>

 			</div>

 			</div>

-			<section class="ft" style="padding: 0;padding-bottom: 0.2rem;">

-				<div style="height: 0.75rem;"></div>

-				<div class="hotel-top-line">

-					<ul class="flex-box flex-v-ce">

-						<li style="width: 0.61rem;padding-left: 0.04rem;" class="back-btn">

-							<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>

-						</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>

-						</li>

-					</ul>

-				</div>

-			</section>

 		</div>

 		</div>

 		<section class="hotel-item">

 		<section class="hotel-item">

 			<div class="hotel-title font-rem11">

 			<div class="hotel-title font-rem11">

@@ -523,7 +523,7 @@
 
 		apiready = function() {

 		apiready = function() {

 			_storeid = api.pageParam.keyid;

 			_storeid = api.pageParam.keyid;

 			$api.fixTabBar($api.byId('footerbtn'))

 			$api.fixTabBar($api.byId('footerbtn'))

-			$(".ft").css("top", '3px');

+			$api.fixIos7Bar($api.byId('ft'));

 			$(".goods-list").attr("page", "1");

 			$(".goods-list").attr("page", "1");

 			setIosTopBar();

 			setIosTopBar();

 			getstoreCategory();

 			getstoreCategory();

@@ -565,13 +565,17 @@
 
 				}

 				}

 			});

 			});

 			$(window).scroll(function() {

 			$(window).scroll(function() {

-				var a = document.getElementById("div_top").offsetTop;

-				if (a >= $(window).scrollTop() && a < ($(window).scrollTop() + $(window).height())) {

-					$("#div_top section").removeClass("fixed_top");

-				}

-				if ($("#div_top").outerHeight() <= $(window).scrollTop()) {

-					$("#div_top section").addClass("fixed_top");

+				// var a = document.getElementById("div_top").offsetTop;

+				// console.log($(window).scrollTop());

+				

+				if ($(window).scrollTop()>=200) {

+					$(".ft").addClass("fixed_top");

+				}else{

+					$(".ft").removeClass("fixed_top");

 				}

 				}

+				// if ($("#div_top").outerHeight() <= $(window).scrollTop()) {

+				// 	$(".ft").addClass("fixed_top");

+				// }

 			});

 			});

 

 

 			$('img').error(function() {

 			$('img').error(function() {

+ 13 - 4
html/home/showgoods.html
View File 

@@ -224,6 +224,8 @@
 
         #goods-content img{

         #goods-content img{

             width: 100%;

             width: 100%;

             margin-bottom: -0.03rem;

             margin-bottom: -0.03rem;

+			vertical-align:bottom;

+			display: block;

         }

         }

         .add-num li {

         .add-num li {

             height: 0.6rem;

             height: 0.6rem;

@@ -422,7 +424,7 @@
 
         </ul>

         </ul>

     </header>

     </header>

     <div class="goods-tab-a goods-tab">

     <div class="goods-tab-a goods-tab">

-        <div class="home-ads">

+        <div class="home-ads" style="margin-top: 1rem;">

             <div class="swiper-container">

             <div class="swiper-container">

                 <div class="swiper-wrapper">

                 <div class="swiper-wrapper">

                 </div>

                 </div>

@@ -485,7 +487,7 @@
 
             <li style="width: 1rem;" class="go-home"><img src="../../image/goods_buy_home.png" /></li>

             <li style="width: 1rem;" class="go-home"><img src="../../image/goods_buy_home.png" /></li>

         </ul>

         </ul>

     </div>

     </div>

-   <div class="share-item mask-hidden">

+    <div class="share-item mask-hidden">

 	    <div>

 	    <div>

 	        <div class="share-item-tips">分享至</div>

 	        <div class="share-item-tips">分享至</div>

 	        <div class="share-item-cent">

 	        <div class="share-item-cent">

@@ -504,7 +506,7 @@
 
 	        <div class="share-item-cancel">取消</div>

 	        <div class="share-item-cancel">取消</div>

 	    </div>

 	    </div>

 	</div>

 	</div>

-   <div class="mask-goods mask-hidden">

+    <div class="mask-goods mask-hidden">

        <div class="goods-size mask-hidden">

        <div class="goods-size mask-hidden">

            <div class="goods-size-title">

            <div class="goods-size-title">

                <ul>

                <ul>

@@ -568,6 +570,11 @@ apiready = function() {
 
 		$(".hei").css("height","1.2rem");

 		$(".hei").css("height","1.2rem");

 		$(".mask-goods").css("bottom","1.5rem");

 		$(".mask-goods").css("bottom","1.5rem");

 	}

 	}

+	var deviceModel = api.deviceModel;

+	var num=deviceModel.substr(deviceModel.length-4,2)+""+deviceModel.substr(deviceModel.length-1,1)

+	if(num<=105){

+		$(".mask-goods").css("bottom","1.001rem");

+	}

 	$(".goods-tab-b-line").css("top",(hei-1)+"px")

 	$(".goods-tab-b-line").css("top",(hei-1)+"px")

     _keyid = api.pageParam.keyid;

     _keyid = api.pageParam.keyid;

     _storeid = api.pageParam.storeid;

     _storeid = api.pageParam.storeid;

@@ -613,7 +620,7 @@ function getRouteData(_keyid, _storeid) {
 
                 _shareimg = siteurl + "uploads/home/store/goods/" + datas.data.goods_image.substr(0, datas.data.goods_image.indexOf("\_")) + "/" + datas.data.goods_image;

                 _shareimg = siteurl + "uploads/home/store/goods/" + datas.data.goods_image.substr(0, datas.data.goods_image.indexOf("\_")) + "/" + datas.data.goods_image;

                 $("#regoods_price").html(datas.data.goods_price);

                 $("#regoods_price").html(datas.data.goods_price);

                 $(".line-through").html(datas.data.goods_marketprice);

                 $(".line-through").html(datas.data.goods_marketprice);

-                $("#goods-content").html('<p></p>'+datas.data.goods_body);

+                $("#goods-content").html(datas.data.goods_body);

                 $("#goods-issue").html(datas.data.issue);

                 $("#goods-issue").html(datas.data.issue);

                 if ( datas.data.cart > 0 ) {//调用赋值给购物车数量方法

                 if ( datas.data.cart > 0 ) {//调用赋值给购物车数量方法

 					$(".msg-total").html(datas.data.cart);

 					$(".msg-total").html(datas.data.cart);

@@ -1301,7 +1308,9 @@ function activeTab(_this,type){
 
 			$('.tap-a').addClass("goods-tab-active");

 			$('.tap-a').addClass("goods-tab-active");

 			$(".goods-tab").removeClass("mask-hidden");

 			$(".goods-tab").removeClass("mask-hidden");

 			$(".goods-tab-b-line").removeClass("mask-hidden");

 			$(".goods-tab-b-line").removeClass("mask-hidden");

+			$("#goods-content").css("margin-top","0px")

 		}else{

 		}else{

+			$("#goods-content").css("margin-top","20px")

 			$(".goods-tab-d").addClass("mask-hidden");

 			$(".goods-tab-d").addClass("mask-hidden");

 			$(".goods-tab-b-line").addClass("mask-hidden");

 			$(".goods-tab-b-line").addClass("mask-hidden");

 			$(".goods-tab-a").addClass("mask-hidden");

 			$(".goods-tab-a").addClass("mask-hidden");

+ 1 - 2
html/my/orderlist.html
View File 

@@ -155,7 +155,6 @@ function getRouteData() {
 
         dataType: 'json',

         dataType: 'json',

         type: 'post',

         type: 'post',

         success: function(datas) {

         success: function(datas) {

-			console.log(JSON.stringify(datas))

             if (datas.result) {

             if (datas.result) {

                 var _html = '';

                 var _html = '';

                 if (datas.data.order_list.length > 0) {

                 if (datas.data.order_list.length > 0) {

@@ -354,4 +353,4 @@ function refreshData() {
 
 }

 }

 </script>

 </script>

 

 

-</html>
 
+</html>