浏览代码

修改了watero页面

liuzhiwei 7 年之前
父节点
当前提交
ac501c9f61

+ 2 - 2
watero-wechat-web/src/main/webapp/WEB-INF/views/other/index.html

@@ -90,7 +90,7 @@
                 //在微信中打开
                 mask.show(); //显示遮罩
                 }else{
-                location.href='https://itunes.apple.com/cn/app/bi-bi-meng/id1117339790?mt=8';
+                location.href='//itunes.apple.com/cn/app/bi-bi-meng/id1117339790?mt=8';
                 }
 		});
 	});
@@ -107,7 +107,7 @@
 	}
 	
 	function toAibeiyuan(){
-		location.href='http://www.iamberry.com';
+		location.href='//www.iamberry.com';
 	}
 	
 	</script>

+ 104 - 104
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html

@@ -1,112 +1,112 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta http-equiv="pragma" content="no-cache">
-		<meta http-equiv="cache-control" content="no-cache">
-		<meta http-equiv="expires" content="0"> 
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="format-detection" content="telphone=no, email=no" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telphone=no, email=no" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item mui-active">
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item go_gwc">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<div class="mui-content">
-			<!--商城首页begin-->
-			<div id="banner-slider" class="mui-slider">
-				<div class="mui-slider-group mui-slider-loop" id="mui-slider-loop">
-				   
-				</div>
-				<div id="my-slider-indicator" class="mui-slider-indicator my-slider-indicator">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item mui-active">
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item go_gwc">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<!--商城首页begin-->
+	<div id="banner-slider" class="mui-slider">
+		<div class="mui-slider-group mui-slider-loop" id="mui-slider-loop">
 
-				</div>
-			</div>
-
-	
-<!--			 <ul class="mui-table-view mui-grid-view mui-grid-9 chanpin-box" id="chanpin-box">
- 		            <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
-		                   <div class="mui-table-view-cell mui-col-xs-6 bg-blue">
-		                    <img width="100%" src="/iamberry/common/shop/images/chanpin-3.png" />
-		                    </div>
-		                     <div class="mui-table-view-cell mui-col-xs-6">
-		                    <div class="chanpin-text cl-blue">
-		                    <div>Watero</div>
-		                    <div class="ft-12">蓝色非常纯净让人联想到海洋、天空、水、宇宙。</div>
-		                    </div>
-		                    </div>
-		            </li>
-		            <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
-		                    <div class="mui-table-view-cell mui-col-xs-6">
-		                    <div class="chanpin-text cl-black">
-		                    <div>Watero</div>
-		                    <div class="ft-12">黑色非常深沉,庄重,神秘,和重心感。</div>
-		                    </div>
-		                    </div>
-		                    <div class="mui-table-view-cell mui-col-xs-6 bg-black">
-		                    <img width="100%" src="/iamberry/common/shop/images/chanpin-4.png" />
-		                    </div>
-		            </li>
-		             <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
-		                   <div class="mui-table-view-cell mui-col-xs-6 bg-green">
-		                    <img width="100%" src="/iamberry/common/shop/images/chanpin-5.png" />
-		                    </div>
-		                     <div class="mui-table-view-cell mui-col-xs-6">
-		                    <div class="chanpin-text cl-green">
-		                    <div>Watero</div>
-		                    <div class="ft-12">绿色最为平和、安稳。是一种柔顺、恬静、满足、优美的色。</div>
-		                    </div>
-		                    </div>
-		            </li>
-		             <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
-		                    <div class="mui-table-view-cell mui-col-xs-6">
-		                    <div class="chanpin-text cl-red">
-		                    <div>Watero</div>
-		                    <div class="ft-12">红色容易引起注意,也容易使人兴奋、激动、紧张、冲动。</div>
-		                    </div>
-		                    </div><div class="mui-table-view-cell mui-col-xs-6 bg-red">
-		                    <img width="100%" src="/watero/common/shop/images/chanpin-6.png" />
-		                    </div>
-		            </li> 
-		       </ul> 	-->	
+		</div>
+		<div id="my-slider-indicator" class="mui-slider-indicator my-slider-indicator">
 
-			<div class="mui-content-padded my-content-padded" id="advs_banner">
-			</div>
-			<!--商城首页end-->
 		</div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js?v22323=32232"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js?v11311111211"></script>
