Browse Source

Merge branch 'master' of http://192.168.1.200/lxc/Iot

master
谕仙 2 years ago
parent
commit
c147207428
  1. 3
      lpro/build/classes/META-INF/resources/WEB-INF/oss/iot/index.jsp
  2. 10
      lpro/build/classes/META-INF/resources/WEB-INF/oss/iot/login.jsp
  3. 3
      lpro/src/main/webapp/WEB-INF/oss/iot/index.jsp
  4. 10
      lpro/src/main/webapp/WEB-INF/oss/iot/login.jsp

3
lpro/build/classes/META-INF/resources/WEB-INF/oss/iot/index.jsp

@ -35,6 +35,9 @@
<li class="layui-nav-item layui-hide-xs" > <li class="layui-nav-item layui-hide-xs" >
<a target="_blank" href="<%=basePath%>/page/bigscreen/index.html"> <a target="_blank" href="<%=basePath%>/page/bigscreen/index.html">
大屏展示 大屏展示
</a>
<a target="_blank" href="<%=basePath%>/page/bigscreen/index.html">
3D大屏展示
</a> </a>
</li> </li>
</ul> </ul>

10
lpro/build/classes/META-INF/resources/WEB-INF/oss/iot/login.jsp

@ -22,8 +22,8 @@
success:'sunccessReturn' "> success:'sunccessReturn' ">
<div class="login-title"> <div class="login-title">
<span>登录</span> <span>登录</span>
<a class="ml-10 a-link" onclick="changeMode(5)">短信登录</a> <!-- <a class="ml-10 a-link" onclick="changeMode(5)">短信登录</a>
<a class="float-right a-link" onclick="changeMode(2);">没有账户,立即注册</a> <a class="float-right a-link" onclick="changeMode(2);">没有账户,立即注册</a> -->
</div> </div>
<div class="login-input"> <div class="login-input">
<input class="input input-big na" validate="empty:请输入邮箱" type-name="name" maxlength="30" placeholder="请输入邮箱或者登陆名"> <input class="input input-big na" validate="empty:请输入邮箱" type-name="name" maxlength="30" placeholder="请输入邮箱或者登陆名">
@ -34,7 +34,7 @@
<div style="margin-left: 20px;"> <div style="margin-left: 20px;">
<button class="btn add-Btn">登录</button> <button class="btn add-Btn">登录</button>
<!-- <span onmouseenter="showImage()" class="wxStyle">微信公众号入口</span> --> <!-- <span onmouseenter="showImage()" class="wxStyle">微信公众号入口</span> -->
<a class="float-right fot-a-link" onclick="changeMode(3);">忘记密码?</a> <!-- <a class="float-right fot-a-link" onclick="changeMode(3);">忘记密码?</a> -->
<div class="checkbox-remember"> <div class="checkbox-remember">
<input type="checkbox" id="saveLogin"> <input type="checkbox" id="saveLogin">
<label for="saveLogin" class="checkbox">记住密码</label> <label for="saveLogin" class="checkbox">记住密码</label>
@ -74,10 +74,10 @@
submit:'.register-sms-Btn', submit:'.register-sms-Btn',
success:'registerSuccesssms', success:'registerSuccesssms',
before:'beforefunc' "> before:'beforefunc' ">
<div class="login-title"> <!-- <div class="login-title">
<span style="padding-right: 0;">短信注册</span><span style="padding: 0 5px;">/</span><span onclick="changeMode(2);" style="padding: 0;color: #a1a1a1;cursor:pointer;">邮件注册</span> <span style="padding-right: 0;">短信注册</span><span style="padding: 0 5px;">/</span><span onclick="changeMode(2);" style="padding: 0;color: #a1a1a1;cursor:pointer;">邮件注册</span>
<a class="float-right a-link" onclick="changeMode(1);">已有账户,立即登录</a> <a class="float-right a-link" onclick="changeMode(1);">已有账户,立即登录</a>
</div> </div> -->
<div class="login-input"> <div class="login-input">
<input class="input input-big telphone" validate="empty:请输入手机号,phone:请输入正确的手机号" type-name="phone" maxlength="30" placeholder="请输入手机号"> <input class="input input-big telphone" validate="empty:请输入手机号,phone:请输入正确的手机号" type-name="phone" maxlength="30" placeholder="请输入手机号">
</div> </div>

