IOS首次进入现实酒店列表

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

html/frame0.html

@@ -12,7 +12,7 @@
 		<link rel="stylesheet" type="text/css" href="../css/style.css" />
 		<link rel="stylesheet" type="text/css" href="../css/swiper.min.css" />
 		<style>
-		.swiper-container {
+			.swiper-container {
           width: 100%;
           height: 100%;
         }
@@ -237,32 +237,30 @@
 		var _webinstoreid = '0';
 		apiready = function() {
 			var $header = $api.byId('header');
-				$api.fixIos7Bar($header);
-				$api.fixStatusBar($header);
+			$api.fixIos7Bar($header);
+			$api.fixStatusBar($header);
 			_webinkeyid = api.pageParam.keyid;
 			_webinstoreid = api.pageParam.storeid;
 			_adv_type = api.pageParam.advtype;
 			_adv_goods_id = api.pageParam.advgoodsid;
 			_adv_store_id = api.pageParam.advstoreid;
 			_adv_article_id = api.pageParam.advarticleid;
-			get_adv();
-			getRouteData();
-			webtoappinit();
 			_myalias = "member" + $api.getStorage("memberid");
-			jpushInit();
 			var storage = hasPermission('storage');
 			if (!storage || !storage[0] || !storage[0].granted) {
 				reqPermission('storage')
 			}
-			var hass = hasPermission('location');
-			if (!hass || !hass[0] || !hass[0].granted) {
-				reqPermission('location');
-			}
+			
+			
+			get_adv();//弹窗
+			getRouteData();//轮播吞
+			webtoappinit();
+			jpushInit();
 			//滑动到底部
 			api.addEventListener({
 				name: 'scrolltobottom',
 				extra: {
-				    threshold: 200
+					threshold: 200
 				}
 			}, function(ret, err) {
 				getAddress();
@@ -284,11 +282,9 @@
 				getAddress();
 				getmsgtotal();
 			});
-			setTimeout(function() {
-				goto_adv();
-			}, 800);
 		};
 		$(".msg-list").on("tap", function() {
+			console.log("1")
 			api.openWin({
 				name: 'msglist',
 				url: './home/msglist.html',
@@ -301,6 +297,7 @@
 		})
 
 		$("#hotel-list").on("tap", ".home-hotel-list", function() {
+			console.log("2")
 			var _keyid = $(this).attr("keyid");
 			api.openWin({
 				name: 'hoteldtl',
@@ -525,15 +522,12 @@
 			// body...
 			switch (_adv_type) {
 				case 'goods':
-					console.log(_adv_goods_id, _adv_store_id)
 					to_goods_id(_adv_goods_id, _adv_store_id)
 					break;
 				case 'store':
-					console.log(_adv_store_id);
 					to_store_id(_adv_store_id);
 					break;
 				case 'article':
-					console.log(_adv_article_id);
 					to_article_id(_adv_article_id);
 					break;
 			}
@@ -579,7 +573,12 @@
 				}
 			})
 		}
-
+		//关闭弹窗
+		function color(){
+			$('.weui-gallery').remove()
+			getAddress();
+		}
+		
 		function getRouteHotelData() {
 			if (_lon == '0') {
 				$(".border-none").removeClass("mask-hidden");
@@ -594,7 +593,7 @@
 				url: siteurl + 'v2/entry/storeList',
 				data: {
 					page: _page,
-					page_size:'8',
+					page_size: '8',
 					minid: _minid,
 					lon: _lon,
 					lat: _lat
@@ -669,6 +668,7 @@
 			return false;
 		})
 		$(".swiper-wrapper").on("tap", ".swiper-slide", function() {
+			console.log("3")
 			var _type = $(this).attr("type");
 			var _keyid = $(this).attr("keyid");
 			if (_type == 'store') {
@@ -776,48 +776,40 @@
 				reqPermission('location');
 				$(".border-none").removeClass("mask-hidden");
 				return false;
-			} else {
-				var aMap = api.require('aMap');
-				if (api.systemType == 'ios') {
-					aMap.hide();
-					aMap.open({
-						rect: {
-							x: 0,
-							y: 0,
-							w: 0,
-							h: 0
-						},
-						showUserLocation: true,
-						zoomLevel: 11,
-						center: {
-							lon: 116.4021310000,
-							lat: 39.9994480000
-						},
-						fixedOn: api.frameName,
-						fixed: true
-					}, function(ret, err) {})
-				}
-				aMap.getLocation(function(ret, err) {
-					if (ret.status) {
-						_lon = ret.lon;
-						_lat = ret.lat;
-						getRouteHotelData();
-						aMap.getNameFromCoords({
-							lon: ret.lon,
-							lat: ret.lat
-						}, function(ret, err) {
-							if (ret.status) {
-								aMap.close();
-								$(".local-name").text(ret.city + ret.township + ret.street + ret.number);
-							}
-						});
-					} else {
-						$(".local-name").text(JSON.stringify(err));
-					}
-				});
 			}
+			var aMap = api.require('aMap');
+			if (api.systemType == 'ios') {
+				aMap.hide();
+				aMap.open({
+					rect: {x: 0,y: 0,w: 0,h: 0},
+					showUserLocation: true,
+					zoomLevel: 11,
+					center: {lon: 116.4021310000,lat: 39.9994480000},
+					fixedOn: api.frameName,
+					fixed: true
+				}, function(ret, err) {})
+			}
+			aMap.getLocation(function(ret, err) {
+				if (ret.status) {
+					_lon = ret.lon;
+					_lat = ret.lat;
+					aMap.getNameFromCoords({
+						lon: ret.lon,
+						lat: ret.lat
+					}, function(ret, err) {
+						if (ret.status) {
+							aMap.close();
+							$(".local-name").text(ret.city + ret.township + ret.street + ret.number);
+						}
+					});
+					getRouteHotelData();
+				} else {
+					$(".local-name").text(JSON.stringify(err));
+				}
+			});
 		}
 
+
 		function jpushInit() {
 			jpush = api.require('ajpush');
 			initJPush();
@@ -850,7 +842,6 @@
 			}, function(ret, err) {
 				onPause(); //监听应用进入后台，通知jpush暂停事件
 			})
-
 			api.addEventListener({
 				name: 'resume'
 			}, function(ret, err) {
@@ -921,6 +912,7 @@
 		}
 
 		$(".back-top").on("tap", function() {
+			console.log("4")
 			$('html , body').animate({
 				scrollTop: 0
 			}, 'slow');

html/order/orderdtl.html

@@ -440,7 +440,6 @@
 		
 		//确认退款
 		function activeRefund(){
-			var _keyid = $(this).attr("keyid");
 			if(index==5){
 				str=$('.textarea').val();
 				if(str==''){
@@ -448,6 +447,7 @@
 					return false;
 				}
 			}
+			console.log(_keyid,str);
 			toast_loding_show();
 			$.ajax({
 				url: siteurl + 'v3/Order/refund_direct',
@@ -461,6 +461,7 @@
 				dataType: 'json',
 				type: 'post',
 				success: function(datas) {
+					console.log(JSON.stringify(datas));
 					toast_loding_hide();
 					if (datas.result) {
 						api.toast({msg: '操作成功！'});
@@ -477,6 +478,7 @@
 		
 		//退款
 		$("#state-btn").on("tap", ".o-refund", function() {
+			_keyid=$(this).attr("keyid");
 			$(".openSelect").fadeIn('200');
 			$(".weui-mask").fadeIn('200');
 			return false;	

script/api.js

@@ -722,12 +722,10 @@
         var _html = '<div class="weui-gallery" style="display: block;background-color: rgba(0, 0, 0, 0.18);">';
             _html +=    '<a href="javascript:'+function_name+'('+id+', '+oid+')"><span class="weui-gallery__img" style="background-image: url('+img+');"></span></a>';
             _html +=    '<div class="weui-gallery__opr" style="background-color: rgba(0, 0, 0, 0);">';
-            _html +=        '<a href="javascript:$(\'.weui-gallery\').remove()" class="weui-gallery__del">';
+            _html +=        '<a href="javascript:color()" class="weui-gallery__del">';
             _html +=            '<i class="weui-icon-cancel" style="font-size: 1rem;"></i></a></div></div>';
-
         $("body").prepend(_html);
     }
-
     toast_weui = function (e) {
         // body...
         var _html = '<div class="js_dialog" id="iosDialog2_qz" style="display: block;">';