Skip to content

semour / semour_web

Go to a project
Commit ec46896a by 杨树贤
Options

Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

parents 76c8cbc2 15fe7ef3
Inline Side-by-side
Showing with 24 additions and 12 deletions
public/assets/js/auth/reg.js
......@@ -13,6 +13,16 @@ define('reg', ['form', 'liexin_pop', 'tool'], function (require, exports, module
$("body").on("click", ".check-group", function () {
$(".verifyBox").find(".check-group").removeClass("act")
$(this).addClass("act");
if($(this).attr("guid")==2){
//个人
$(".grshow").hide();
$(".company_name").removeClass("verify")
}else{
$(".company_name").addClass("verify")
$(".grshow").show()
}
})
//第一步
$("body").on("click", ".gonext1", function () {
......
public/assets/js/common/liexin_pop.js
......@@ -159,7 +159,7 @@ define('liexin_pop', [], function (require, exports, module) {
str_ += "<input type=\"text\" placeholder=\"Email/Username\" class=\"accountxk verify\" verifyTip='{\"type\":\"email\",\"text\":\"EMAIL\"}'>"
str_ += '</div>'
str_ += '<div class="input-group-auth">'
str_ += "<input type=\"text\" placeholder=\"Password\" class=\"passwordxk verify\" verifyTip='{\"type\":\"null\",\"text\":\"Password\"}'>"
str_ += "<input type=\"password\" placeholder=\"Password\" class=\"passwordxk verify\" verifyTip='{\"type\":\"null\",\"text\":\"Password\"}'>"
str_ += '</div>'
str_ += '<div class="tips"></div>'
str_ += '<div class="but loginbut loginbutxk">Login</div>'
......
public/assets/js/common/mallUi.js
......@@ -144,7 +144,9 @@ define('mallUi', ['tool', 'liexin_pop'], function (require, exports, module) {
items: JSON.stringify(arr_),
remark: $(".allInquiryPop .inquiryremark").val()
}, function (res) {
if (res.code === 0) {
openHide()
liexin_pop.Tip({ title: res.msg },function(){
history.go(0)
})
......
resources/views/auth/forget.blade.php
......@@ -33,7 +33,7 @@
<p class="headtips">Reset Your Password</p>
<div class="input-group-auth">
<p class="labelp">NEW PASSWORD</p>
<input type="text" class="password">
<input type="password" class="password">
</div>
<div class="tip-con">
<p>· Contain at least 8 characters.</p>
......@@ -41,7 +41,7 @@
</div>
<div class="input-group-auth">
<p class="labelp ">CONFIRM PASSWORD</p>
<input type="text" class="password_confirmation">
<input type="password" class="password_confirmation">
</div>
<div class="tips tips2"></div>
<div class="but gobtn">Submit</div>
......
resources/views/auth/login.blade.php
......@@ -18,7 +18,7 @@
<input type="text" placeholder="Email/Username" class="accountxk verify" verifyTip='{"type":"email","text":"EMAIL"}'>
</div>
<div class="input-group-auth">
<input type="text" placeholder="Password" class="passwordxk verify" verifyTip='{"type":"null","text":"Password"}'>
<input type="password" placeholder="Password" class="passwordxk verify" verifyTip='{"type":"null","text":"Password"}'>
</div>
<div class="tips"></div>
<div class="but loginbut loginbutxk">Login</div>
......
resources/views/auth/register.blade.php
......@@ -31,7 +31,7 @@
<div class="input-con ">
<div class="row">
<div class="input-group-auth">
<p class="labelp"><span>*</span>COMPANY NAME</p>
<p class="labelp"><span class="grshow">*</span>COMPANY NAME</p>
<input type="text" class="verify company_name" verifyTip='{"type":"null","text":"COMPANY NAME"}'>
</div>
<div class="input-group-auth sm ml30">
......@@ -56,11 +56,11 @@
<div class="row">
<div class="input-group-auth">
<p class="labelp"><span>*</span>PASSWORD</p>
<input type="text" class="verify password" placeholder="Contain at least 8 characters" verifyTip='{"type":"null","text":"PASSWORD"}'>
<input type="password" class="verify password" placeholder="Contain at least 8 characters" verifyTip='{"type":"null","text":"PASSWORD"}'>
</div>
<div class="input-group-auth ml30">
<p class="labelp"><span>*</span>CONFIRM PASSWORD</p>
<input type="text" class="verify password_confirmation" verifyTip='{"type":"null","text":"CONFIRM PASSWORD"}'>
<input type="password" class="verify password_confirmation" verifyTip='{"type":"null","text":"CONFIRM PASSWORD"}'>
</div>
</div>
......
resources/views/user/account.blade.php
......@@ -118,12 +118,12 @@
<div class="input-con">
<div class="input-group-auth stepbox step1">
<p class="labelp">The original password</p>
<input type="text" class="passwordori verify" verifyTip='{"type":"null","text":"Original Password"}'>
<input type="password" class="passwordori verify" verifyTip='{"type":"null","text":"Original Password"}'>
</div>
<div class="stepbox step2">
<div class="input-group-auth">
<p class="labelp ">NEW PASSWORD</p>
<input type="text" class="passwordnew verify" verifyTip='{"type":"null","text":"New Password"}'>
<input type="password" class="passwordnew verify" verifyTip='{"type":"null","text":"New Password"}'>
</div>
<div class="tip-con">
<p>· Contain at least 8 characters.</p>
......@@ -131,7 +131,7 @@
</div>
<div class="input-group-auth">
<p class="labelp ">CONFIRM PASSWORD</p>
<input type="text" class="passwordnewagain verify" verifyTip='{"type":"null","text":"CONFIRM PASSWORD"}'>
<input type="password" class="passwordnewagain verify" verifyTip='{"type":"null","text":"CONFIRM PASSWORD"}'>
</div>
</div>
<div class="tips"></div>
......@@ -145,7 +145,7 @@
<div class="input-con">
<div class="input-group-auth">
<p class="labelp">Password</p>
<input type="text" class="passwordphone verify" verifyTip='{"type":"null","text":"Original Password"}'>
<input type="password" class="passwordphone verify" verifyTip='{"type":"null","text":"Original Password"}'>
</div>
<div class="input-group-auth">
<p class="labelp ">NEW Phone</p>
......@@ -163,7 +163,7 @@
<div class="input-con">
<div class="input-group-auth ">
<p class="labelp">Password</p>
<input type="text" class="passwordemail verify" verifyTip='{"type":"null","text":"Original Password"}'>
<input type="password" class="passwordemail verify" verifyTip='{"type":"null","text":"Original Password"}'>
</div>
<div class="input-group-auth">
<p class="labelp ">NEW Email</p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment