Merge branch 'master' of http://git.pro.g107.net/guojy/qzw_app

# Conflicts:
#	html/home/hoteldtl.html
#	html/home/showgoods.html

html/home/hoteldtl.html

@@ -571,7 +571,11 @@
 		apiready = function() {
 			_storeid = api.pageParam.keyid;
 			$api.fixTabBar($api.byId('footerbtn'))
+<<<<<<< HEAD
 			$api.fixIos7Bar($api.byId('ft'));
+=======
+			$(".ft").css("top", '3px');
+>>>>>>> 58e9ce3ebbd5520acfc90283bbdd86d5644a5315
 			$(".goods-list").attr("page", "1");
 			setIosTopBar();
 			getstoreCategory();
@@ -668,7 +672,13 @@
 						if (datas.data.store_slide.length > 0) {
 							$.each(datas.data.store_slide, function(index, item) {
 								if (item.indexOf('jpg') != -1) {
+<<<<<<< HEAD
 									$(".swipers").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 + ');">');
+>>>>>>> 58e9ce3ebbd5520acfc90283bbdd86d5644a5315
 								}
 							})
 						}
@@ -852,7 +862,14 @@
 				activeIndex: index
 			});
 		}
+<<<<<<< HEAD
 
+=======
+		// $("#tab2").on("tap", "img", function() {
+
+		// 	// gallery_qz($(this).attr("src"));
+		// });
+>>>>>>> 58e9ce3ebbd5520acfc90283bbdd86d5644a5315
 
 		$(".goods-list").on("tap", ".goods-list-item", function() {
 			var _goodsid = $(this).attr("keyid");
@@ -1195,6 +1212,10 @@
 			return false;
 		})
 		$(".share-item-friend").on("tap", function() {
+<<<<<<< HEAD
+=======
+
+>>>>>>> 58e9ce3ebbd5520acfc90283bbdd86d5644a5315
 			var wx = api.require('wx');
 			api.download({
 				url: imgUrl,