4 years ago · e033737090
--- a/src/main/java/com/minpay/shouhuo/equmentaction/MachineManageAction.java
+++ b/src/main/java/com/minpay/shouhuo/equmentaction/MachineManageAction.java
@@ -688,14 +688,14 @@ public class MachineManageAction implements IMINAction {
 
				         //渠道
			
 
				         String channel = user.getChannel();
			
 
				         //校验设备是否正常
			
 
				-        VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class)
			
 
				+        /*VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class)
			
 
				                 .getMybatisMapper(VmEquipmentInfMapper.class)
			
 
				                 .selectByPrimaryKey(equId);
			
 
				         if (equipmentInf == null) {
			
 
				             throw new MINBusinessException("该设备不存在!");
			
 
				         } else if (equipmentInf.getState().equals(Constant.EQUIPMENT_STT_03)) {
			
 
				             throw new MINBusinessException("该设备已销毁!");
			
 
				-        }
			
 
				+        }*/
			
 
				         int comcosAndsal = CommonUtil.compare(costPrice, sallPrice);
			
 
				 
			
 
				         int comproAndsal = CommonUtil.compare(promottonPrice, sallPrice);
			
--- a/src/main/webapp/WEB-INF/config.properties
+++ b/src/main/webapp/WEB-INF/config.properties
@@ -7,6 +7,9 @@ dataSource.url=jdbc:mysql://123.138.111.28:3506/shouhuoji?useUnicode=true&charac
 
				 dataSource.username=shouhuoji_user
			
 
				 dataSource.password=123456
			
 
				 
			
 
				+#dataSource.url=jdbc:mysql://bj-cdb-cwuz68g2.sql.tencentcdb.com:61132/shouhuoji?useUnicode=true&characterEncoding=UTF8
			
 
				+#dataSource.username=root
			
 
				+#dataSource.password=root@2020
			
 
				 
			
 
				 config.MINDebug=false
			
 
				 config.MINTraceInvoker=true
			
