فهرست منبع

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl
liujiankang 7 سال پیش
والد
کامیت
76bce24b15

+ 50 - 0
wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html

@@ -13,6 +13,11 @@
 	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/css/mui.min.css?v=2016111701" />
 	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/css/iconfont.css?v=2016111701" />
 	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/css/style.css?v=2016111701" />
+	<style>
+		.year-dalog{background:url(//s.iamberry.com/wateroPF/images/year-dalog.png) center center no-repeat rgba(0,0,0,.7);background-size: 100% auto; position: fixed;left: 0;top: 0;right: 0;bottom: 0;width: 100%; height: 100%;z-index: 99;display: none;-webkit-transform: translateY(-100%);transform: translateY(-100%); -webkit-transition: .5s;transition: .5s;}
+		.year-dalog.active{-webkit-transform: translateY(0%);transform: translateY(0%);}
+		.year-dalog img{width: 100%;}
+	</style>
 </head>
 
 <body>
@@ -103,10 +108,55 @@
 	</div>
 	<!--商城首页end-->
 </div>
+<!--春节放假通知-->
+<div class="year-dalog"></div>
 <script src="//s.iamberry.com/wateroPF/js/mui.min.js?v=2016111701"></script>
 <script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
 <script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2016111701"></script>
 <script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
 <script src="//s.iamberry.com/wateroPF/js/shop/index.js?v=2016111701"></script>
 </body>
+<script>
+    var clickdate = JSON.parse(localStorage.getItem('clickdate'));
+    //春节放假通知弹窗点击事件
+    $(document).on('tap', '.year-dalog', function() {
+        if(!window.localStorage) {
+            mui.alert("您的浏览器不支持localStorage");
+        } else {
+            //自定义json数据
+            var obj = {};
+            obj = {
+                text: new Date().getTime()
+            };
+            //json格式化插入    点击时间
+            localStorage.setItem('clickdate', JSON.stringify(obj));
+        }
+        $(".year-dalog").removeClass("active");
+        setTimeout(function(){
+            $(".year-dalog").hide();
+        },500);
+    });
+    $(document).ready(function(){
+        var d = new Date().getTime();//当前时间戳
+        //弹窗提示时间为2月6日-2月23日
+        if(d > 1517760000000 && d < 1519401600000) {
+            if(!window.localStorage) {
+                mui.alert("您的浏览器不支持localStorage");
+            } else {
+                if(clickdate != null) {
+                    var oldDate = new Date(clickdate.text).getDay();
+                    //如果本地存储的getDay比当前时间的getDay大则显示弹窗
+                    if(new Date().getDay() > oldDate) {
+                        $(".year-dalog").addClass("active").show();
+                    }
+                }else{
+                    //本地没有存储时间也显示弹窗
+                    $(".year-dalog").addClass("active").show();
+                }
+            }
+        }
+    });
+
+
+</script>
 </html>

+ 128 - 92
wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/pay_win.html

@@ -1,101 +1,137 @@
 <!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="//css.iamberry.com/wateroPF/css/mui.min.css?v=2016101701" />
-		<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/css/iconfont.css?v=2016101701" />
-		<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/css/style.css?v=2016101701" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&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>
-		<header class="mui-bar mui-bar-nav header">
-				<div class="go-index go_index">
-					<img src="//s.iamberry.com/wateroPF/images/shop/logo.png" />
-				</div>
-		</header>
-		<div class="mui-content" style="background: #fff;display: none;" id="show-div-data">
-			<div class="pl-win-tt">
-			<img style="width: 1.5em;" src="//s.iamberry.com/wateroPF/images/shop/pay-win.jpg"><span class="sp"> 恭喜您,支付成功!</span>
-			<div>已支付:<span class="cl-red">¥<font id="pay-money-total">0.0</font>元</span></div>
-			</div>
-			<ul class="pay_win_list">
-				<li>订单编号:<span class="cl-0" id="orderid-span">加载中...</span></li>
-				<li>支付时间:<span class="cl-0" id="pay-date-span">加载中...</span></li>
-				<li><a class="go_order_details" href="#" id="check-order-desc" value="">查看订单详情&gt;&gt;</a> </li>
-				<!-- <li><a class="go_luck_draw" href="#"  id="check-luck-draw"  value="">去抽奖&gt;&gt;</a></li> -->
-			</ul>
+<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/wateroPF/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/css/style.css?v=2016101701" />
+	<style>
+		.year-dalog{background:url(//s.iamberry.com/wateroPF/images/year-dalog.png) center center no-repeat rgba(0,0,0,.7);background-size: 100% auto; position: fixed;left: 0;top: 0;right: 0;bottom: 0;width: 100%; height: 100%;z-index: 99;display: none;-webkit-transform: translateY(-100%);transform: translateY(-100%); -webkit-transition: .5s;transition: .5s;}
+		.year-dalog.active{-webkit-transform: translateY(0%);transform: translateY(0%);}
+		.year-dalog img{width: 100%;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&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>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/wateroPF/images/shop/logo.png" />
+	</div>
+</header>
+<div class="mui-content" style="background: #fff;display: none;" id="show-div-data">
+	<div class="pl-win-tt">
+		<img style="width: 1.5em;" src="//s.iamberry.com/wateroPF/images/shop/pay-win.jpg"><span class="sp"> 恭喜您,支付成功!</span>
+		<div>已支付:<span class="cl-red">¥<font id="pay-money-total">0.0</font>元</span></div>
+	</div>
+	<ul class="pay_win_list">
+		<li>订单编号:<span class="cl-0" id="orderid-span">加载中...</span></li>
+		<li>支付时间:<span class="cl-0" id="pay-date-span">加载中...</span></li>
+		<li><a class="go_order_details" href="#" id="check-order-desc" value="">查看订单详情&gt;&gt;</a> </li>
+		<!-- <li><a class="go_luck_draw" href="#"  id="check-luck-draw"  value="">去抽奖&gt;&gt;</a></li> -->
+	</ul>
+</div>
 
-		<div id="QrCode">
-			<div style="width: 45%;margin: 30px auto 10px auto;padding: 10px;border: 1px solid #00d0e6;">
-				<img width="100%" src="//s.iamberry.com/wateroPF/images/system_qrcode.jpg"/>
-			</div>
-			<div class="mui-h5 mui-text-center">长按识别,关注公众号</div>
-		</div>
+<div id="QrCode">
+	<div style="width: 45%;margin: 30px auto 10px auto;padding: 10px;border: 1px solid #00d0e6;">
+		<img width="100%" src="//s.iamberry.com/wateroPF/images/system_qrcode.jpg"/>
+	</div>
+	<div class="mui-h5 mui-text-center">长按识别,关注公众号</div>
+</div>
 
-		<!-- <div class="mui-content-padded">
-				<a href="#" class="go_luck_draw" id="check-luck-draw" value=""><img width="100%" src="/iamberry/common/shop/images/wheel-buy-yes.jpg" /></a>
-			</div> -->
-		<div class="mui-content" style="background: #fff;" id="now-load-data-div-bg">
-			<ul class="pay_win_list">
-				<li><span class="cl-0">正在加载数据...</span></li>
-			</ul>
-		</div>
-		<script src="//s.iamberry.com/wateroPF/js/mui.min.js?v=2016101701"></script>
-		<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2016101701"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/pay_win.js?v=2016101701"></script>
+<!-- <div class="mui-content-padded">
+        <a href="#" class="go_luck_draw" id="check-luck-draw" value=""><img width="100%" src="/iamberry/common/shop/images/wheel-buy-yes.jpg" /></a>
+    </div> -->
+<div class="mui-content" style="background: #fff;" id="now-load-data-div-bg">
+	<ul class="pay_win_list">
+		<li><span class="cl-0">正在加载数据...</span></li>
+	</ul>
+</div>
+<!--春节放假通知-->
+<div class="year-dalog"></div>
+<script src="//s.iamberry.com/wateroPF/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/pay_win.js?v=2016101701"></script>
+
+<script>
+    var clickdate = JSON.parse(localStorage.getItem('clickdate'));
+    //春节放假通知弹窗点击事件
+    $(document).on('tap', '.year-dalog', function() {
+        if(!window.localStorage) {
+            mui.alert("您的浏览器不支持localStorage");
+        } else {
+            //自定义json数据
+            var obj = {};
+            obj = {
+                text: new Date().getTime()
+            };
+            //json格式化插入    点击时间
+            localStorage.setItem('clickdate', JSON.stringify(obj));
+        }
+        $(".year-dalog").removeClass("active");
+        setTimeout(function(){
+            $(".year-dalog").hide();
+        },500);
+    });
+    $(document).ready(function(){
+        var d = new Date().getTime();//当前时间戳
+        //弹窗提示时间为2月6日-2月23日
+        if(d > 1517760000000 && d < 1519401600000) {
+            $(".year-dalog").addClass("active").show();
+        }
+    });
 
 
+</script>
 
-		<script>
-			$(function () {
-				$("#QrCode").hide();
-				$.ajax({
-					"type":"post",
-					"url":base_path+"/member/getUser",
-					"dataType":"json",
-					"data" :{},
-					"success" : function(res) {
-						if(res.resultCode != 200){
-							$("#QrCode").show();
-						}
-					}
-				});
-			})
-		</script>
-	</body>
+<script>
+    $(function () {
+        $("#QrCode").hide();
+        $.ajax({
+            "type":"post",
+            "url":base_path+"/member/getUser",
+            "dataType":"json",
+            "data" :{},
+            "success" : function(res) {
+                if(res.resultCode != 200){
+                    $("#QrCode").show();
+                }
+            }
+        });
+    })
+</script>
+</body>
 </html>