Sfoglia il codice sorgente

搜索功能改版,查看图片功能改版

git-svn-id: svn://svn7.apicloud.com/A6007457911931/%E5%9C%88%E5%A4%9A%E5%A4%9A@652 0e1a2743-8d03-4e5a-a60c-7e26af42b145
1149931599@qq.com 4 anni fa
parent
commit
cd8a4b8e2e

+ 22 - 10
html/find/findsearch.html

@@ -57,21 +57,24 @@
 <body>
     <div class="topbar"></div>
     <section>
-        <header class="back-header  back-header-bottom" style="height: 0.85rem;line-height: 0.85rem;">
-            <ul>
-                <li class="padding-20 back-btn" style="width: 0.42rem;"><img class="back-header-ico" src="../../image/nav_button_back_default.png" /></li>
-                <li class="back-header-title">
+        <header class="back-header  back-header-bottom">
+            <ul class="flex-box flex-v-ce">
+                <!-- <li class="padding-20 back-btn" style="width: 0.42rem;"><img class="back-header-ico" src="../../image/nav_button_back_default.png" /></li> -->
+                <li class="back-header-title flex-1">
                     <div class="search-item">
-                        <input id="keyword" type="text" placeholder="关键词搜索" />
+                        <input id="keyword" type="text" oninput="getData()" placeholder="关键词搜索" />
                         <img src="../../image/search.png" /> 
                     </div>
                 </li>
-                <li class="more-btn" style="width: 0.6rem;float: right;">搜索</li>
+                <li class="back-btn" style="width:1rem;white-space: nowrap;margin-left: 0.32rem;">取消</li>
             </ul>
         </header>
         <section class="new-list">
         </section>
-        <section class="border-none"></section>
+        <section class="border-none">
+			<img src="../../image/notfound.png" class="border-none-img" />
+			<p>抱歉,没有搜到相关内容</p>
+		</section>
     </section>
 </body>
 <script type="text/javascript" src="../../script/api.js"></script>
@@ -85,6 +88,16 @@ apiready = function() {
     _type = api.pageParam.keyid;
     setFixStatusBar();
 };