--- a/src/main/webapp/admin/h5/2222.html
+++ b/src/main/webapp/admin/h5/2222.html
@@ -0,0 +1,164 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="ZH-cn">
			
 
				+
			
 
				+<head>
			
 
				+    <meta charset="UTF-8">
			
 
				+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
			
 
				+    <title>登录界面</title>
			
 
				+    <script src="../../js/min-loader.js"></script>
			
 
				+    <link rel="stylesheet" href="../../css/login.css">
			
 
				+</head>
			
 
				+
			
 
				+<body>
			
 
				+<div class="kit-login">
			
 
				+    <div class="kit-login-bg"></div>
			
 
				+    <div class="kit-login-wapper">
			
 
				+        <h2 class="kit-login-slogan">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
			
 
				+        <div class="kit-login-form">
			
 
				+            <h4 class="kit-login-title">登录</h4>
			
 
				+            <form class="layui-form">
			
 
				+                <div class="kit-login-row">
			
 
				+                    <div class="kit-login-col">
			
 
				+                        <i class="layui-icon">&#xe612;</i>
			
 
				+                        <span class="kit-login-input">
			
 
				+                <input type="text" id="loginName" name="loginName" lay-verify="required" placeholder="用户名/手机号" />
			
 
				+              </span>
			
 
				+                    </div>
			
 
				+                    <div class="kit-login-col"></div>
			
 
				+                </div>
			
 
				+                <div class="kit-login-row">
			
 
				+                    <div class="kit-login-col">
			
 
				+                        <i class="layui-icon">&#xe64c;</i>
			
 
				+                        <span class="kit-login-input">
			
 
				+                <input type="password" id="password" name="password" lay-verify="required" placeholder="密码" />
			
 
				+              </span>
			
 
				+                    </div>
			
 
				+                    <div class="kit-login-col"></div>
			
 
				+                </div>
			
 
				+                <div class="kit-login-row">
			
 
				+                    <div class="kit-login-col">
			
 
				+                        <input type="checkbox" id="rememberMe" name="rememberMe" title="记住帐号" lay-skin="primary">
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <div class="kit-login-row">
			
 
				+                    <button class="layui-btn kit-login-btn" lay-submit="submit" lay-filter="login_hash">登录</button>
			
 
				+                </div>
			
 
				+                <div class="kit-login-row" style="margin-bottom:0;">
			
 
				+                    <a href="javascript:;" style="color: rgb(153, 153, 153); text-decoration: none; font-size: 13px;" id="forgot">忘记密码</a>
			
 
				+                </div>
			
 
				+            </form>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</div>
			
 
				+
			
 
				+<script>
			
 
				+    function GetQueryString(name)
			
 
				+
			
 
				+    {
			
 
				+
			
 
				+        var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
			
 
				+
			
 
				+        var r = window.location.search.substr(1).match(reg);
			
 
				+
			
 
				+        if(r!=null)return  unescape(r[2]); return null;
			
 
				+
			
 
				+    }
			
 
				+    var auth_code = GetQueryString('auth_code');
			
 
				+    alert(auth_code);
			
 
				+    $.request({
			
 
				+        action : '../../LoginAction/login',
			
 
				+        data : {
			
 
				+            code : auth_code,
			
 
				+            type : 'AL',
			
 
				+            channel: 'V01',
			
 
				+            equNo:'100059',
			
 
				+        },
			
 
				+        success : function(data) {
			
 
				+        },
			
 
				+        error : function(data) {
			
 
				+        }
			
 
				+    });
			
 
				+
			
 
				+
			
 
				+    layui.use(['layer', 'form'], function() {
			
 
				+
			
 
				+        var form = layui.form,
			
 
				+            $ = layui.jquery;
			
 
				+
			
 
				+
			
 
				+        $('#forgot').on('click', function() {
			
 
				+            layer.msg('请联系管理员.');
			
 
				+        });
			
 
				+        $("#loginName").val(getSpVal("loginUserName"));
			
 
				+        //监听提交
			
 
				+        form.on('submit(login_hash)', function(data) {
			
 
				+            clearLove();
			
 
				+            // layer.msg(JSON.stringify(data.field));
			
 
				+            var userName = data.field.loginName;
			
 
				+            var userPwd = data.field.password;
			
 
				+            // 如果密码是选中状态
			
 
				+            var reMak = data.field.rememberMe;
			
 
				+            loginIn(userName,userPwd,reMak);
			
 
				+            return false;
			
 
				+        });
			
 
				+    });
			
 
				+    function loginIn(userName,userPwd,reMak){
			
 
				+        /* 	$.request({
			
 
				+                action : "SystemAction/login",
			
 
				+                data : {
			
 
				+                        userName : userName,//用户名
			
 
				+                        userPwd : userPwd//密码
			
 
				+                    },
			
 
				+                success : function(data) {
			
 
				+                    setTempVal("isLogin", true);
			
 
				+                    if(reMak == 'on') {
			
 
				+                        setSpVal("loginUserName", userName);
			
 
				+                    }
			
 
				+                    if(data.MINStatus == '0'){
			
 
				+                        setTempVal("loginUserId", data.loginUserId);
			
 
				+                        //存入用户身份
			
 
				+                        setTempVal("loginIdentity", data.loginIdentity);
			
 
				+                        window.location.href='index.html';
			
 
				+                    }
			
 
				+                    else {
			
 
				+                        layer.alert(data.MINErrorMessage, {
			
 
				+                            icon: 5,
			
 
				+                            title: "提示"
			
 
				+                        });
			
 
				+                    }
			
 
				+                },
			
 
				+                error : function(data) {
			
 
				+                     layer.alert(data.MINErrorMessage, {
			
 
				+                            icon: 5,
			
 
				+                            title: "提示"
			
 
				+                    });
			
 
				+                }
			
 
				+            }); */
			
 
				+        $.Alert('请用手机通过小程序登录!');
			
 
				+    }
			
 
				+</script>
			
 
				+<!-- 键盘事件 -->
			
 
				+<script type="text/javascript" language=JavaScript charset="UTF-8">
			
 
				+    document.onkeydown=function(event){
			
 
				+        var e = event || window.event || arguments.callee.caller.arguments[0];
			
 
				+        if(e && e.keyCode==27){ // 按 Esc
			
 
				+            //要做的事情
			
 
				+        }
			
 
				+        if(e && e.keyCode==113){ // 按 F2
			
 
				+            //要做的事情
			
 
				+        }
			
 
				+        if(e && e.keyCode==13){ // enter 键
			
 
				+            clearLove();
			
 
				+            var userName = $("#loginName").val();
			
 
				+            var userPwd = $("#password").val();
			
 
				+            // 如果密码是选中状态
			
 
				+            var reMak =  $("#rememberMe").val();
			
 
				+            loginIn(userName,userPwd,reMak);
			
 
				+            return false;
			
 
				+        }
			
 
				+    };
			
 
				+</script>
			
 
				+</body>
			
 
				+
			
 
				+</html>
			
