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

app/Http/Controllers/Api/SearchApiController.php

@@ -12,7 +12,7 @@ class SearchApiController extends Controller
 {
 {
      public $soUrl;
      public $soUrl;
      public function __construct(){
      public function __construct(){
-         $this->soUrl = env("so_url");
+         $this->soUrl = env("SO_URL");
      }
      }
 
 
     //搜索列表
     //搜索列表

public/assets/css/user/orderdetail.less

@@ -164,7 +164,7 @@
                 padding      : 0 15px;
                 padding      : 0 15px;
 
 
                 .th {
                 .th {
-                    font-size    : 14px;
+                    font-size    : 13px;
                     color        : #333;
                     color        : #333;
                     font-weight  : bold;
                     font-weight  : bold;
                     box-sizing   : border-box;
                     box-sizing   : border-box;

resources/views/auth/login.blade.php

@@ -10,6 +10,7 @@
 @include('common.headerTop')
 @include('common.headerTop')
 
 
 
 
+
 <div class="authpage">
 <div class="authpage">
     <div class="auth-con boxsiz row verCenter">
     <div class="auth-con boxsiz row verCenter">
         <div class="auth-box forgetStep1">
         <div class="auth-box forgetStep1">