Merge branch 'master' of http://git.iamberry.com/liujiankang/static

aiberle/add-warranty_card.html

@@ -14,9 +14,9 @@
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 		<script>
 			//屏蔽分享
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-//				WeixinJSBridge.call('hideOptionMenu');
-//			});
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
 		</script>
 	</head>
 
@@ -203,6 +203,10 @@
             url: base_path + '/qrcode/get_location_by_qq',
 			data:data_array,
             dataType: 'json',
+            xhrFields: {
+				withCredentials: true
+			},
+			crossDomain: true,
             timeout: 15000,
             success: function(dt) {
                 if(dt.status){
@@ -234,6 +238,10 @@
                 url: base_path + '/qrcode/select_efast_order_num',
                 data:data_array,
                 dataType: 'json',
+                xhrFields: {
+					withCredentials: true
+				},
+				crossDomain: true,
                 timeout: 15000,
                 success: function(dt) {
                     if (dt.status) {
@@ -265,6 +273,10 @@
                                     url: base_path + '/qrcode/add_warranty_card',
                                     data:data_all,
                                     dataType: 'json',
+                                    xhrFields: {
+                                    	withCredentials: true
+                                    },
+                                    crossDomain: true,
                                     timeout: 15000,
                                     success: function(dt) {
                                         if (dt.status) {

aiberle/clearing.html

@@ -294,10 +294,7 @@ var yhq_id='';			mui.ready(function() {
 							return;
 						};
 						if(dt.data.info == "isOK") {
-							mui.openWindow({
-
-								url: base_path+"/wechat/order/paySuccess?orderId=" + dt.data.orderId + "&dates=" + new Date().getTime()
-							});
+							location.href = 'pay-win.html?orderId=' + dt.data.orderId + "&dates=" + new Date().getTime();
 							return;
 						};
 

aiberle/coupon_list.html

@@ -129,6 +129,7 @@
                     xhrFields: {
 						withCredentials: true
 					},
+					crossDomain: true,
                     timeout:15000,
                     success:function(dt){
                     	if(dt.isRedirect) {

aiberle/customer-service.html

@@ -10,11 +10,12 @@
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
 		<link rel="stylesheet" type="text/css" href="css/main.css" />
+		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 		<script>
 			//屏蔽分享
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-//				WeixinJSBridge.call('hideOptionMenu');
-//			});
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
 		</script>
 	</head>
 
@@ -48,13 +49,6 @@
 		<script src="js/jquery-2.1.1.min.js"></script>
 		<script src="js/main.js"></script>
 		<script>
-			window.addEventListener('pageshow', function(e) {
-				// 通过persisted属性判断是否存在 BF Cache
-				if(e.persisted) {
-					location.reload();
-				}
-			});
-			
 			var orderId = getParam("orderId");//从URL带过来的订单id
 			var status = 0;
 			//dom加载完毕

aiberle/exchange-goods.html

@@ -10,11 +10,12 @@
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
 		<link rel="stylesheet" type="text/css" href="css/main.css" />
+		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 		<script>
 			//屏蔽分享
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-//				WeixinJSBridge.call('hideOptionMenu');
-//			});
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
 		</script>
 	</head>
 
@@ -70,13 +71,6 @@
 		<script src="js/jquery-2.1.1.min.js"></script>
 		<script src="js/main.js"></script>
 		<script>
-			window.addEventListener('pageshow', function(e) {
-				// 通过persisted属性判断是否存在 BF Cache
-				if(e.persisted) {
-					location.reload();
-				}
-			});
-			
 			var orderId = getParam("orderId");//从URL带过来的订单id
 			var newStatus = getParam("newStatus"); //2：退款   4：退货       7：换货
 			var status = 0;

aiberle/get-warranty_card.html

@@ -12,9 +12,9 @@
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 		<script>
 			//屏蔽分享
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-//				WeixinJSBridge.call('hideOptionMenu');
-//			});
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
 		</script>
 	</head>
 	<body style="background: #fff;">
@@ -52,13 +52,6 @@
 	mui.ready(function(){
 		console.log("页面加载完毕")
 		document.querySelector('.loading-bg').style.display='none';
-
-	});
-	
-	mui('body').on('tap','.go_order_details',function(){
-		mui.openWindow({
-			url: 'order_details.html'
-		});
 	});
 	</script>
 	</body>

aiberle/guide-to-use.html

@@ -49,14 +49,7 @@
 			"width": $(window).width() - 20
 		});
 		document.querySelector('.loading-bg').style.display='none';
-
 	});
-	
-	mui('body').on('tap','.go_order_details',function(){
-				mui.openWindow({
-					url: 'order_details.html'
-			});
-		});
 	</script>
 	</body>
 </html>

aiberle/index.html

@@ -130,7 +130,7 @@
 		<script src="js/jquery-2.1.1.min.js"></script>
 		<script src="js/jquery.autocompleter.js"></script>
 		<script src="js/main.js"></script>
-		<!--<script src="js/wechat-utils-1.0.js"></script>-->
+		<script src="js/wechat-utils-1.0.js"></script>
 		<script>
 			// 读取值
 			var colors = [];

aiberle/logistics-massage.html

@@ -12,9 +12,9 @@
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 		<script>
 			//屏蔽分享
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-//				WeixinJSBridge.call('hideOptionMenu');
-//			});
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
 		</script>
 	</head>
 	<body>
@@ -88,13 +88,6 @@
 	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
 	<script type="text/javascript" src="js/main.js"></script>
 	<script type="text/javascript">
-		window.addEventListener('pageshow', function(e) {
-				// 通过persisted属性判断是否存在 BF Cache
-				if(e.persisted) {
-					location.reload();
-				}
-			});
-			
 		var com = getParam("salesPostFirm");  //快递公司代码
 		var nu = getParam("salesPostNum");  //快递单号
 		mui.ready(function(){

aiberle/my-warranty_card.html

@@ -24,9 +24,9 @@
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 		<script>
 			//屏蔽分享
-//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-//				WeixinJSBridge.call('hideOptionMenu');
-//			});
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
 		</script>
 	</head>
 	<body style="background-color: #f1f1f1;">

aiberle/order-details.html

@@ -10,13 +10,10 @@
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
 		<link rel="stylesheet" type="text/css" href="css/main.css" />
-		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
-		<script>
-			//屏蔽分享
-			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-				WeixinJSBridge.call('hideOptionMenu');
-			});
-		</script>
+		<script type="text/javascript">
+		// 屏蔽分享
+		window.hiddenAllWechatMenu = true;
+	</script>
 	</head>
 
 	<body>
@@ -337,6 +334,10 @@
         $.ajax(base_path+'/wechat/cart/orderPay', { // 提交订单,准备支付
             data: dataArgs,
             dataType: 'json',
+            xhrFields: {
+				withCredentials: true
+			},
+			crossDomain: true,
             type: 'POST',
              xhrFields: {
 				withCredentials: true
@@ -361,6 +362,10 @@
                             $.ajax(base_path+'/wechat/order/checkOrderPaySuccess', { // 校验订单状态
                                 data: orderIds,
                                 dataType: 'json',
+                                xhrFields: {
+                                	withCredentials: true
+                                },
+                                crossDomain: true,
                                 type: 'post',
                                  xhrFields: {
 									withCredentials: true
@@ -371,7 +376,8 @@
                                     if(dt.status) { // 支付成功
                                         window.location.href = "pay-win.html?orderId=" + orderIds.orderId + "&dates=" + new Date().getTime();
                                     } else {
-                                        setTimeout(checkOrderStatus(orderIds), 1000);
+                                    	  mui.toast("支付失败，请稍后重试!");
+                                        //setTimeout(checkOrderStatus(orderIds), 1000);
                                     }
                                 },
                                 error: function(xhr, type, errorThrown) {
@@ -383,7 +389,7 @@
                             });
                         } else {
                             isPay = true;
-                            //mui.alert("对不起，支付失败!请稍后重试!" + dt.data.orderId + "支付失败!");
+                            mui.alert("对不起，支付失败!请稍后重试!" + dt.data.orderId + "支付失败!");
                             //window.location.href = "order-details.html?orderId=" + dt.data.orderId; // 前往订单详情
                         }
                     });

aiberle/order-list.html

@@ -472,7 +472,8 @@
                                     if(dt.status) { // 支付成功
                                         window.location.href = "pay-win.html?orderId=" + orderIds.orderId + "&dates=" + new Date().getTime();
                                     } else {
-                                        setTimeout(checkOrderStatus(orderIds), 1000);
+                                    	  mui.toast("支付失败，请稍后重试!");
+                                        //setTimeout(checkOrderStatus(orderIds), 1000);
                                     }
                                 },
                                 error: function(xhr, type, errorThrown) {
@@ -485,7 +486,7 @@
                         } else {
                             isPay = true;
                             mui.alert("对不起，支付失败!请稍后重试!" + dt.data.orderId + "支付失败!");
-                            //window.location.href = "order-details.html?orderId=" + dt.data.orderId; // 前往订单详情
+                            window.location.href = "order-details.html?orderId=" + dt.data.orderId; // 前往订单详情
                         }
                     });
                 } else {

aiberle/pay-win.html

@@ -39,8 +39,8 @@
 					长按识别，关注aiberle公众号<br /> 随时查看订单信息
 				</p>
 				<div style="padding: 20px 0;">
-					<button type="button" class="mui-btn my-btn">继续逛逛</button>&nbsp;&nbsp;&nbsp;&nbsp;
-					<button type="button" class="mui-btn my-btn">查看订单</button>
+					<button type="button" class="mui-btn my-btn go-pro-list">继续逛逛</button>&nbsp;&nbsp;&nbsp;&nbsp;
+					<button type="button" class="mui-btn my-btn go_order_details">查看订单</button>
 				</div>
 				</div>	
 			</div>
@@ -48,17 +48,23 @@
 	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
 	<script type="text/javascript" src="js/main.js"></script>
 	<script type="text/javascript">
+	var orderId=getParam("orderId");		
 	mui.ready(function(){
 		console.log("页面加载完毕")
 		document.querySelector('.loading-bg').style.display='none';
-
 	});
-	
+	//跳转订单详情
 	mui('body').on('tap','.go_order_details',function(){
-				mui.openWindow({
-					url: 'order_details.html'
-			});
+		mui.openWindow({
+			url: 'order-details.html?orderId='+orderId
+		});
+	});
+	//跳转产品列表
+	mui('body').on('tap','.go-pro-list',function(){
+		mui.openWindow({
+			url: 'pro-list.html'
 		});
+	});
 	</script>
 	</body>
 </html>

aiberle/pro-details.html

@@ -372,10 +372,10 @@
 			//分享			
 			function fenxiang(){
 				var src = location.href;
-					src = "https://s.iamberry.com/aiberle/wechat/pro-details.html?productId="+productId;
+					src = "//s.iamberry.com/aiberle/wechat/pro-details.html?productId="+productId;
 						window.wxFriend = {
 							"appId": "",
-							"imgUrl": 'https://s.iamberry.com/aiberle/wechat/images/indexShare.jpg',
+							"imgUrl": '//s.iamberry.com/aiberle/wechat/images/indexShare.jpg',
 							"link": src,
 							"desc": productRemark,
 							"title": 'Aiberle爱贝源-'+productName,

aiberle/shopping-cart.html

@@ -13,9 +13,9 @@
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 		<script>
 			//屏蔽分享
-			//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-			//				WeixinJSBridge.call('hideOptionMenu');
-			//			});
+						document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+							WeixinJSBridge.call('hideOptionMenu');
+						});
 		</script>
 	</head>