-		<script src="/watero/waterojs/shop/index.js?1=1"></script>
-	</body>
+	</div>
+
+
+	<!--			 <ul class="mui-table-view mui-grid-view mui-grid-9 chanpin-box" id="chanpin-box">
+                         <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
+                               <div class="mui-table-view-cell mui-col-xs-6 bg-blue">
+                                <img width="100%" src="/iamberry/common/shop/images/chanpin-3.png" />
+                                </div>
+                                 <div class="mui-table-view-cell mui-col-xs-6">
+                                <div class="chanpin-text cl-blue">
+                                <div>Watero</div>
+                                <div class="ft-12">蓝色非常纯净让人联想到海洋、天空、水、宇宙。</div>
+                                </div>
+                                </div>
+                        </li>
+                        <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
+                                <div class="mui-table-view-cell mui-col-xs-6">
+                                <div class="chanpin-text cl-black">
+                                <div>Watero</div>
+                                <div class="ft-12">黑色非常深沉,庄重,神秘,和重心感。</div>
+                                </div>
+                                </div>
+                                <div class="mui-table-view-cell mui-col-xs-6 bg-black">
+                                <img width="100%" src="/iamberry/common/shop/images/chanpin-4.png" />
+                                </div>
+                        </li>
+                         <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
+                               <div class="mui-table-view-cell mui-col-xs-6 bg-green">
+                                <img width="100%" src="/iamberry/common/shop/images/chanpin-5.png" />
+                                </div>
+                                 <div class="mui-table-view-cell mui-col-xs-6">
+                                <div class="chanpin-text cl-green">
+                                <div>Watero</div>
+                                <div class="ft-12">绿色最为平和、安稳。是一种柔顺、恬静、满足、优美的色。</div>
+                                </div>
+                                </div>
+                        </li>
+                         <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
+                                <div class="mui-table-view-cell mui-col-xs-6">
+                                <div class="chanpin-text cl-red">
+                                <div>Watero</div>
+                                <div class="ft-12">红色容易引起注意,也容易使人兴奋、激动、紧张、冲动。</div>
+                                </div>
+                                </div><div class="mui-table-view-cell mui-col-xs-6 bg-red">
+                                <img width="100%" src="/watero/common/shop/images/chanpin-6.png" />
+                                </div>
+                        </li>
+                   </ul> 	-->
+
+	<div class="mui-content-padded my-content-padded" id="advs_banner">
+	</div>
+	<!--商城首页end-->
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=20170622"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/index.js?v=2016111701"></script>
+</body>
 </html>

+ 62 - 62
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/xiaxian_list.html

