Merge branch 'master' of http://119.23.72.7/shiyu/icsales

Application/Index/Conf/config_url.php

 <?php
 return array(
     'URL_MAP_RULES' => array(//静态路由
-
+        'serviceAgreement' => 'Index/serviceAgreement',
+        'legalStatement' => 'Index/legalStatement',
     )
 );

Application/Index/Controller/IndexController.class.php

@@ -19,4 +19,20 @@ class IndexController extends BaseController
 
         $this->display('Index/index');
     }
+
+    /**
+     * 服务协议
+     */
+    public function serviceAgreement()
+    {
+        $this->display('ServiceAgreement/index');
+    }
+
+    /**
+     * 法律声明
+     */
+    public function legalStatement()
+    {
+        $this->display('ServiceAgreement/legalStatement');
+    }
 }

dist/js/person/login.js

@@ -280,6 +280,24 @@
                 
                 window.location.href = home_url;
                 
+              } else if (res.errcode === 505) {
+                
+                $(".error-text").hide();
+                
+                layer.confirm('账户被禁用，请联系0755-23940717，进行解禁', {
+                  btn: ['取消', '联系客服']
+                }, function () {
+                  layer.closeAll();
+                }, function () {
+                  layer.msg('0755-23940717', {
+                    time: 8000
+                  });
+                });
+                
+                opt.isClick = false;
+                
+                $(data.elem).removeClass("layui-btn-disabled");
+                
               } else {
                 
                 layer.msg(res.errmsg);
@@ -316,6 +334,24 @@
                 
                 window.location.href = home_url;
                 
+              } else if (res.errcode === 505) {
+                
+                $(".error-text").hide();
+                
+                layer.confirm('账户被禁用，请联系0755-23940717，进行解禁', {
+                  btn: ['取消', '联系客服']
+                }, function () {
+                  layer.closeAll();
+                }, function () {
+                  layer.msg('0755-23940717', {
+                    time: 8000
+                  });
+                });
+                
+                opt.isClick = false;
+                
+                $(data.elem).removeClass("layui-btn-disabled");
+                
               } else {
                 
                 $(".error-text").hide();