Home Explore Help
Sign In
hexiugang
/
iamberry-common-parent
Watch 3
Star 3
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 years ago
parent
76bce24b15
commit
ca61701ec6
2 changed files with 88 additions and 0 deletions
Split View Show Diff Stats
  1. 50 0
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html
  2. 38 0
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/pay_win.html

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

@@ -13,6 +13,11 @@
 
 	<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" />
 
+	<style>
 
+		.year-dalog{background:url(//s.iamberry.com/watero/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/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>
 
+<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月9日-2月22日
 
+        if(d > 1518019200000 && d < 1519315200000) {
 
+            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>

+ 38 - 0
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/pay_win.html
View File 

@@ -9,6 +9,11 @@
 
 	<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>
 
+		.year-dalog{background:url(//s.iamberry.com/watero/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;
 
@@ -65,10 +70,43 @@
 
 		<li><span class="cl-0">正在加载数据...</span></li>
 
 	</ul>
 
 </div>
 
+<!--春节放假通知-->
 
+<div class="year-dalog"></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/pay_win.js?v=2016101701"></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月9日-2月22日
 
+        if(d > 1518019200000 && d < 1519315200000) {
 
+            //本地没有存储时间也显示弹窗
 
+            $(".year-dalog").addClass("active").show();
 
+        }
 
+    });
 
+
 
+
 
+</script>
 
 </html>