3
lpro/src/main/webapp/WEB-INF/oss/iot/index.jsp

@ -35,6 +35,9 @@
<li class="layui-nav-item layui-hide-xs" > <li class="layui-nav-item layui-hide-xs" >
<a target="_blank" href="<%=basePath%>/page/bigscreen/index.html"> <a target="_blank" href="<%=basePath%>/page/bigscreen/index.html">
大屏展示 大屏展示
</a>
<a target="_blank" href="<%=basePath%>/page/bigscreen/index.html">
3D大屏展示
</a> </a>
</li> </li>
</ul> </ul>

10
lpro/src/main/webapp/WEB-INF/oss/iot/login.jsp

@ -22,8 +22,8 @@
success:'sunccessReturn' "> success:'sunccessReturn' ">
<div class="login-title"> <div class="login-title">
<span>登录</span> <span>登录</span>
<a class="ml-10 a-link" onclick="changeMode(5)">短信登录</a> <!-- <a class="ml-10 a-link" onclick="changeMode(5)">短信登录</a>
<a class="float-right a-link" onclick="changeMode(2);">没有账户,立即注册</a> <a class="float-right a-link" onclick="changeMode(2);">没有账户,立即注册</a> -->
</div> </div>
<div class="login-input"> <div class="login-input">
<input class="input input-big na" validate="empty:请输入邮箱" type-name="name" maxlength="30" placeholder="请输入邮箱或者登陆名"> <input class="input input-big na" validate="empty:请输入邮箱" type-name="name" maxlength="30" placeholder="请输入邮箱或者登陆名">
@ -34,7 +34,7 @@
<div style="margin-left: 20px;"> <div style="margin-left: 20px;">
<button class="btn add-Btn">登录</button> <button class="btn add-Btn">登录</button>
<!-- <span onmouseenter="showImage()" class="wxStyle">微信公众号入口</span> --> <!-- <span onmouseenter="showImage()" class="wxStyle">微信公众号入口</span> -->
<a class="float-right fot-a-link" onclick="changeMode(3);">忘记密码?</a> <!-- <a class="float-right fot-a-link" onclick="changeMode(3);">忘记密码?</a> -->
<div class="checkbox-remember"> <div class="checkbox-remember">
<input type="checkbox" id="saveLogin"> <input type="checkbox" id="saveLogin">
<label for="saveLogin" class="checkbox">记住密码</label> <label for="saveLogin" class="checkbox">记住密码</label>
@ -74,10 +74,10 @@
submit:'.register-sms-Btn', submit:'.register-sms-Btn',
success:'registerSuccesssms', success:'registerSuccesssms',
before:'beforefunc' "> before:'beforefunc' ">
<div class="login-title"> <!-- <div class="login-title">
<span style="padding-right: 0;">短信注册</span><span style="padding: 0 5px;">/</span><span onclick="changeMode(2);" style="padding: 0;color: #a1a1a1;cursor:pointer;">邮件注册</span> <span style="padding-right: 0;">短信注册</span><span style="padding: 0 5px;">/</span><span onclick="changeMode(2);" style="padding: 0;color: #a1a1a1;cursor:pointer;">邮件注册</span>
<a class="float-right a-link" onclick="changeMode(1);">已有账户,立即登录</a> <a class="float-right a-link" onclick="changeMode(1);">已有账户,立即登录</a>
</div> </div> -->
<div class="login-input"> <div class="login-input">
<input class="input input-big telphone" validate="empty:请输入手机号,phone:请输入正确的手机号" type-name="phone" maxlength="30" placeholder="请输入手机号"> <input class="input input-big telphone" validate="empty:请输入手机号,phone:请输入正确的手机号" type-name="phone" maxlength="30" placeholder="请输入手机号">
</div> </div>

Loading…
Cancel
Save