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

public/assets/js/auth/reg.js

@@ -14,7 +14,7 @@ define('reg', ['form', 'liexin_pop', 'tool'], function (require, exports, module
                 $(".verifyBox").find(".check-group").removeClass("act")
                 $(this).addClass("act");
            
-                if($(this).attr("guid")==2){
+                if($(this).attr("guid")==1){
                     //个人
                     $(".grshow").hide();
                     $(".company_name").removeClass("verify")
@@ -93,6 +93,7 @@ define('reg', ['form', 'liexin_pop', 'tool'], function (require, exports, module
                     post_code: $(".post_code3").val(),
                 }, function (res) {
                     if (res.code === 0) {
+                        
                         liexin_pop.Tip({ title: "Success"})
                         setTimeout(function(){
                             reg.successJump()

public/assets/js/car/confirm.js

@@ -133,6 +133,7 @@ define('confirm', ['liexin_pop','form','artTemplate'], function (require, export
             $("body").on("click", ".choosetrs", function () {
                 $(".choosetbodys .choosetrs").removeClass("act")
                 $(this).addClass("act")
+                
             })
             $("body").on("click", ".choosesubmit", function () {
                 if (!$(".choosetbodys .choosetrs.act").hasClass("choosetrs")) {
@@ -233,6 +234,14 @@ define('confirm', ['liexin_pop','form','artTemplate'], function (require, export
             $("body").on("click", ".check-group-addressp", function () {
                 $(".check-group-addressp").removeClass("act")
                 $(this).addClass("act")
+                if($(this).attr("guid")==1){
+                    //个人
+                    $(".grshow").hide();
+                    $(".company_name6").removeClass("verify")
+                }else{
+                    $(".company_name6").addClass("verify")
+                    $(".grshow").show()
+                }
             })
 
 
@@ -269,9 +278,14 @@ define('confirm', ['liexin_pop','form','artTemplate'], function (require, export
             $.liexin_ajax('/api/user_address/detail', 'GET', {address_id:guid_}, function (res) {
                 if (res.code === 0) {
                     $(".addressPop .check-group").removeClass("act")
-                    $(".addressPop .check-group[guid='1']").addClass("act")
-                    if(res.data.address_type==2){
-                        $(".addressPop .check-group[guid='2']").addClass("act")
+                    $(".addressPop .check-group[guid='"+res.data.address_type+"']").addClass("act")
+                    if(res.data.address_type==1){
+                        //个人
+                        $(".grshow").hide();
+                        $(".company_name6").removeClass("verify")
+                    }else{
+                        $(".company_name6").addClass("verify")
+                        $(".grshow").show()
                     }
                     $(".addressPop .email6").val(res.data.email)
                     $(".addressPop .telephone6").val(res.data.phone)
@@ -319,8 +333,9 @@ define('confirm', ['liexin_pop','form','artTemplate'], function (require, export
             }
             $.liexin_ajax(url_, 'POST', obj_, function (res) {
                 if (res.code == 0) {
-                    liexin_pop.Tip({ title: res.msg },function(){
                     openHide()
+                    liexin_pop.Tip({ title: res.msg },function(){
+                        
                         var guid_=ele.attr("guid")?ele.attr("guid"):res.data
                         confirm.getAddress(guid_)
                     })

public/assets/js/user/account.js

@@ -62,9 +62,17 @@ define('account', ['tool', 'liexin_pop', 'form', 'artTemplate'], function (requi
                 }
             })
             //切换属性
-            $("body").on("click", ".check-group", function () {
-                $(".changeInfoPop").find(".check-group").removeClass("act")
+            $("body").on("click", ".check-group-addressp", function () {
+                $(".changeInfoPop").find(".check-group-addressp").removeClass("act")
                 $(this).addClass("act");
+                if($(this).attr("guid")==1){
+                    //个人
+                    $(".grshow").hide();
+                    $(".company_name6").removeClass("verify")
+                }else{
+                    $(".company_name6").addClass("verify")
+                    $(".grshow").show()
+                }
             })
             //修改密码
             $(".infobase .changepasswordbtn").click(function () {
@@ -281,9 +289,14 @@ define('account', ['tool', 'liexin_pop', 'form', 'artTemplate'], function (requi
             $.liexin_ajax('/api/user_address/detail', 'GET', {address_id:guid_}, function (res) {
                 if (res.code === 0) {
                     $(".addressPop .check-group").removeClass("act")
-                    $(".addressPop .check-group[guid='1']").addClass("act")
-                    if(res.data.address_type==2){
-                        $(".addressPop .check-group[guid='2']").addClass("act")
+                    $(".addressPop .check-group[guid='"+res.data.address_type+"']").addClass("act")
+                    if(res.data.address_type==1){
+                        //个人
+                        $(".grshow").hide();
+                        $(".company_name6").removeClass("verify")
+                    }else{
+                        $(".company_name6").addClass("verify")
+                        $(".grshow").show()
                     }
                     $(".addressPop .email6").val(res.data.email)
                     $(".addressPop .telephone6").val(res.data.phone)
@@ -331,8 +344,8 @@ define('account', ['tool', 'liexin_pop', 'form', 'artTemplate'], function (requi
             }
             $.liexin_ajax(url_, 'POST', obj_, function (res) {
                 if (res.code == 0) {
-                    liexin_pop.Tip({ title: res.msg },function(){
                     openHide()
+                    liexin_pop.Tip({ title: res.msg },function(){
                         account.getAddress()
                     })
                 } else {

resources/views/auth/register.blade.php

@@ -15,13 +15,13 @@
             <div class="inputboxp boxsiz verifyBox">
                 <p class="headtips">WHO IS THIS ACCOUNT FOR?</p>
                 <div class="checkbox row">
-                    <div class="check-group row act" guid="1">
+                    <div class="check-group row act" guid="2">
                         <p class="row   verCenter rowCenter">
                             <font></font>
                         </p>
                         <span>For Business</span>
                     </div>
-                    <div class="check-group row" guid="2">
+                    <div class="check-group row" guid="1">
                         <p class="row   verCenter rowCenter">
                             <font></font>
                         </p>

resources/views/car/confirm.blade.php

@@ -123,13 +123,13 @@
 <div class="addressPop" style="display:none;">
     <div class="inputboxp">
         <div class="checkbox row">
-            <div class="check-group row act check-group-addressp" guid="1">
+            <div class="check-group row act check-group-addressp" guid="2">
                 <p class="row   verCenter rowCenter">
                     <font></font>
                 </p>
                 <span>Company</span>
             </div>
-            <div class="check-group row check-group-addressp" guid="2">
+            <div class="check-group row check-group-addressp" guid="1">
                 <p class="row   verCenter rowCenter">
                     <font></font>
                 </p>
@@ -157,7 +157,7 @@
                     <input type="text" class="last_name6 verify" verifyTip='{"type":"null","text":"LAST NAME"}'>
                 </div>
                 <div class="input-group-auth  ml30">
-                    <p class="labelp"><span>*</span>COMPANY NAME</p>
+                    <p class="labelp"><span class="grshow">*</span>COMPANY NAME</p>
                     <input type="text" class="company_name6 verify" verifyTip='{"type":"null","text":"COMPANY NAME"}'>
                 </div>
             </div>

resources/views/user/account.blade.php

@@ -221,13 +221,13 @@
 <div class="addressPop" style="display:none;">
     <div class="inputboxp">
         <div class="checkbox row">
-            <div class="check-group row act check-group-addressp" guid="1">
+            <div class="check-group row act check-group-addressp" guid="2">
                 <p class="row   verCenter rowCenter">
                     <font></font>
                 </p>
                 <span>Company</span>
             </div>
-            <div class="check-group row check-group-addressp" guid="2">
+            <div class="check-group row check-group-addressp" guid="1">
                 <p class="row   verCenter rowCenter">
                     <font></font>
                 </p>
@@ -255,7 +255,7 @@
                     <input type="text" class="last_name6 verify" verifyTip='{"type":"null","text":"LAST NAME"}'>
                 </div>
                 <div class="input-group-auth  ml30">
-                    <p class="labelp"><span>*</span>COMPANY NAME</p>
+                    <p class="labelp"><span class="grshow">*</span>COMPANY NAME</p>
                     <input type="text" class="company_name6 verify" verifyTip='{"type":"null","text":"COMPANY NAME"}'>
                 </div>
             </div>