--- a/src/main/webapp/admin/h5/index.html
+++ b/src/main/webapp/admin/h5/index.html
--- a/src/main/webapp/admin/h5/static/img/grid_01.6df56d9b.png
+++ b/src/main/webapp/admin/h5/static/img/grid_01.6df56d9b.png
--- a/src/main/webapp/admin/h5/static/img/icon_add.e2165da8.png
+++ b/src/main/webapp/admin/h5/static/img/icon_add.e2165da8.png
--- a/src/main/webapp/admin/h5/static/img/icon_del.ca797400.png
+++ b/src/main/webapp/admin/h5/static/img/icon_del.ca797400.png
--- a/src/main/webapp/admin/h5/static/img/img1.060033c2.jpg
+++ b/src/main/webapp/admin/h5/static/img/img1.060033c2.jpg
--- a/src/main/webapp/admin/h5/static/js/chunk-vendors.1c8c4f3e.js
+++ b/src/main/webapp/admin/h5/static/js/chunk-vendors.1c8c4f3e.js
--- a/src/main/webapp/admin/h5/static/js/chunk-vendors.1fb33334.js
+++ b/src/main/webapp/admin/h5/static/js/chunk-vendors.1fb33334.js
--- a/src/main/webapp/admin/h5/static/js/chunk-vendors.2e440d48.js
+++ b/src/main/webapp/admin/h5/static/js/chunk-vendors.2e440d48.js
--- a/src/main/webapp/admin/h5/static/js/chunk-vendors.c23747ca.js
+++ b/src/main/webapp/admin/h5/static/js/chunk-vendors.c23747ca.js
--- a/src/main/webapp/admin/h5/static/js/chunk-vendors.d5e7e3f7.js
+++ b/src/main/webapp/admin/h5/static/js/chunk-vendors.d5e7e3f7.js
--- a/src/main/webapp/admin/h5/static/js/chunk-vendors.e4b44dc6.js
+++ b/src/main/webapp/admin/h5/static/js/chunk-vendors.e4b44dc6.js
--- a/src/main/webapp/admin/h5/static/js/index.047e9937.js
+++ b/src/main/webapp/admin/h5/static/js/index.047e9937.js
--- a/src/main/webapp/admin/h5/static/js/index.0f730bb7.js
+++ b/src/main/webapp/admin/h5/static/js/index.0f730bb7.js
--- a/src/main/webapp/admin/h5/static/js/index.177be309.js
+++ b/src/main/webapp/admin/h5/static/js/index.177be309.js
--- a/src/main/webapp/admin/h5/static/js/index.1f090ca1.js
+++ b/src/main/webapp/admin/h5/static/js/index.1f090ca1.js
--- a/src/main/webapp/admin/h5/static/js/index.29dda2c5.js
+++ b/src/main/webapp/admin/h5/static/js/index.29dda2c5.js
--- a/src/main/webapp/admin/h5/static/js/index.356ea511.js
+++ b/src/main/webapp/admin/h5/static/js/index.356ea511.js
--- a/src/main/webapp/admin/h5/static/js/index.3ad1e543.js
+++ b/src/main/webapp/admin/h5/static/js/index.3ad1e543.js
--- a/src/main/webapp/admin/h5/static/js/index.4907cfa4.js
+++ b/src/main/webapp/admin/h5/static/js/index.4907cfa4.js
--- a/src/main/webapp/admin/h5/static/js/index.5d253f61.js
+++ b/src/main/webapp/admin/h5/static/js/index.5d253f61.js
--- a/src/main/webapp/admin/h5/static/js/index.985a2a39.js
+++ b/src/main/webapp/admin/h5/static/js/index.985a2a39.js
--- a/src/main/webapp/admin/h5/static/js/index.a38e53b4.js
+++ b/src/main/webapp/admin/h5/static/js/index.a38e53b4.js
--- a/src/main/webapp/admin/h5/static/js/index.a5d2d003.js
+++ b/src/main/webapp/admin/h5/static/js/index.a5d2d003.js
--- a/src/main/webapp/admin/h5/static/js/index.b0e88c5e.js
+++ b/src/main/webapp/admin/h5/static/js/index.b0e88c5e.js
--- a/src/main/webapp/admin/h5/static/js/index.b12111ca.js
+++ b/src/main/webapp/admin/h5/static/js/index.b12111ca.js
--- a/src/main/webapp/admin/h5/static/js/index.b45a8e0b.js
+++ b/src/main/webapp/admin/h5/static/js/index.b45a8e0b.js
--- a/src/main/webapp/admin/h5/static/js/index.d4fb5c0e.js
+++ b/src/main/webapp/admin/h5/static/js/index.d4fb5c0e.js
--- a/src/main/webapp/admin/h5/static/js/index.d5496c38.js
+++ b/src/main/webapp/admin/h5/static/js/index.d5496c38.js
--- a/src/main/webapp/admin/h5/static/js/index.d6da4067.js
+++ b/src/main/webapp/admin/h5/static/js/index.d6da4067.js
--- a/src/main/webapp/admin/h5/static/js/index.f877dbe0.js
+++ b/src/main/webapp/admin/h5/static/js/index.f877dbe0.js
--- a/src/main/webapp/admin/h5/static/js/pages-detail-detail.0f5238a1.js
+++ b/src/main/webapp/admin/h5/static/js/pages-detail-detail.0f5238a1.js
--- a/src/main/webapp/admin/h5/static/js/pages-detail-detail.2ae81a8b.js
+++ b/src/main/webapp/admin/h5/static/js/pages-detail-detail.2ae81a8b.js
--- a/src/main/webapp/admin/h5/static/js/pages-detail-detail.9536b589.js
+++ b/src/main/webapp/admin/h5/static/js/pages-detail-detail.9536b589.js
--- a/src/main/webapp/admin/h5/static/js/pages-detail-detail.b6a832e0.js
+++ b/src/main/webapp/admin/h5/static/js/pages-detail-detail.b6a832e0.js
--- a/src/main/webapp/admin/h5/static/js/pages-detail-detail.caf886c9.js
+++ b/src/main/webapp/admin/h5/static/js/pages-detail-detail.caf886c9.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.14d0a0a9.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.14d0a0a9.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.1cb6ea6b.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.1cb6ea6b.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.444ebabc.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.444ebabc.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.5fd0d41d.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.5fd0d41d.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.862ed199.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.862ed199.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.a616b6cb.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.a616b6cb.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.ad16428b.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.ad16428b.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.b8c55a06.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.b8c55a06.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.bd8463ae.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.bd8463ae.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.d99670f3.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.d99670f3.js
--- a/src/main/webapp/admin/h5/static/js/pages-game-game.decddc51.js
+++ b/src/main/webapp/admin/h5/static/js/pages-game-game.decddc51.js
--- a/src/main/webapp/admin/h5/static/js/pages-index-index.5d9e6fa6.js
+++ b/src/main/webapp/admin/h5/static/js/pages-index-index.5d9e6fa6.js
--- a/src/main/webapp/admin/h5/static/js/pages-index-index.61895767.js
+++ b/src/main/webapp/admin/h5/static/js/pages-index-index.61895767.js
--- a/src/main/webapp/admin/h5/static/js/pages-index-index.91e30165.js
+++ b/src/main/webapp/admin/h5/static/js/pages-index-index.91e30165.js
--- a/src/main/webapp/admin/h5/static/js/pages-machine-detail-detail.2c18eae5.js
+++ b/src/main/webapp/admin/h5/static/js/pages-machine-detail-detail.2c18eae5.js
--- a/src/main/webapp/admin/h5/static/js/pages-machine-device-device.398872ad.js
+++ b/src/main/webapp/admin/h5/static/js/pages-machine-device-device.398872ad.js
--- a/src/main/webapp/admin/h5/static/js/pages-machine-financial-financial.daf93670.js
+++ b/src/main/webapp/admin/h5/static/js/pages-machine-financial-financial.daf93670.js
--- a/src/main/webapp/admin/h5/static/js/pages-machine-goods-goods.ce40805a.js
+++ b/src/main/webapp/admin/h5/static/js/pages-machine-goods-goods.ce40805a.js
--- a/src/main/webapp/admin/h5/static/js/pages-machine-index-index.28195fc5.js
+++ b/src/main/webapp/admin/h5/static/js/pages-machine-index-index.28195fc5.js
--- a/src/main/webapp/admin/h5/static/js/pages-machine-new-new.ba4d328c.js
+++ b/src/main/webapp/admin/h5/static/js/pages-machine-new-new.ba4d328c.js
--- a/src/main/webapp/admin/h5/static/js/pages-machine-passage-passage.842d7df8.js
+++ b/src/main/webapp/admin/h5/static/js/pages-machine-passage-passage.842d7df8.js
--- a/src/main/webapp/admin/h5/static/js/pages-machine-replenish-replenish.a719540a.js
+++ b/src/main/webapp/admin/h5/static/js/pages-machine-replenish-replenish.a719540a.js
--- a/src/main/webapp/admin/h5/static/js/pages-payresult-payresult.2c392c86.js
+++ b/src/main/webapp/admin/h5/static/js/pages-payresult-payresult.2c392c86.js
--- a/src/main/webapp/admin/h5/static/js/pages-payresult-payresult.7c179df5.js
+++ b/src/main/webapp/admin/h5/static/js/pages-payresult-payresult.7c179df5.js
--- a/src/main/webapp/admin/h5/static/js/pages-payresult-payresult.b34cddea.js
+++ b/src/main/webapp/admin/h5/static/js/pages-payresult-payresult.b34cddea.js
--- a/src/main/webapp/admin/h5/static/js/pages-payresult-payresult.d137791c.js
+++ b/src/main/webapp/admin/h5/static/js/pages-payresult-payresult.d137791c.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-balance-balance.6fb106d0.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-balance-balance.6fb106d0.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-balance-balance.d3ba8c85.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-balance-balance.d3ba8c85.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-index-index.2585a879.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-index-index.2585a879.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-order-order.03c7cd93.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-order-order.03c7cd93.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-order-order.0656aa3f.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-order-order.0656aa3f.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-order-order.43229333.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-order-order.43229333.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-order-order.64e8b955.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-order-order.64e8b955.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-order-order.af855c73.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-order-order.af855c73.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-order-order.be30f1aa.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-order-order.be30f1aa.js
--- a/src/main/webapp/admin/h5/static/js/pages-personal-records-records.a11a5871.js
+++ b/src/main/webapp/admin/h5/static/js/pages-personal-records-records.a11a5871.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.16f7f8d9.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.16f7f8d9.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.182b998e.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.182b998e.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.1cbc3140.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.1cbc3140.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.1f66518e.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.1f66518e.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.218f14dd.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.218f14dd.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.271b6822.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.271b6822.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.35f707ee.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.35f707ee.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.4acf2178.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.4acf2178.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.584bdc65.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.584bdc65.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.68635378.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.68635378.js
--- a/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.dd965857.js
+++ b/src/main/webapp/admin/h5/static/js/pages-turntable-turntable.dd965857.js
--- a/src/main/webapp/admin/h5/static/js/pages-winingresult-winingresult.c5e7439b.js
+++ b/src/main/webapp/admin/h5/static/js/pages-winingresult-winingresult.c5e7439b.js
--- a/src/main/webapp/web/login.html
+++ b/src/main/webapp/web/login.html
@@ -53,81 +53,8 @@
 
				 </div>
			
 
				 
			
 
				 <script>
			
 
				-  layui.use(['layer', 'form'], function() {
			
 
				-    var form = layui.form,
			
 
				-            $ = layui.jquery;
			
 
				+  window.location.href="https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021002111628201&scope=auth_user&redirect_uri=http://shjservices.personalpay.cn/services/admin/h5/2222.html";
			
 
				 
			
 
				-    $('#forgot').on('click', function() {
			
 
				-      layer.msg('请联系管理员.');
			
 
				-    });
			
 
				-    $("#loginName").val(getSpVal("loginUserName"));
			
 
				-    //监听提交
			
 
				-    form.on('submit(login_hash)', function(data) {
			
 
				-      clearLove();
			
 
				-      // layer.msg(JSON.stringify(data.field));
			
 
				-      var userName = data.field.loginName;
			
 
				-      var userPwd = data.field.password;
			
 
				-      // 如果密码是选中状态
			
 
				-      var reMak = data.field.rememberMe;
			
 
				-      loginIn(userName,userPwd,reMak);
			
 
				-      return false;
			
 
				-    });
			
 
				-  });
			
 
				-  function loginIn(userName,userPwd,reMak){
			
 
				-    /* 	$.request({
			
 
				-			action : "SystemAction/login",
			
 
				-			data : {
			
 
				-					userName : userName,//用户名
			
 
				-					userPwd : userPwd//密码
			
 
				-				},
			
 
				-			success : function(data) {
			
 
				-				setTempVal("isLogin", true);
			
 
				-				if(reMak == 'on') {
			
 
				-					setSpVal("loginUserName", userName);
			
 
				-				}
			
 
				-				if(data.MINStatus == '0'){
			
 
				-					setTempVal("loginUserId", data.loginUserId);
			
 
				-					//存入用户身份
			
 
				-					setTempVal("loginIdentity", data.loginIdentity);
			
 
				-					window.location.href='index.html';
			
 
				-				}
			
 
				-				else {
			
 
				-					layer.alert(data.MINErrorMessage, {
			
 
				-						icon: 5,
			
 
				-						title: "提示"
			
 
				-					});
			
 
				-				}
			
 
				-			},
			
 
				-			error : function(data) {
			
 
				-				 layer.alert(data.MINErrorMessage, {
			
 
				-						icon: 5,
			
 
				-						title: "提示"
			
 
				-				});
			
 
				-			}
			
 
				-		}); */
			
 
				-    $.Alert('请用手机通过小程序登录!');
			
 
				-  }
			
 
				-</script>
			
 
				-<!-- 键盘事件 -->
			
 
				-<script type="text/javascript" language=JavaScript charset="UTF-8">
			
 
				-  document.onkeydown=function(event){
			
 
				-    var e = event || window.event || arguments.callee.caller.arguments[0];
			
 
				-    if(e && e.keyCode==27){ // 按 Esc
			
 
				-      //要做的事情
			
 
				-    }
			
 
				-    if(e && e.keyCode==113){ // 按 F2
			
 
				-      //要做的事情
			
 
				-    }
			
 
				-    if(e && e.keyCode==13){ // enter 键
			
 
				-      clearLove();
			
 
				-      var userName = $("#loginName").val();
			
 
				-      var userPwd = $("#password").val();
			
 
				-      // 如果密码是选中状态
			
 
				-      var reMak =  $("#rememberMe").val();
			
 
				-      loginIn(userName,userPwd,reMak);
			
 
				-      return false;
			
 
				-    }
			
 
				-  };
			
 
				 </script>
			
 
				 </body>