+function getData(){
+	 $(".new-list").empty();
+	 _page = 1;
+	 _keyword = $("#keyword").val();
+	 if(_keyword){
+		 getRouteData();
+	 }else{
+		 $(".border-none").show();
+	 }
+}
 
 function getRouteData() {
     if (_page) {
@@ -109,8 +122,7 @@ function getRouteData() {
             if (datas.result) {
                 if ( datas.data.new_list.length <= 0) {
                     if (_page == 1) {
-                        $(".border-none").html('<img src="../../image/notfound.png" class="border-none-img" /><p>抱歉,没有搜到相关内容</p>');
-                        $(".border-none").removeClass("mask-hidden");
+                        $(".border-none").show();
                     }
                     _page = false;
                     return false;
@@ -130,7 +142,7 @@ function getRouteData() {
                 } else {
                     $(".new-list").append(_html);
                 }
-                $(".border-none").addClass("mask-hidden");
+                $(".border-none").hide();
             }else{
                 errcode(datas, datas.code)
             }

+ 0 - 2
html/frame0.html

@@ -297,7 +297,6 @@
 		})
 
 		$("#hotel-list").on("tap", ".home-hotel-list", function() {
-			console.log("2")
 			var _keyid = $(this).attr("keyid");
 			api.openWin({
 				name: 'hoteldtl',
@@ -335,7 +334,6 @@
 			}, function(ret, err) {
 				toast_loding_show();
 				if (ret) {
-					// alert(JSON.stringify(ret));
 					if (ret.eventType == "success") {
 						if (ret.content.indexOf("?store_id=") > -1) {
 							var _store_id = ret.content.split("?")[1];

+ 123 - 112
html/home/feedgoods.html

@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
-    <meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
-    <title></title>
-    <link rel="stylesheet" type="text/css" href="../../css/api.css" />
-    <link rel="stylesheet" type="text/css" href="../../css/weui.min.css" />
-    <link rel="stylesheet" type="text/css" href="../../css/star-rating-svg.css?v=1.2" />
-    <link rel="stylesheet" type="text/css" href="../../css/style.css?v=1.2" />
-    <style>
-        body{}
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
+		<meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
+		<title></title>
+		<link rel="stylesheet" type="text/css" href="../../css/api.css" />
+		<link rel="stylesheet" type="text/css" href="../../css/weui.min.css" />
+		<link rel="stylesheet" type="text/css" href="../../css/star-rating-svg.css?v=1.2" />
+		<link rel="stylesheet" type="text/css" href="../../css/style.css?v=1.2" />
+		<style>
+			body{}
       .feed-item{
         width:100%;
         border-bottom:1px solid #e8e8e8;
@@ -57,108 +57,119 @@
           z-index: 10000;
         }
     </style>
-    <script>
-    (function(w, d, m) {
-        function r() {
-            var t = 100,
-                o = 750,
-                e = d.documentElement.clientWidth || w.innerWidth,
-                n = m.max(m.min(e, 480), 320),
-                h = 50;
-            320 >= n && (h = m.floor(n / o * t * .99)),
-                n > 320 && 362 >= n && (h = m.floor(n / o * t * 1)),
-                n > 362 && 375 >= n && (h = m.floor(n / o * t * 1)),
-                n > 375 && (h = m.floor(n / o * t * .97)),
-                d.querySelector("html").style.fontSize = h + "px"
-        };
-        r();
-        w.onresize = function() {
-            r()
-        }
-    })(window, document, Math);
-    </script>
-</head>
+		<script>
+			(function(w, d, m) {
+				function r() {
+					var t = 100,
+						o = 750,
+						e = d.documentElement.clientWidth || w.innerWidth,
+						n = m.max(m.min(e, 480), 320),
+						h = 50;
+					320 >= n && (h = m.floor(n / o * t * .99)),
+						n > 320 && 362 >= n && (h = m.floor(n / o * t * 1)),
+						n > 362 && 375 >= n && (h = m.floor(n / o * t * 1)),
+						n > 375 && (h = m.floor(n / o * t * .97)),
+						d.querySelector("html").style.fontSize = h + "px"
+				};
+				r();
+				w.onresize = function() {
+					r()
+				}
+			})(window, document, Math);
+		</script>
+	</head>
 
-<body>
-    <div class="topbar"></div>
-    <header class="back-header back-header-bottom">
-        <ul>
-            <li class="padding-20 back-btn"><img class="back-header-ico" src="../../image/nav_button_back_default.png" /></li>
-            <li class="back-header-title">评价</li>
-            <li class="more-btn"></li>
-        </ul>
-    </header>
-    <section class="feed-list padding-top">
-        
-    </section>
-</body>
-<script type="text/javascript" src="../../script/api.js"></script>
-<script type="text/javascript" src="../../script/jquery.min.js"></script>
-<script type="text/javascript" src="../../script/jquery.tap.js"></script>
-<script type="text/javascript" src="../../script/jquery.star-rating-svg.js"></script>
-<script type="text/javascript">
-var _keyid = '';
-apiready = function() {
-    _keyid = api.pageParam.keyid;
-    setFixStatusBar();
-    getRouteData();
-};
-///////////
-function getRouteData() {
-    $.ajax({
-        url: rooturl + '?do=getevaluategoods',
-        data: {
-            goodsid: _keyid
-        },
-        dataType: 'json',
-        type: 'post',
-        success: function(datas) {
-            if (datas.length > 0) {
-                $.each(datas, function(index, item) {
-                    var _html = '';
-                    if (item.geval_image) {
-                        var _imglist = item.geval_image.split(",");
-                    } else {
-                        var _imglist = '';
-                    }
-                    _html += '<div class="feed-item"><ul>';
-                    _html += '<li class="fl" style="width: 0.7rem;"><img src="' + item.member_avatar + '" class="user-head"/></li>';
-                    _html += '<li class="feed-item-right fl">' + item.member_truename + '<p class="feed-item-titel">' + item.geval_addtime +  '</p></li>';
-                    _html += '<li><div class="my-rating my-rating' + index + '"></div></li></ul>';
-                    _html += '<ul><li>' + item.geval_content + '</li></ul><ul style="margin-top: 0.25rem;"><li>';
-                    if (_imglist.length > 0) {
-                        for (var i = 0; i < _imglist.length; i++) {
-                            _html += '<img src="' + _imglist[i] + '" style="width: 1.2rem;height: 1.2rem;margin-right: 0.3rem;"/>';
-                        }
-                    }
-                    _html += '</li></ul><div class="h50"></div></div>';
-                    $(".feed-list").append(_html);
-                    $(".my-rating" + index).starRating({
-                        starSize: 24,
-                        activeColor: '#d9251c',
-                        starShape: 'rounded',
-                        hoverColor: '#d9251c',
-                        useGradient: false,
-                        initialRating: item.geval_scores,
-                        readOnly: true, 
-                        callback: function(currentRating, $el) {
-                            // make a server call here
-                        }
-                    });
-                })
-            } else {
-                _html = '<div class="data-null">暂时没有评价</div>';
-                $(".feed-list").append(_html);
-            }
-        }
-    });
-}
+	<body>
+		<div class="topbar"></div>
+		<header class="back-header back-header-bottom">
+			<ul>
+				<li class="padding-20 back-btn"><img class="back-header-ico" src="../../image/nav_button_back_default.png" /></li>
+				<li class="back-header-title">评价2</li>
+				<li class="more-btn"></li>
+			</ul>
+		</header>
+		<section class="feed-list padding-top">
+
+		</section>
+	</body>
+	<script type="text/javascript" src="../../script/api.js"></script>
+	<script type="text/javascript" src="../../script/jquery.min.js"></script>
+	<script type="text/javascript" src="../../script/jquery.tap.js"></script>
+	<script type="text/javascript" src="../../script/jquery.star-rating-svg.js"></script>
+	<script type="text/javascript">
+		var _keyid = '';
+		apiready = function() {
+			_keyid = api.pageParam.keyid;
+			setFixStatusBar();
+			getRouteData();
+		};
+		///////////
+		function getRouteData() {
+			$.ajax({
+				url: rooturl + '?do=getevaluategoods',
+				data: {
+					goodsid: _keyid
+				},
+				dataType: 'json',
+				type: 'post',
+				success: function(datas) {
+					if (datas.length > 0) {
+						$.each(datas, function(index, item) {
+							var _html = '';
+							if (item.geval_image) {
+								var _imglist = item.geval_image.split(",");
+							} else {
+								var _imglist = '';
+							}
+							_html += '<div class="feed-item"><ul>';
+							_html += '<li class="fl" style="width: 0.7rem;"><img src="' + item.member_avatar +
+								'" class="user-head"/></li>';
+							_html += '<li class="feed-item-right fl">' + item.member_truename + '<p class="feed-item-titel">' + item.geval_addtime +
+								'</p></li>';
+							_html += '<li><div class="my-rating my-rating' + index + '"></div></li></ul>';
+							_html += '<ul><li>' + item.geval_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 += '</li></ul><div class="h50"></div></div>';
+							$(".feed-list").append(_html);
+							$(".my-rating" + index).starRating({
+								starSize: 24,
+								activeColor: '#d9251c',
+								starShape: 'rounded',
+								hoverColor: '#d9251c',
+								useGradient: false,
+								initialRating: item.geval_scores,
+								readOnly: true,
+								callback: function(currentRating, $el) {
+									// make a server call here
+								}
+							});
+						})
+					} else {
+						_html = '<div class="data-null">暂时没有评价</div>';
+						$(".feed-list").append(_html);
+					}
+				}
+			});
+		}
 
-$(".feed-list").on("tap", "img", function() {
-    // console.log($(this).attr("src"));
-    gallery_qz($(this).attr("src"));
-});
+		// $(".feed-list").on("tap", "img", function() {
+		// 	// console.log($(this).attr("src"));
+		// 	gallery_qz($(this).attr("src"));
+		// });
 
-</script>
+		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
+			});
+		}
+	</script>
 
-</html>
+</html>

+ 482 - 424
html/home/goodssearch.html

@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
-    <meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
-    <title></title>
-    <link rel="stylesheet" type="text/css" href="../../css/api.css" />
-    <link rel="stylesheet" type="text/css" href="../../css/style.css?v=1.2" />
-    <style>
-        .hotel-top{
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
+		<meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
+		<title></title>
+		<link rel="stylesheet" type="text/css" href="../../css/api.css" />
+		<link rel="stylesheet" type="text/css" href="../../css/style.css?v=1.2" />
+		<style>
+			.hotel-top{
        width:100%;
        height: 4.03rem;
        background: url('https://qdd.h.c638m.cn/uploads/home/store/goods/1/1_2019012314140410834_1280.jpg') ;
@@ -37,6 +37,7 @@
         height: 1rem;
         border-bottom:1px solid #e8e8e8;
         position:relative;
+		padding-top: 0.85rem;;
       }
       .hotel-goods li{
         width: 33.33%;
@@ -172,9 +173,20 @@
             padding-left: 0.2rem;
             width: 100%;
         }
+		.border-none{
+		  text-align:center;font-size: 0.28rem;
+		}
+		.border-none p{
+		  color:#999999;
+		}
+		.border-none-img {
+		    margin-top: 2.5rem;
+		    width: 1.73rem;
+		    height: auto;
+		}
     </style>
-    <script>
-    (function(w, d, m) {
+		<script>
+			(function(w, d, m) {
         function r() {
             var t = 100,
                 o = 750,
@@ -193,428 +205,474 @@
         }
     })(window, document, Math);
     </script>
-</head>
+	</head>
 
-<body>
-    <div class="topbar"></div>
-    <header class="back-header  back-header-bottom">
-        <ul>
-            <li class="padding-20 back-btn"><img class="back-header-ico" src="../../image/nav_button_back_default.png" /></li>
-            <li class="back-header-title">
-                <div class="search-item">
-                  <input id="keyword" type="text" placeholder="关键词搜索" />
-                  <img src="../../image/search.png" /> 
-                </div>
-            </li>
-            <li class="more-btn">搜索</li>
-        </ul>
-    </header>
-    <div class="hotel-goods padding-top">
-        <ul>
-            <li class="gsort hotel-goods-active goods-all" tag="praise">综合</li>
-            <li class="gsort goods-new" tag="goods_commonid">上新<img class="sort-img" src="../../image/sort.png" /></li>
-            <li class="gsort goods-sprice" tag="goods_price">价格<img class="sort-img" src="../../image/sort.png" /></li>
-            <li id="category-btn" class="mask-hidden">分类<img class="sort-img2" src="../../image/sort_down2.png" /></li>
-        </ul>
-        <div id="category-item" class="category-item mask-hidden">
-        </div>
-    </div>
-    <section>
-        <div class="h10"></div>
-        <div class="goods-list" page="1">
-        </div>
-    </section>
-</body>
-<div class="h50"></div>
-<div class="share-item mask-hidden">
-    <div class="share-item-tips">分享至</div>
-    <div class="h10"></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>
-</body>
-<script type="text/javascript" src="../../script/api.js"></script>
-<script type="text/javascript" src="../../script/jquery.min.js"></script>
-<script type="text/javascript" src="../../script/jquery.tap.js"></script>
-<script type="text/javascript" src="../../script/imagesloaded.pkgd.min.js"></script>
-<script type="text/javascript">
-var _storeid = '';
-var _cateid = '';
-var _sort = "id";
-var _minsort = '';
-var _desc = "desc";
-var _shareimg = '';
-var _description = '';
-var _title = '';
-var _page = '1';
-var _shareurl = '';
-var _keyword = 'NULL';
-apiready = function() {
-    _storeid = api.pageParam.storeid;
-    setFixStatusBar();
-    api.addEventListener({
-        name: 'swipeup'
-    }, function(ret, err) {
-        getRouteGoodsData()
-    });
-};
+	<body>
+		<div class="topbar"></div>
+		<header class="back-header  back-header-bottom">
+			<ul class="flex-box flex-v-ce">
+				<li class="back-header-title flex-1">
+					<div class="search-item">
+						<input id="keyword" type="text" oninput="getData()" placeholder="关键词搜索" />
+						<img src="../../image/search.png" />
+					</div>
+				</li>
+				<li class="back-btn" style="width:1rem;white-space: nowrap;margin-left: 0.32rem;">取消</li>
+			</ul>
+		</header>
+		<div class="hotel-goods">
+			<ul>
+				<li class="gsort hotel-goods-active goods-all" tag="praise">综合</li>
+				<li class="gsort goods-new" tag="goods_commonid">上新<img class="sort-img" src="../../image/sort.png" /></li>
+				<li class="gsort goods-sprice" tag="goods_price">价格<img class="sort-img" src="../../image/sort.png" /></li>
+				<li id="category-btn" class="mask-hidden">分类<img class="sort-img2" src="../../image/sort_down2.png" /></li>
+			</ul>
+			<div id="category-item" class="category-item mask-hidden">
+			</div>
+		</div>
+		<section>
+			<div class="h10"></div>
+			<div class="goods-list" page="1">
+			
+			</div>
+			<section class="border-none">
+				<img src="../../image/notfound.png" class="border-none-img" />
+				<p>抱歉,没有搜到相关内容</p>
+			</section>
+		</section>
+	</body>
+	<div class="h50"></div>
+	<div class="share-item mask-hidden">
+		<div class="share-item-tips">分享至</div>
+		<div class="h10"></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>
+	</body>
+	<script type="text/javascript" src="../../script/api.js"></script>
+	<script type="text/javascript" src="../../script/jquery.min.js"></script>
+	<script type="text/javascript" src="../../script/jquery.tap.js"></script>
+	<script type="text/javascript" src="../../script/imagesloaded.pkgd.min.js"></script>
+	<script type="text/javascript">
+		var _storeid = '';
+		var _cateid = '';
+		var _sort = "id";
+		var _minsort = '';
+		var _desc = "desc";
+		var _shareimg = '';
+		var _description = '';
+		var _title = '';
+		var _page = '1';
+		var _shareurl = '';
+		var _keyword = 'NULL';
+		apiready = function() {
+			_storeid = api.pageParam.storeid;
+			setFixStatusBar();
+			api.addEventListener({
+				name: 'swipeup'
+			}, function(ret, err) {
+				getRouteGoodsData()
+			});
+		};
 
-$(".hotel-top-search").on("tap", function() {
-    api.openWin({
-        name: 'goodssearch',
-        url: './goodssearch.html',
-        bounces: false,
-        pageParam: {
-            storeid: _storeid
-        }
-    });
-    return false;
-})
-$(".hotel-item").on("tap", function() {
-    //var _storeid=$(this).attr("keyid");
-    api.openWin({
-        name: 'showhotel',
-        url: './showhotel.html',
-        bounces: false,
-        pageParam: {
-            keyid: _storeid
-        }
-    });
-    return false;
-})
-$(".goods-list").on("tap", ".goods-list-item", function() {
-    var _goodsid = $(this).attr("keyid");
-    api.openWin({
-        name: 'showgoods',
-        url: './showgoods.html',
-        bounces: false,
-        pageParam: {
-            keyid: _goodsid,
-            storeid: _storeid
-        }
-    });
-    return false;
-})
-//////////
+		function getData() {
+			$(".goods-list").empty();
+			_keyword = $("#keyword").val();
+			_cateid = '';
+			_sort = "id";
+			_minsort = '';
+			_desc = "desc";
+			$(".goods-list").attr("page", '1');
+			if (_keyword) {
+				getRouteGoodsData();
+			} else {
+			   $(".border-none").show();
+			}
+		}
+		$(".more-btn").on("tap", function() {
+			$(".goods-list").empty();
+			if ($("#keyword").val() == '') {
+				api.toast({
+					msg: '关键词不能为空!'
+				});
+				return false;
+			}
+			_keyword = $("#keyword").val();
+			_cateid = '';
+			_sort = "id";
+			_minsort = '';
+			_desc = "desc";
+			$(".goods-list").attr("page", '1');
+			getRouteGoodsData();
+			return false;
+		})
 
-function getRouteGoodsData() {
-  // body...
-    _page = $(".goods-list").attr("page");
-    if (_page == 0) {
-        return false;
-    }
-    var _xdata = { store_id: _storeid, page: _page, praise: _desc, keyword: _keyword };
-    var _data_type = $(".hotel-goods-active").attr("tag");
-    if (_data_type == 'praise') {
-        _xdata = { store_id: _storeid, page: _page, praise: _desc, keyword: _keyword };
-    } else if (_data_type == 'goods_commonid') {
-        _xdata = { store_id: _storeid, page: _page, goods_commonid: _desc, keyword: _keyword };
-    } else if (_data_type == 'goods_price') {
-        _xdata = { store_id: _storeid, page: _page, goods_price: _desc, keyword: _keyword };
-    } else {
-        var catid = $("#category-item .cate-active").parent(".category-list").attr("catid");
-        console.log(catid)
-    }
-    $.ajax({
-        url: siteurl + 'v2/entry/storeGoods',
-        data: _xdata,
-        headers: { "X-TOKEN": $api.getStorage("accesstoken") },
-        dataType: 'json',
-        type: 'post',
-        success: function(datas) {
-            if (datas.result) {
-                var html = '';
-                if (datas.data.goods_list.length > 0) {
-                    var j = 0;
-                    $.each(datas.data.goods_list, function(index, item) {
-                        var _advarr = item.goods_advword.split("\n");
-                        var _taghtml = '';
-                        var _tagcolor = ['#006699', '#d9251c', '#e8e8e8'];
-                        if (_advarr.length > 0) {
-                            for (var i = 0; i < _advarr.length; i++) {
-                                if (_advarr[i]) {
-                                    _taghtml += '<span class="tag-item" style="">' + _advarr[i] + '</span>';
-                                }
-                            }
-                        }
-                        j++;
-                        html = '';
-                        if (j % 2 == 0) {
-                            html += '<div class="goods-list-item padl" ';
-                        } else {
-                            html += '<div class="goods-list-item" ';
-                        }
-                        html += 'keyid="' + item.goods_commonid + '" goods_li="' + j + '"><ul>';
-                        html += '<li><img src="' + siteurl + "uploads/home/store/goods/" + item.goods_image.substr(0, item.goods_image.indexOf("\_")) + "/" + item.goods_image + '" class="goods-image"/></li>';
-                        html += '<li class="goods-title font-rem11">' + item.goods_name + '</li>';
-                        html += '<li class="goods-price">¥' + item.goods_price + ' <span class="line-through">' + item.goods_marketprice + '</span></li>';
-                        html += '<li class="goods-tag">' + _taghtml + '</li>';
-                        html += '</ul></div>';
-                        if (j % 2 == 0) {
-                            html += '<div class="h10"></div>';
-                        }
-                        if (_page == 1 && index == 0) {
-                            $(".goods-list").html(html);
-                        } else {
-                            $(".goods-list").append(html);
-                        }
-                        function_name();
-                    });
-                    _page++;
-                    $(".goods-list").attr("page", _page);
-                } else {
-                    html = '<div class="data-null">暂时没有更多商品</div>';
-                    $(".goods-list").attr("page", '0');
-                    if (_page == 1) {
-                        $(".goods-list").html(html);
-                    } else {
-                        $(".goods-list").append(html);
-                    }
-                }
-            } else {
-                errcode(datas, datas.code)
-            }
-        }
-    })
-}
+		$(".hotel-top-search").on("tap", function() {
+			api.openWin({
+				name: 'goodssearch',
+				url: './goodssearch.html',
+				bounces: false,
+				pageParam: {
+					storeid: _storeid
+				}
+			});
+			return false;
+		})
 
+		$(".hotel-item").on("tap", function() {
+			api.openWin({
+				name: 'showhotel',
+				url: './showhotel.html',
+				bounces: false,
+				pageParam: {
+					keyid: _storeid
+				}
+			});
+			return false;
+		})
 
-/////
-function getCategoryData() {
-    $.ajax({
-        url: siteurl + 'v1/entry/storeCategory',
-        data: {
-            store_id: _storeid
-        },
-        headers: { "X-TOKEN": $api.getStorage("accesstoken") },
-        dataType: 'json',
-        type: 'post',
-        success: function(datas) {
-            if (datas.result) {
-                var html = '';
-                $("#category-item").empty();
-                $("#category-item").append('<div class="category-list" catid="all"><span class="category-list-span">全部</span></div>');
-                $.each(datas.data.category_list, function(index, item) {
-                    html = '<div class="category-list" catid="' + item.gc_id + '"><span class="category-list-span">' + item.gc_name + '</span></div>';
-                    $("#category-item").append(html);
-                });
-            } else {
-                errcode(datas, datas.code);
-            }
-        }
-    });
-}
+		$(".goods-list").on("tap", ".goods-list-item", function() {
+			var _goodsid = $(this).attr("keyid");
+			api.openWin({
+				name: 'showgoods',
+				url: './showgoods.html',
+				bounces: false,
+				pageParam: {
+					keyid: _goodsid,
+					storeid: _storeid
+				}
+			});
+			return false;
+		})
 
-$("#category-btn").on("tap", function() {
-    $(".gsort").removeClass("hotel-goods-active");
-    $(".gsort").find("img").attr("src", "../../image/sort.png");
-    getCategoryData();
-    if (!$(".category-item").hasclass("mask-hidden")) {
-        $(".category-item").addClass("mask-hidden");
-        $("#category-btn").removeClass("hotel-goods-active");
-        $(this).find("img").attr("src", "../../image/sort.png");
-        $("#category-btn img").attr("src", "../../image/sort_down2.png");
-    } else {
-        $(".category-item").removeClass("mask-hidden");
-        $("#category-btn").addClass("hotel-goods-active");
-        $(this).find("img").attr("src", "../../image/sort_up.png");
-        $("#category-btn img").attr("src", "../../image/sort_down2_up.png");
-    }
-    return false;
-})
+		function getRouteGoodsData() {
+			$(".border-none").hide();
+			_page = $(".goods-list").attr("page");
+			if (_page == 0) {
+				return false;
+			}
+			var _xdata = {
+				store_id: _storeid,
+				page: _page,
+				praise: _desc,
+				keyword: _keyword
+			};
+			var _data_type = $(".hotel-goods-active").attr("tag");
+			if (_data_type == 'praise') {
+				_xdata = {
+					store_id: _storeid,
+					page: _page,
+					praise: _desc,
+					keyword: _keyword
+				};
+			} else if (_data_type == 'goods_commonid') {
+				_xdata = {
+					store_id: _storeid,
+					page: _page,
+					goods_commonid: _desc,
+					keyword: _keyword
+				};
+			} else if (_data_type == 'goods_price') {
+				_xdata = {
+					store_id: _storeid,
+					page: _page,
+					goods_price: _desc,
+					keyword: _keyword
+				};
+			} else {
+				var catid = $("#category-item .cate-active").parent(".category-list").attr("catid");
+			}
+			$.ajax({
+				url: siteurl + 'v2/entry/storeGoods',
+				data: _xdata,
+				headers: {
+					"X-TOKEN": $api.getStorage("accesstoken")
+				},
+				dataType: 'json',
+				type: 'post',
+				success: function(datas) {
+					if (datas.result) {
+						var html = '';
+						if (datas.data.goods_list.length > 0) {
+							var j = 0;
+							$.each(datas.data.goods_list, function(index, item) {
+								var _advarr = item.goods_advword.split("\n");
+								var _taghtml = '';
+								var _tagcolor = ['#006699', '#d9251c', '#e8e8e8'];
+								if (_advarr.length > 0) {
+									for (var i = 0; i < _advarr.length; i++) {
+										if (_advarr[i]) {
+											_taghtml += '<span class="tag-item" style="">' + _advarr[i] + '</span>';
+										}
+									}
+								}
+								j++;
+								html = '';
+								if (j % 2 == 0) {
+									html += '<div class="goods-list-item padl" ';
+								} else {
+									html += '<div class="goods-list-item" ';
+								}
+								html += 'keyid="' + item.goods_commonid + '" goods_li="' + j + '"><ul>';
+								html += '<li><img src="' + siteurl + "uploads/home/store/goods/" + item.goods_image.substr(0, item.goods_image.indexOf("\_")) + "/" + item.goods_image + '" class="goods-image"/></li>';
+								html += '<li class="goods-title font-rem11">' + item.goods_name + '</li>';
+								html += '<li class="goods-price">¥' + item.goods_price + ' <span class="line-through">' + item.goods_marketprice +'</span></li>';
+								html += '<li class="goods-tag">' + _taghtml + '</li>';
+								html += '</ul></div>';
+								if (j % 2 == 0) {
+									html += '<div class="h10"></div>';
+								}
+								if (_page == 1 && index == 0) {
+									$(".goods-list").html(html);
+								} else {
+									$(".goods-list").append(html);
+								}
+								function_name();
+							});
+							_page++;
+							$(".goods-list").attr("page", _page);
+						} else {
+							html = '<div class="data-null">暂时没有更多商品</div>';
+							$(".goods-list").attr("page", '0');
+							if (_page == 1) {
+								$(".border-none").show();
+							} else {
+								$(".goods-list").append(html);
+							}
+						}
+					} else {
+						errcode(datas, datas.code)
+					}
+				}
+			})
+		}
 
-function hiddenCate() {
-    $(".category-item").addClass("mask-hidden");
-    $("#category-btn").removeClass("hotel-goods-active");
-    $("#category-btn").find("img").attr("src", "../../image/sort.png");
-}
+		function getCategoryData() {
+			$.ajax({
+				url: siteurl + 'v1/entry/storeCategory',
+				data: {
+					store_id: _storeid
+				},
+				headers: {
+					"X-TOKEN": $api.getStorage("accesstoken")
+				},
+				dataType: 'json',
+				type: 'post',
+				success: function(datas) {
+					if (datas.result) {
+						var html = '';
+						$("#category-item").empty();
+						$("#category-item").append(
+							'<div class="category-list" catid="all"><span class="category-list-span">全部</span></div>');
+						$.each(datas.data.category_list, function(index, item) {
+							html = '<div class="category-list" catid="' + item.gc_id + '"><span class="category-list-span">' + item.gc_name +
+								'</span></div>';
+							$("#category-item").append(html);
+						});
+					} else {
+						errcode(datas, datas.code);
+					}
+				}
+			});
+		}
 
-function shorNewGoods() {
-    _minsort = '';
-    $(".goods-list").empty();
-    $(".goods-list").attr("page", '1');
-    getRouteGoodsData();
-}
-///
-$(".category-item").on("tap", ".category-list", function() {
-    $(this).find("span").addClass("cate-active");
-    hiddenCate();
-    _cateid = $(this).attr("catid");
-    _minsort = '';
-    shorNewGoods();
-    setTimeout(function() { $(".category-item").addClass("mask-hidden"); }, 300);
-    return false;
-})
-///
-$(".goods-all").on("tap", function() {
-    hiddenCate();
-    _sort = $(this).attr("tag");
-    $(".gsort").removeClass("hotel-goods-active");
-    $(this).addClass("hotel-goods-active");
-    $(".gsort").find("img").attr("src", "../../image/sort.png");
-    $("#category-btn img").attr("src", "../../image/sort_down2.png");
-    _desc = "desc";
-    shorNewGoods();
-    return false;
-})
-////
-$(".goods-new").on("tap", function() {
-    hiddenCate();
-    _sort = $(this).attr("tag");
-    $(".gsort").removeClass("hotel-goods-active");
-    $(this).addClass("hotel-goods-active");
-    $(".goods-sprice").find("img").attr("src", "../../image/sort.png");
-    $(this).find("img").attr("src", $(this).find("img").attr("src") == "../../image/sort_up.png" ? "../../image/sort_down.png" : "../../image/sort_up.png");
-    if ($(this).find("img").attr("src") == "../../image/sort_up.png") {
-        _desc = "asc";
-    } else {
-        _desc = "desc";
-    }
-    $("#category-btn img").attr("src", "../../image/sort_down2.png");
-    shorNewGoods();
-    return false;
-})
-////
-$(".goods-sprice").on("tap", function() {
-    hiddenCate();
-    _sort = $(this).attr("tag");
-    $(".gsort").removeClass("hotel-goods-active");
-    $(this).addClass("hotel-goods-active");
-    $(".goods-new").find("img").attr("src", "../../image/sort.png");
-    $(this).find("img").attr("src", $(this).find("img").attr("src") == "../../image/sort_up.png" ? "../../image/sort_down.png" : "../../image/sort_up.png");
-    if ($(this).find("img").attr("src") == "../../image/sort_up.png") {
-        _desc = "asc";
-    } else {
-        _desc = "desc";
-    }
-    $("#category-btn img").attr("src", "../../image/sort_down2.png");
-    shorNewGoods();
-    return false;
-})
-$(".share-item-cancel").on("tap", function() {
-    $(".share-item").slideUp(500, function() {});
-    _show = false;
-    return false;
-})
-///
-$(".share-item-friend").on("tap", function() {
-    api.download({
-        url: _shareimg,
-        report: false,
-        savePath: 'widget://share' + _storeid + '.png',
-        cache: true,
-        allowResume: true
-    }, function(ret, err) {
-        var wx = api.require('wx');
-        wx.shareWebpage({
-            scene: 'session',
-            title: _title,
-            description: _description,
-            thumb: 'widget://share' + _storeid + '.png',
-            contentUrl: _shareurl
-        }, function(ret, err) {
-            if (ret.status) {
-                //alert("分享成功!");
-                setPoint();
-            } else {
-                alert(err.code);
-            }
-        });
-    });
-    $(".share-item").slideUp(500, function() {});
-    _show = false;
-    return false;
-})
-$(".share-item-cale").on("tap", function() {
-    api.download({
-        url: _shareimg,
-        report: false,
-        savePath: 'widget://share' + _storeid + '.png',
-        cache: true,
-        allowResume: true
-    }, function(ret, err) {
-        var wx = api.require('wx');
-        wx.shareWebpage({
-            scene: 'timeline',
-            title: _title,
-            description: _description,
-            thumb: 'widget://share' + _storeid + '.png',
-            contentUrl: _shareurl
-        }, function(ret, err) {
-            if (ret.status) {
-                //alert("分享成功!");
-                setPoint();
-            } else {
-                alert(err.code);
-            }
-        });
-    });
-    $(".share-item").slideUp(500, function() {});
-    _show = false;
-    return false;
-})
-$(".share-item-qq").on("tap", function() {
-    var qq = api.require('QQPlus');
-    qq.shareNews({
-        url: _shareurl,
-        title: _title,
-        description: _description,
-        imgUrl: _shareimg
-    }, function(ret, err) {
-        if (ret.status) {
-            //alert("分享成功!");
-            setPoint();
-        } else {
-            api.alert({ msg: JSON.stringify(err) });
-        }
-    });
-    $(".share-item").slideUp(500, function() {});
-    _show = false;
-    return false;
-})
-var _show = false;
-$("#share-btn").on("tap", function() {
-    if (_show == false) {
-        $(".share-item").slideDown(500, function() {});
-        _show = true;
-    } else {
-        $(".share-item").slideUp(500, function() {});
-        _show = false;
-    }
-    return false;
-})
+		$("#category-btn").on("tap", function() {
+			$(".gsort").removeClass("hotel-goods-active");
+			$(".gsort").find("img").attr("src", "../../image/sort.png");
+			getCategoryData();
+			if (!$(".category-item").hasclass("mask-hidden")) {
+				$(".category-item").addClass("mask-hidden");
+				$("#category-btn").removeClass("hotel-goods-active");
+				$(this).find("img").attr("src", "../../image/sort.png");
+				$("#category-btn img").attr("src", "../../image/sort_down2.png");
+			} else {
+				$(".category-item").removeClass("mask-hidden");
+				$("#category-btn").addClass("hotel-goods-active");
+				$(this).find("img").attr("src", "../../image/sort_up.png");
+				$("#category-btn img").attr("src", "../../image/sort_down2_up.png");
+			}
+			return false;
+		})
+
+		function hiddenCate() {
+			$(".category-item").addClass("mask-hidden");
+			$("#category-btn").removeClass("hotel-goods-active");
+			$("#category-btn").find("img").attr("src", "../../image/sort.png");
+		}
+
+		function shorNewGoods() {
+			_minsort = '';
+			$(".goods-list").empty();
+			$(".goods-list").attr("page", '1');
+			getRouteGoodsData();
+		}
 
+		$(".category-item").on("tap", ".category-list", function() {
+			$(this).find("span").addClass("cate-active");
+			hiddenCate();
+			_cateid = $(this).attr("catid");
+			_minsort = '';
+			shorNewGoods();
+			setTimeout(function() {
+				$(".category-item").addClass("mask-hidden");
+			}, 300);
+			return false;
+		})
 
 
-$(".more-btn").on("tap", function() {
-    $(".goods-list").empty();
-    if ($("#keyword").val() == '') {
-        api.toast({
-            msg: '关键词不能为空!'
-        });
-        return false;
-    }
-    _keyword = $("#keyword").val();
-    _cateid = '';
-    _sort = "id";
-    _minsort = '';
-    _desc = "desc";
-    $(".goods-list").attr("page", '1');
-    getRouteGoodsData();
-    return false;
-})
-</script>
+		$(".goods-all").on("tap", function() {
+			hiddenCate();
+			_sort = $(this).attr("tag");
+			$(".gsort").removeClass("hotel-goods-active");
+			$(this).addClass("hotel-goods-active");
+			$(".gsort").find("img").attr("src", "../../image/sort.png");
+			$("#category-btn img").attr("src", "../../image/sort_down2.png");
+			_desc = "desc";
+			shorNewGoods();
+			return false;
+		})
+		////
+		$(".goods-new").on("tap", function() {
+			hiddenCate();
+			_sort = $(this).attr("tag");
+			$(".gsort").removeClass("hotel-goods-active");
+			$(this).addClass("hotel-goods-active");
+			$(".goods-sprice").find("img").attr("src", "../../image/sort.png");
+			$(this).find("img").attr("src", $(this).find("img").attr("src") == "../../image/sort_up.png" ?
+				"../../image/sort_down.png" : "../../image/sort_up.png");
+			if ($(this).find("img").attr("src") == "../../image/sort_up.png") {
+				_desc = "asc";
+			} else {
+				_desc = "desc";
+			}
+			$("#category-btn img").attr("src", "../../image/sort_down2.png");
+			shorNewGoods();
+			return false;
+		})
+		////
+		$(".goods-sprice").on("tap", function() {
+			hiddenCate();
+			_sort = $(this).attr("tag");
+			$(".gsort").removeClass("hotel-goods-active");
+			$(this).addClass("hotel-goods-active");
+			$(".goods-new").find("img").attr("src", "../../image/sort.png");
+			$(this).find("img").attr("src", $(this).find("img").attr("src") == "../../image/sort_up.png" ?
+				"../../image/sort_down.png" : "../../image/sort_up.png");
+			if ($(this).find("img").attr("src") == "../../image/sort_up.png") {
+				_desc = "asc";
+			} else {
+				_desc = "desc";
+			}
+			$("#category-btn img").attr("src", "../../image/sort_down2.png");
+			shorNewGoods();
+			return false;
+		})
+		$(".share-item-cancel").on("tap", function() {
+			$(".share-item").slideUp(500, function() {});
+			_show = false;
+			return false;
+		})
+		///
+		$(".share-item-friend").on("tap", function() {
+			api.download({
+				url: _shareimg,
+				report: false,
+				savePath: 'widget://share' + _storeid + '.png',
+				cache: true,
+				allowResume: true
+			}, function(ret, err) {
+				var wx = api.require('wx');
+				wx.shareWebpage({
+					scene: 'session',
+					title: _title,
+					description: _description,
+					thumb: 'widget://share' + _storeid + '.png',
+					contentUrl: _shareurl
+				}, function(ret, err) {
+					if (ret.status) {
+						//alert("分享成功!");
+						setPoint();
+					} else {
+						alert(err.code);
+					}
+				});
+			});
+			$(".share-item").slideUp(500, function() {});
+			_show = false;
+			return false;
+		})
+		$(".share-item-cale").on("tap", function() {
+			api.download({
+				url: _shareimg,
+				report: false,
+				savePath: 'widget://share' + _storeid + '.png',
+				cache: true,
+				allowResume: true
+			}, function(ret, err) {
+				var wx = api.require('wx');
+				wx.shareWebpage({
+					scene: 'timeline',
+					title: _title,
+					description: _description,
+					thumb: 'widget://share' + _storeid + '.png',
+					contentUrl: _shareurl
+				}, function(ret, err) {
+					if (ret.status) {
+						//alert("分享成功!");
+						setPoint();
+					} else {
+						alert(err.code);
+					}
+				});
+			});
+			$(".share-item").slideUp(500, function() {});
+			_show = false;
+			return false;
+		})
+		$(".share-item-qq").on("tap", function() {
+			var qq = api.require('QQPlus');
+			qq.shareNews({
+				url: _shareurl,
+				title: _title,
+				description: _description,
+				imgUrl: _shareimg
+			}, function(ret, err) {
+				if (ret.status) {
+					//alert("分享成功!");
+					setPoint();
+				} else {
+					api.alert({
+						msg: JSON.stringify(err)
+					});
+				}
+			});
+			$(".share-item").slideUp(500, function() {});
+			_show = false;
+			return false;
+		})
+		var _show = false;
+		$("#share-btn").on("tap", function() {
+			if (_show == false) {
+				$(".share-item").slideDown(500, function() {});
+				_show = true;
+			} else {
+				$(".share-item").slideUp(500, function() {});
+				_show = false;
+			}
+			return false;
+		})
+	</script>
 
-</html>
+</html>

+ 26 - 15
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;
@@ -64,9 +64,6 @@
      .hotel-top-line{
        width:100%
      }
-     .hotel-top-line li{
-       float:left;
-     }
      .weui-tab.tabh {
       height: 2.7rem;
      }
@@ -304,8 +301,6 @@
           background-color: #ffffff;
         }
         .fixed_top {
-            position: fixed;
-            z-index: 501;
             background-color: #fff;
             padding-bottom: 0.2rem;
         }
@@ -344,6 +339,14 @@
           height: auto;
           width: 100% !important;
         }
+		.ft{
+			position: fixed;
+			z-index: 501;
+			left: 0;
+			right: 0;
+			top:32.5px;
+			z-index: 999;
+		}
     </style>
 		<script>
 			(function(w, d, m) {
@@ -375,14 +378,14 @@
 				</div>
 				<div class="swiper-pagination"></div>
 			</div>
-			<section style="padding: 0;padding-bottom: 0.2rem;">
+			<section class="ft" style="padding: 0;padding-bottom: 0.2rem;">
 				<div class="h20"></div>
 				<div class="hotel-top-line">
-					<ul>
+					<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 style="width: 6rem;padding: 0 0.1rem;">
+						<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;">
@@ -737,10 +740,19 @@
 			});
 			return false;
 		})
-
-		$("#tab2").on("tap", "img", function() {
-			gallery_qz($(this).attr("src"));
-		});
+		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
+			});
+		}
+		// $("#tab2").on("tap", "img", function() {
+			
+		// 	// gallery_qz($(this).attr("src"));
+		// });
 
 		$(".goods-list").on("tap", ".goods-list-item", function() {
 			var _goodsid = $(this).attr("keyid");
@@ -848,7 +860,6 @@
 								if (j % 2 == 0) {
 									html += '<div class="h10"></div>';
 								}
-								console.log(html)
 								if (_page == 1 && index == 0) {
 									$(".goods-list").html(html);
 								} else {
@@ -939,7 +950,7 @@
 								_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 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>';

+ 25 - 15
html/home/hotelsearch.html

@@ -10,7 +10,6 @@
     <link rel="stylesheet" type="text/css" href="../../css/star-rating-svg.css?v=1.2" />
     <link rel="stylesheet" type="text/css" href="../../css/style.css" />
     <style>
-        body{}
         #keyword {
             font-size: 0.3rem;
             padding-left: 0.2rem;
@@ -24,6 +23,7 @@
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
+			margin-bottom: 0.15rem;
         }
         .border-none{
           text-align:center;font-size: 0.28rem;
@@ -44,9 +44,9 @@
         .home-nearby .weui-cell {
             padding: 16px 3px;
         }
-        .home-nearby weui-cell__bd p {
+/*        .home-nearby  p {
             font-size: 0.35rem;
-        }
+        } */
         .home-top-left {
             width: 4.9rem;
         }
@@ -61,6 +61,7 @@
         }
         .home-hotel-dsc {
             -webkit-line-clamp: 1;
+			padding-top: 0.15rem;
         }
         .home-hotel-title {
             font-size: 0.27rem;
@@ -118,21 +119,24 @@
     <div class="topbar"></div>
     <!-- <section> -->
         <header class="back-header  back-header-bottom">
-            <ul>
-                <li class="padding-20 back-btn" style="width: 0.42rem;"><img class="back-header-ico" src="../../image/nav_button_back_default.png" /></li>
-                <li class="back-header-title">
+            <ul class="flex-box flex-v-ce">
+                <!-- <li class="padding-20 back-btn" style="width: 0.42rem;"><img class="back-header-ico" src="../../image/nav_button_back_default.png" /></li> -->
+                <li class="back-header-title flex-1">
                     <div class="search-item">
-                        <input id="keyword" type="text" placeholder="关键词搜索" />
+                        <input id="keyword" type="text" oninput="getData()" placeholder="关键词搜索" />
                         <img src="../../image/search.png" /> 
                     </div>
                 </li>
-                <li class="more-btn" style="width: 0.6rem;white-space: nowrap;">搜索</li>
+                <li class="back-btn" style="width:1rem;white-space: nowrap;margin-left: 0.32rem;">取消</li>
             </ul>
         </header>
         <!-- <div class="h50"></div> -->
         <section class="new-list">
         </section>
-        <section class="border-none"></section>
+        <section class="border-none">
+			<img src="../../image/notfound.png" class="border-none-img" />
+			<p>抱歉,没有搜到相关内容</p>
+		</section>
     <!-- </section> -->
 </body>
 <script type="text/javascript" src="../../script/api.js"></script>
@@ -151,6 +155,7 @@ apiready = function() {
 };
 
 function getRouteData() {
+	$(".border-none").hide();
     $.ajax({
         url: siteurl + 'v2/entry/storeList',//'?do=gethomehotel',
         data: {
@@ -178,12 +183,9 @@ function getRouteData() {
                         html += '<div class="home-hotel-dsc">' + item.store_summary + '</div></div></div>';
                         i++;
                     });
-                    $(".new-list").html(html);
-                    $(".border-none").addClass("mask-hidden");
-                    // _minid = datas[datas.length - 1].store_id;
+                    $(".new-list").html(html); 
                 } else {
-                    $(".border-none").html('<img src="../../image/notfound.png" class="border-none-img" /><p>抱歉,没有搜到相关内容</p>')
-                    $(".border-none").removeClass("mask-hidden");
+					$(".border-none").show();
                 }
                 if (datas.length < 10) {
                     _isload = true;
@@ -194,6 +196,15 @@ function getRouteData() {
         }
     });
 }
+function getData(){
+	 $(".new-list").empty();
+	 _keyword = $("#keyword").val();
+	 if(_keyword){
+		 getRouteData();
+	 }else{
+		 $(".border-none").show();
+	 }
+}
 
 $(".more-btn").on("tap", function() {
     $(".new-list").empty();
@@ -210,7 +221,6 @@ $(".more-btn").on("tap", function() {
 
 
 function intToFloat(val) {
-    // body...
     return new Number(val).toFixed(1);
 }
 

+ 15 - 5
html/home/showgoods.html

@@ -721,6 +721,16 @@ $(function() {
     });
 })
 
+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
+	});
+}
+
 function spot_msg() {
   // body...
   if ( _spot == 2 ) {
@@ -802,10 +812,10 @@ $(".home-ads").on("tap", "img", function() {
     // console.log($(this).attr("src"));
     gallery_qz($(this).attr("src"));
 });
-$(".feed-list").on("tap", "img", function() {
-    // console.log($(this).attr("src"));
-    gallery_qz($(this).attr("src"));
-});
+// $(".feed-list").on("tap", "img", function() {
+//     // console.log($(this).attr("src"));
+//     gallery_qz($(this).attr("src"));
+// });
 $(".goods-content").on("tap", "img", function() {
     // console.log($(this).attr("src"));
     gallery_qz($(this).attr("src"));
@@ -839,7 +849,7 @@ function getfeed() {
                     _html += '<ul><li>' + item.geval_content + '</li></ul><ul style="margin-top: 0.25rem;"><li>';
                     if (_imglist.length > 0) {
                         for (var i = 0; i < _imglist.length; i++) {
-                            _html += '<img 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>';