@@ -1,69 +1,69 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell {padding-right: 10px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell {padding-right: 10px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item">
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<ul class="mui-table-view more">
-			<li class="mui-table-view-cell ft-14">我的好友人数<span class="cl-red downNum">0</span>人 <span class="mui-badge mui-badge-inverted">已购买人数:<span class="cl-red buyedNum">0</span>人</span>
-			</li>
-		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item">
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell ft-14">我的好友人数<span class="cl-red downNum">0</span>人 <span class="mui-badge mui-badge-inverted">已购买人数:<span class="cl-red buyedNum">0</span>人</span>
+	</li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
 
-				</ul>
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/xiaxian.js">></script>
-	</body>
+		</ul>
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/xiaxian.js">></script>
+</body>
 </html>

+ 97 - 100
watero-wechat-web/src/main/webapp/common/shop/js/page/index.js

@@ -1,103 +1,100 @@
 mui.ready(function() {
-	//springFestivalPop();
-	//marquee_Show();
-	getCartNum();
-	$.ajax(base_path + '/indexData?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
+    //springFestivalPop();
+    marquee_Show();
+    getCartNum();
+    mui.ajax(base_path + '/indexData?dates=' + new Date().getTime(), {
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            var bannerstr = "",
+                prostr = "",
+                dian = "",
+                advsstr = "";
+            if(dt.status) {
+                var banner_data = dt.data.banners;
+                mui(banner_data).each(function(index) {
+                    if(index == 0) {
+                        bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[banner_data.length - 1].bannerImageCheckOutUrl + '"><img src="' + (banner_data[banner_data.length - 1].bannerImageUrl) + '"></a></div><div class="mui-slider-item mui-active"><a href="' + this.bannerImageCheckOutUrl + '"><img src="' + (this.bannerImageUrl) + '"></a></div>';
+                        dian += '<div class="mui-indicator mui-active"></div>'
+                    } else {
+                        bannerstr += '<div class="mui-slider-item"><a href="' + this.bannerImageCheckOutUrl + '"><img src="' + (this.bannerImageUrl) + '"></a></div>';
+                        dian += '<div class="mui-indicator"></div>'
+                    }
+                    if(index == (banner_data.length - 1) || (banner_data.length - 1) == 0) {
+                        bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[0].bannerImageCheckOutUrl + '"><img src="' + (banner_data[0].bannerImageUrl) + '"></a></div>'
+                    }
+                });
+                dc('mui-slider-loop').innerHTML = bannerstr;
+                dc('my-slider-indicator').innerHTML = dian;
+                $("<div id='banner-slider' class='mui-slider'><div class='mui-slider-group mui-slider-loop' id='mui-slider-loop'>" + bannerstr + "</div><div id='my-slider-indicator' class='mui-slider-indicator my-slider-indicator'>" + dian + "</div></div>").insertBefore(".chanpin-box");
+                var advs_data = dt.data.advs;
+                mui(advs_data).each(function(index) {
+                    advsstr += '<a href="' + this.bannerImageCheckOutUrl + '"><img src="' + this.bannerImageUrl + '" /></a>'
+                });
+                dc('advs_banner').innerHTML = advsstr;
+                dc('advs_banner').style.display = 'block';
+                dc('banner-slider').style.display = 'block';
+                var banner = mui('#banner-slider');
+                banner.slider({
+                    interval: 5000
+                });
+                mui.each(document.querySelectorAll('#banner-slider a'), function(index, el) {
+                    el.addEventListener('tap', function() {
+                        //document.querySelector('.loading-bg').style.display = 'block';
+                        var str=this.getAttribute('href');
+                        console.log(this.getAttribute('href'));
+                        if(str!="#" && str!=''){
+                            location.href = this.getAttribute('href')
+                        }
+                    }, false)
+                });
+                mui.each(document.querySelectorAll('#advs_banner a'), function(index, el) {
+                    el.addEventListener('tap', function() {
+                        //document.querySelector('.loading-bg').style.display = 'block';
+                        location.href = this.getAttribute('href')
+                    }, false)
+                });
+                var shareOpenid = dt.data.memberOpenid;
+                var link = domanUrl + base_path + "/index?shareOpenid=" + shareOpenid;
+                window.repleFlag = false;
+                window.wxFriend = {
+                    "appId": "",
+                    "imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
+                    "link": link,
+                    "desc": "Watero水时代商城,开启优雅生活",
+                    "title": "Watero水时代商城,好水,好茶,生活不将就!",
+                    "netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
+                    "shareTimeSuccess": "分享成功",
+                    "shareTimeCancel": "已取消分享",
+                    "shareAppSuccess": "分享成功!",
+                    "shareAppCancel": "已取消分享"
+                };
+                document.querySelector('.loading-bg').style.display = 'none'
+            } else {
+                mui.alert(dt.message, ' ', '朕知道了', function() {
+                    mui.openWindow({
+                        url: domanUrl + base_path + "/index?dates=" + new Date().getTime()
+                    })
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			var bannerstr = "",
-				prostr = "",
-				dian = "",
-				advsstr = "";
-			if(dt.status) {
-				var banner_data = dt.data.banners;
-				mui(banner_data).each(function(index) {
-					if(index == 0) {
-						bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[banner_data.length - 1].bannerImageCheckOutUrl + '"><img src="' + (banner_data[banner_data.length - 1].bannerImageUrl) + '"></a></div><div class="mui-slider-item mui-active"><a href="' + this.bannerImageCheckOutUrl + '"><img src="' + (this.bannerImageUrl) + '"></a></div>';
-						dian += '<div class="mui-indicator mui-active"></div>'
-					} else {
-						bannerstr += '<div class="mui-slider-item"><a href="' + this.bannerImageCheckOutUrl + '"><img src="' + (this.bannerImageUrl) + '"></a></div>';
-						dian += '<div class="mui-indicator"></div>'
-					}
-					if(index == (banner_data.length - 1) || (banner_data.length - 1) == 0) {
-						bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[0].bannerImageCheckOutUrl + '"><img src="' + (banner_data[0].bannerImageUrl) + '"></a></div>'
-					}
-				});
-				dc('mui-slider-loop').innerHTML = bannerstr;
-				dc('my-slider-indicator').innerHTML = dian;
-				$("<div id='banner-slider' class='mui-slider'><div class='mui-slider-group mui-slider-loop' id='mui-slider-loop'>" + bannerstr + "</div><div id='my-slider-indicator' class='mui-slider-indicator my-slider-indicator'>" + dian + "</div></div>").insertBefore(".chanpin-box");
-				var advs_data = dt.data.advs;
-				mui(advs_data).each(function(index) {
-					advsstr += '<a href="' + this.bannerImageCheckOutUrl + '"><img src="' + this.bannerImageUrl + '" /></a>'
-				});
-				dc('advs_banner').innerHTML = advsstr;
-				dc('advs_banner').style.display = 'block';
-				dc('banner-slider').style.display = 'block';
-				var banner = mui('#banner-slider');
-				banner.slider({
-					interval: 5000
-				});
-				mui.each(document.querySelectorAll('#banner-slider a'), function(index, el) {
-					el.addEventListener('tap', function() {
-						//document.querySelector('.loading-bg').style.display = 'block';
-						var str=this.getAttribute('href');
-						console.log(this.getAttribute('href'));
-						if(str!="#" && str!=''){
-							location.href = this.getAttribute('href')
-						}
-					}, false)
-				});
-				mui.each(document.querySelectorAll('#advs_banner a'), function(index, el) {
-					el.addEventListener('tap', function() {
-						//document.querySelector('.loading-bg').style.display = 'block';
-						location.href = this.getAttribute('href')
-					}, false)
-				});
-				var shareOpenid = dt.data.memberOpenid;
-				var link = domanUrl + base_path + "/index?shareOpenid=" + shareOpenid;
-				window.repleFlag = false;
-				window.wxFriend = {
-					"appId": "",
-					"imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
-					"link": link,
-					"desc": "Watero水时代商城,开启优雅生活",
-					"title": "Watero水时代商城,好水,好茶,生活不将就!",
-					"netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
-					"shareTimeSuccess": "分享成功",
-					"shareTimeCancel": "已取消分享",
-					"shareAppSuccess": "分享成功!",
-					"shareAppCancel": "已取消分享"
-				};
-				document.querySelector('.loading-bg').style.display = 'none'
-			} else {
-				mui.alert(dt.message, ' ', '朕知道了', function() {
-					mui.openWindow({
-						url: domanUrl + base_path + "/index?dates=" + new Date().getTime()
-					})
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	});
-	if(marquee != '') {
-		$('body').append('<div class="marquee-show"><div></div></div>')
-	}
-	mui('body').on('tap', '.go_jifen_shop', function() {
-		mui.alert('敬请期待', ' ', '朕知道了', function() {})
-	});
-	setTimeout(function() {
-		$("#chanpin-slider .mui-slider-item").each(function() {
-			if($(this).find('.opacity_0').length > 0) {
-				$(this).find('img').prop('src', $(this).find('img').attr('val'));
-				$(this).find('.opacity_0').removeClass('opacity_0')
-			}
-		})
-	}, 1500)
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    });
+    if(marquee != '') {
+        $('body').append('<div class="marquee-show"><div></div></div>')
+    }
+    mui('body').on('tap', '.go_jifen_shop', function() {
+        mui.alert('敬请期待', ' ', '朕知道了', function() {})
+    });
+    setTimeout(function() {
+        $("#chanpin-slider .mui-slider-item").each(function() {
+            if($(this).find('.opacity_0').length > 0) {
+                $(this).find('img').prop('src', $(this).find('img').attr('val'));
+                $(this).find('.opacity_0').removeClass('opacity_0')
+            }
+        })
+    }, 1500)
 });

+ 210 - 210
watero-wechat-web/src/main/webapp/view/input_machine.html

@@ -1,225 +1,225 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<base href="/watero/">
-		<link rel="stylesheet" href="css/mui.min.css">
-		<link rel="stylesheet" href="css/iconfont.css" />
-		<link rel="stylesheet" href="css/style.css" />
-		<style>
-			.my-select {-webkit-appearance: menulist;border:1px solid #ccc !important;}
-			.box{width:100%;text-align: center;}
-			.box .left_tab{display: inline-block;width:45%;margin-right: 4%;}
-			.box .right_tab{display: inline-block;width:45%;margin-left: 4%;}
-			.mui-btn-block{padding: 10px 0;}
-		</style>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<base href="//s.iamberry.com/watero/">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
+	<style>
+		.my-select {-webkit-appearance: menulist;border:1px solid #ccc !important;}
+		.box{width:100%;text-align: center;}
+		.box .left_tab{display: inline-block;width:45%;margin-right: 4%;}
+		.box .right_tab{display: inline-block;width:45%;margin-left: 4%;}
+		.mui-btn-block{padding: 10px 0;}
+	</style>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
 	</div>
-			<div class="mui-content" style="background: #fff;">
-				<div class="mui-content-padded">
-					<input type="text" id="mac-input" class="mui-text-center" placeholder="请输入蓝牙MAC地址 :不需要" />
-				<br/>
-					<button type="button" id="confirm-mac-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="确认中...">确认蓝牙MAC</button>
-					<div class="box">
-						<div class="left_tab"><button type="button" id="conn-dev-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="连接中...">连接机器</button></div>
-						<div class="right_tab"><button type="button" id="dis-dev-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="断开中...">断开连接</button></div>
-					</div>
-					<div class="box">
-						<div class="left_tab"><select class="my-select" id="init-year-input"><option value="1">1年</option><option value="2">2年</option><option value="3">3年</option></select></div>
-						<div class="right_tab"><button type="button" id="init-dev-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="激活中...">激活机器</button></div>
-					</div>
-					<div class="box" style="display: none;">
-						<div class="left_tab"><select class="my-select"><option>1年</option><option>2年</option><option>3年</option></select></div>
-						<div class="right_tab"><button type="button" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="续费中...">续费</button></div>
-					</div>
-					<div class="box">
-						<div class="left_tab"><input type="text" id="tds-input" value="TDS" style="width: 45%;" readonly="readonly"/><input type="text" id="water-input" value="水量" style="width: 45%;float: right;" readonly="readonly"/></div>
-						<div class="right_tab"><button type="button" id="get-data-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="获取中...">获取水量、TDS</button></div>
-					</div>
-					<div class="box">
-						<div class="left_tab" id="state-div">
-							<span class="iconfont icon-lvxin_full"></span><span class="iconfont icon-lvxin_full"></span><span class="iconfont icon-lvxin_full"></span><span class="iconfont icon-lvxin_null"></span>
-						</div>
-						<div class="right_tab"><button type="button" id="get-state-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="获取中...">获取滤芯状态</button></div>
-					</div>
-				</div>
+</div>
+<div class="mui-content" style="background: #fff;">
+	<div class="mui-content-padded">
+		<input type="text" id="mac-input" class="mui-text-center" placeholder="请输入蓝牙MAC地址 :不需要" />
+		<br/>
+		<button type="button" id="confirm-mac-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="确认中...">确认蓝牙MAC</button>
+		<div class="box">
+			<div class="left_tab"><button type="button" id="conn-dev-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="连接中...">连接机器</button></div>
+			<div class="right_tab"><button type="button" id="dis-dev-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="断开中...">断开连接</button></div>
+		</div>
+		<div class="box">
+			<div class="left_tab"><select class="my-select" id="init-year-input"><option value="1">1年</option><option value="2">2年</option><option value="3">3年</option></select></div>
+			<div class="right_tab"><button type="button" id="init-dev-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="激活中...">激活机器</button></div>
+		</div>
+		<div class="box" style="display: none;">
+			<div class="left_tab"><select class="my-select"><option>1年</option><option>2年</option><option>3年</option></select></div>
+			<div class="right_tab"><button type="button" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="续费中...">续费</button></div>
+		</div>
+		<div class="box">
+			<div class="left_tab"><input type="text" id="tds-input" value="TDS" style="width: 45%;" readonly="readonly"/><input type="text" id="water-input" value="水量" style="width: 45%;float: right;" readonly="readonly"/></div>
+			<div class="right_tab"><button type="button" id="get-data-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="获取中...">获取水量、TDS</button></div>
+		</div>
+		<div class="box">
+			<div class="left_tab" id="state-div">
+				<span class="iconfont icon-lvxin_full"></span><span class="iconfont icon-lvxin_full"></span><span class="iconfont icon-lvxin_full"></span><span class="iconfont icon-lvxin_null"></span>
 			</div>
-	<script type="text/javascript" src="js/mui.min.js"></script>
-	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
-	<script type="text/javascript" src="/watero/waterojs/wechat_iot.js"></script>
-	<script type="text/javascript">
-		mui.ready(function(){
-			console.log("页面加载完毕")
-			document.querySelector('.loading-bg').style.display='none';
+			<div class="right_tab"><button type="button" id="get-state-btn" class="mui-btn mui-btn-block mui-btn-blue" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="获取中...">获取滤芯状态</button></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript" src="js/mui.min.js"></script>
+<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/watero/js/wechat_iot.js"></script>
+<script type="text/javascript">
+    mui.ready(function(){
+        console.log("页面加载完毕")
+        document.querySelector('.loading-bg').style.display='none';
 
-		});
-		// 全局flag:是否允许请求
-		var isRequest = false;
-		var deviceId = null;
-		// 确认MAC
-		$(function () {
-			// 确认MAC
-			$("#confirm-mac-btn").click(function () {
-				// 校验数据
-				var mac = $("#mac-input").val();
-				if (mac == null || mac == "") {
-					mui.alert("请检查MAC是否为空");
-					return;
-				}
-				// 处理 :
-				if (mac.indexOf(":") != -1) {
-					var replaceStr = ":";
-					mac = mac.replace(new RegExp(replaceStr,'gm'),'').toLowerCase();
-				}
+    });
+    // 全局flag:是否允许请求
+    var isRequest = false;
+    var deviceId = null;
+    // 确认MAC
+    $(function () {
+        // 确认MAC
+        $("#confirm-mac-btn").click(function () {
+            // 校验数据
+            var mac = $("#mac-input").val();
+            if (mac == null || mac == "") {
+                mui.alert("请检查MAC是否为空");
+                return;
+            }
+            // 处理 :
+            if (mac.indexOf(":") != -1) {
+                var replaceStr = ":";
+                mac = mac.replace(new RegExp(replaceStr,'gm'),'').toLowerCase();
+            }
 
-				// 发起请求
-				var url = "http://test.iamberry.com/watero/wechat/factory/info_by_mac";
-				$.post(url,{"mac":mac},function(result){
-					if (result.resultCode != 200 || result.returnCode != 200) {
-						mui.alert("没有查找到机器,请检查");
-						return;
-					}
-					// 允许请求
-					isRequest = true;
-					// 保存deviceid
-					deviceId = result.returnMsg.info.machineDeviceId;
-					mui.alert("已检测到机器,请确认机器在线,然后开始测试...");
-				});
-			});
+            // 发起请求
+            var url = "//w.iamberry.com/watero/wechat/factory/info_by_mac";
+            $.post(url,{"mac":mac},function(result){
+                if (result.resultCode != 200 || result.returnCode != 200) {
+                    mui.alert("没有查找到机器,请检查");
+                    return;
+                }
+                // 允许请求
+                isRequest = true;
+                // 保存deviceid
+                deviceId = result.returnMsg.info.machineDeviceId;
+                mui.alert("已检测到机器,请确认机器在线,然后开始测试...");
+            });
+        });
 
-			// 连接请求
-			$("#conn-dev-btn").click(function () {
-				if (!isRequest) {
-					mui.alert("请先输入mac地址 然后测试...");
-					return;
-				}
-				wx.invoke('getWXDeviceTicket', {'deviceId':deviceId,'type':'1', 'connType':'blue'}, function(res) {
-					if (res.err_msg == "getWXDeviceTicket:ok") {
-						var ticket = res.ticket;
-						var url = "http://test.iamberry.com/watero/wechat/factory/bind";
-						$.post(url,{"ticket":ticket, "device_id":deviceId},function(result){
-							if (result.resultCode != 200 || result.returnCode != 200) {
-								mui.alert("绑定失败,请检查");
-								return;
-							}
+        // 连接请求
+        $("#conn-dev-btn").click(function () {
+            if (!isRequest) {
+                mui.alert("请先输入mac地址 然后测试...");
+                return;
+            }
+            wx.invoke('getWXDeviceTicket', {'deviceId':deviceId,'type':'1', 'connType':'blue'}, function(res) {
+                if (res.err_msg == "getWXDeviceTicket:ok") {
+                    var ticket = res.ticket;
+                    var url = "//w.iamberry.com/watero/wechat/factory/bind";
+                    $.post(url,{"ticket":ticket, "device_id":deviceId},function(result){
+                        if (result.resultCode != 200 || result.returnCode != 200) {
+                            mui.alert("绑定失败,请检查");
+                            return;
+                        }
 
-						});
-					}
-				});
-			});
+                    });
+                }
+            });
+        });
 
-			// 断开连接
-			$("#dis-dev-btn").click(function () {
-				if (!isRequest) {
-					mui.alert("请先输入mac地址 然后测试...");
-					return;
-				}
-				wx.invoke('getWXDeviceTicket', {'deviceId':deviceId,'type':'2', 'connType':'blue'}, function(res) {
-					if (res.err_msg == "getWXDeviceTicket:ok") {
-						var ticket = res.ticket;
-						var url = "http://test.iamberry.com/watero/wechat/factory/un_bind";
-						$.post(url,{"ticket":ticket, "device_id":deviceId},function(result){
-							if (result.resultCode != 200 || result.returnCode != 200) {
-								mui.alert("解除绑定失败,请检查");
-								return;
-							}
-						});
-					}
-				});
-			});
+        // 断开连接
+        $("#dis-dev-btn").click(function () {
+            if (!isRequest) {
+                mui.alert("请先输入mac地址 然后测试...");
+                return;
+            }
+            wx.invoke('getWXDeviceTicket', {'deviceId':deviceId,'type':'2', 'connType':'blue'}, function(res) {
+                if (res.err_msg == "getWXDeviceTicket:ok") {
+                    var ticket = res.ticket;
+                    var url = "//w.iamberry.com/watero/wechat/factory/un_bind";
+                    $.post(url,{"ticket":ticket, "device_id":deviceId},function(result){
+                        if (result.resultCode != 200 || result.returnCode != 200) {
+                            mui.alert("解除绑定失败,请检查");
+                            return;
+                        }
+                    });
+                }
+            });
+        });
 
-			// 激活机器
-			$("#init-dev-btn").click(function () {
-				if (!isRequest) {
-					mui.alert("请先输入mac地址 然后测试...");
-					return;
-				}
-				// 发送
-				sendMsgToDevice(deviceId, base64encode("*setDir2#"), function(state, res){
-					if (state == 200) {
-						var hour = parseInt($("#init-year-input").val()) * 365 * 24;
-						hour = append(hour);
-						var water = 2500  * parseInt($("#init-year-input").val());
-						water = append(water);
-						sendMsgToDevice(deviceId, base64encode("*setData" + hour + " " + water + "#"), function(code, data){
-							receiveData(function(temp) {
-								var t = base64decode(temp);
-								if (t == "ok1") {
-									mui.alert("激活成功...");
-								} else {
-									mui.alert("激活失败...");
-								}
-							});
-							// 改变数据方向
-							sendMsgToDevice(deviceId, base64encode("*setDir0#"), function(){});
-						});
-					}
-				});
+        // 激活机器
+        $("#init-dev-btn").click(function () {
+            if (!isRequest) {
+                mui.alert("请先输入mac地址 然后测试...");
+                return;
+            }
+            // 发送
+            sendMsgToDevice(deviceId, base64encode("*setDir2#"), function(state, res){
+                if (state == 200) {
+                    var hour = parseInt($("#init-year-input").val()) * 365 * 24;
+                    hour = append(hour);
+                    var water = 2500  * parseInt($("#init-year-input").val());
+                    water = append(water);
+                    sendMsgToDevice(deviceId, base64encode("*setData" + hour + " " + water + "#"), function(code, data){
+                        receiveData(function(temp) {
+                            var t = base64decode(temp);
+                            if (t == "ok1") {
+                                mui.alert("激活成功...");
+                            } else {
+                                mui.alert("激活失败...");
+                            }
+                        });
+                        // 改变数据方向
+                        sendMsgToDevice(deviceId, base64encode("*setDir0#"), function(){});
+                    });
+                }
+            });
 
-			});
+        });
 
-			// 获取数据
-			$("#get-data-btn").click(function () {
-				if (!isRequest) {
-					mui.alert("请先输入mac地址 然后测试...");
-					return;
-				}
-				sendMsgAndReceiveData(deviceId, "*getData#", function(state, data){
-					if (state == 200) {
-						var temp = data.split(" ");
-						$("#tds-input").val(temp[0]);
-						$("#water-input").val(temp[1]);
-					} else {
-						mui.alert("获取失败,请重试!");
-					}
-				});
-			});
+        // 获取数据
+        $("#get-data-btn").click(function () {
+            if (!isRequest) {
+                mui.alert("请先输入mac地址 然后测试...");
+                return;
+            }
+            sendMsgAndReceiveData(deviceId, "*getData#", function(state, data){
+                if (state == 200) {
+                    var temp = data.split(" ");
+                    $("#tds-input").val(temp[0]);
+                    $("#water-input").val(temp[1]);
+                } else {
+                    mui.alert("获取失败,请重试!");
+                }
+            });
+        });
 
-			// 获取滤芯状态
-			$("#get-state-btn").click(function(){
-				if (!isRequest) {
-					mui.alert("请先输入mac地址 然后测试...");
-					return;
-				}
-				sendMsgAndReceiveData(deviceId, "*isUse#", function(state, data){
-					if (state == 200) {
-						var t = data.split("");
-						// 先清空
-						$("#state-div").html("");
-						for (var i = 0; i < t.length; i++) {
-							if (t[i] == "0") {
-								// 不可用
-								$("#state-div").append("<span class='iconfont icon-lvxin_null'></span>");
-							} else {
-								$("#state-div").append("<span class='iconfont icon-lvxin_full'></span>");
-							}
-						}
-					} else {
-						mui.alert("获取失败,请重试!");
-					}
-				});
-			});
-		});
+        // 获取滤芯状态
+        $("#get-state-btn").click(function(){
+            if (!isRequest) {
+                mui.alert("请先输入mac地址 然后测试...");
+                return;
+            }
+            sendMsgAndReceiveData(deviceId, "*isUse#", function(state, data){
+                if (state == 200) {
+                    var t = data.split("");
+                    // 先清空
+                    $("#state-div").html("");
+                    for (var i = 0; i < t.length; i++) {
+                        if (t[i] == "0") {
+                            // 不可用
+                            $("#state-div").append("<span class='iconfont icon-lvxin_null'></span>");
+                        } else {
+                            $("#state-div").append("<span class='iconfont icon-lvxin_full'></span>");
+                        }
+                    }
+                } else {
+                    mui.alert("获取失败,请重试!");
+                }
+            });
+        });
+    });
 
-		// 填充参数
-		function append(hour) {
-			var temp = hour + "";
-			if (hour.length == 5) {
-				return temp;
-			}
-			return append("0" + hour);
-		}
-	</script>
-	</body>
+    // 填充参数
+    function append(hour) {
+        var temp = hour + "";
+        if (hour.length == 5) {
+            return temp;
+        }
+        return append("0" + hour);
+    }
+</script>
+</body>
 </html>

+ 36 - 36
watero-wechat-web/src/main/webapp/wechat/test/index.html

@@ -7,12 +7,12 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<title></title>
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/animate.css">
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/mobile.css">
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/newapp.css" />
-		<script src="http://h5.iamberry.com/iamberry/wechat/test/js/mobile.js"></script>
-		<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/zepto.min.js"></script>
-		<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/Touch.js"></script>
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/animate.css">
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/mobile.css">
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/newapp.css" />
+		<script src="//h5.iamberry.com/iamberry/wechat/test/js/mobile.js"></script>
+		<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/zepto.min.js"></script>
+		<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/Touch.js"></script>
 		<script src="http://s95.cnzz.com/z_stat.php?id=1260151428&web_id=1260151428" language="JavaScript"></script>
 		<style>
 			#button{
@@ -48,21 +48,21 @@
 		</div>
 		<div id="page2" class="page out" data-form="slideup">
 			<div class="bg_2">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/logo.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-2.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo"><img src="//h5.iamberry.com/iamberry/wechat/test/images/logo.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-2.png" /></div>
 				</div>
 				<div class="two_2">
-					<img class="smallbig1" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-3.png" /><img class="smallbig2" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-4.png" /><img class="smallbig3" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-5.png" />
+					<img class="smallbig1" src="//h5.iamberry.com/iamberry/wechat/test/images/2-3.png" /><img class="smallbig2" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-4.png" /><img class="smallbig3" src="//h5.iamberry.com/iamberry/wechat/test/images/2-5.png" />
 				</div>
 			</div>
 			<a class="move"></a>
 		</div>
 		<div id="page3" class="page out" data-form="slideup">
 			<div class="bg_3">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-2.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-2.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">储存数千种奶粉品牌</h1>
@@ -73,9 +73,9 @@
 		</div>
 		<div id="page5" class="page out" data-form="slideup">
 			<div class="bg_4">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/4-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/4-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">美国FDA认证材质</h1>
@@ -86,9 +86,9 @@
 		</div>
 		<div id="page4" class="page out" data-form="slideup">
 			<div class="bg_5">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/5-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/5-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">3级温控系统</h1>
@@ -99,28 +99,28 @@
 		</div>
 		<div id="page6" class="page out" data-form="slideup">
 			<div class="bg_6">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-1.png" /></div>
 				</div>
 				<div style="text-align: left;padding-left: 8%;">
 					<h1 class="cl-red">多种母婴智能应用</h1>
-					<div class="six_2 leftin_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-2.png" /></div>
-					<div class="six_2 leftin_2"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-3.png" /></div>
-					<div class="six_2 leftin_3"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-4.png" /></div>
+					<div class="six_2 leftin_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-2.png" /></div>
+					<div class="six_2 leftin_2"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-3.png" /></div>
+					<div class="six_2 leftin_3"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-4.png" /></div>
 				</div>
 			</div>
 			<a class="move"></a>
 		</div>
 		<div id="page7" class="page out" data-form="slideup">
 			<div class="bg_7">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/7-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/7-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h5 class="cl-gray">请长按识别二维码购买冲奶机</h5>
-					<div class="share-2wm"><img style="width: 50%;" src="http://h5.iamberry.com/iamberry/wechat/test/images/7-2.png" /></div>
+					<div class="share-2wm"><img style="width: 50%;" src="//h5.iamberry.com/iamberry/wechat/test/images/7-2.png" /></div>
 					<h5 class="cl-gray">今天不购买还可以</h5>
 					<div class="btn_box">
 							上滑参与调研抽大奖
@@ -131,7 +131,7 @@
 		</div>
 		<div id="page8" class="page out" data-form="slideup">
 			<div class="bg_8">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/7-5.png" />
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/7-5.png" />
 				</div>
 				<div style="position:relative;padding:5px 20px;">
 					<ul>
@@ -168,13 +168,13 @@
 		</div>
 		<div id="page9" class="page out" data-form="slideup">
 			<div class="bg_9">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/9-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/9-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h5 class="cl-gray"> 宝宝心里苦,爱贝源帮宝宝说出来</h5>
-					<div class="share-2wm"><img style="width: 50%;" src="http://h5.iamberry.com/iamberry/wechat/test/images/7-2.png" id="share-2wm-image"/></div>
+					<div class="share-2wm"><img style="width: 50%;" src="//h5.iamberry.com/iamberry/wechat/test/images/7-2.png" id="share-2wm-image"/></div>
 					<h5 class="cl-gray">请长按识别二维码</h5>
 					<div class="btn_box">
 							关注爱贝源
@@ -197,6 +197,6 @@
 			</div>
 		</div>-->
 	</body>
-	<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
-	<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/main.js?v=sdfasdfssfsdfsdfdasd" charset="utf-8"></script>
+	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
+	<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/main.js?v=sdfasdfssfsdfsdfdasd" charset="utf-8"></script>
 </html>