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 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;
 
                 .th {
-                    font-size    : 14px;
+                    font-size    : 13px;
                     color        : #333;
                     font-weight  : bold;
                     box-sizing   : border-box;

public/assets/css/user/orderdetail.min.css

-.orderdetailbox .user-right{width:1024px;min-height:500px;background:#FFFFFF;padding-bottom:30px}.orderdetailbox .user-right .head{height:22px;line-height:22px;padding:0 28px;padding-top:28px}.orderdetailbox .user-right .head .ordersn{font-size:16px;color:#222;font-weight:bold}.orderdetailbox .user-right .head .sale{color:#174D9A;font-size:14px;margin-left:60px}.orderdetailbox .user-right .head .down{display:block;color:#555;height:22px;font-size:14px;cursor:pointer}.orderdetailbox .user-right .head .down i{font-size:22px;margin-left:40px}.orderdetailbox .user-right .head .down span{margin-right:4px;position:relative;top:-3px}.orderdetailbox .user-right .head .down:hover{color:#174D9A}.orderdetailbox .user-right .stausbox{margin-top:44px}.orderdetailbox .user-right .stausbox .stausimg{width:940px;height:80px;margin:0 auto}.orderdetailbox .user-right .stausbox .stausimg.step1{background:url(../../images/user/step1.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step2{background:url(../../images/user/step2.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step3{background:url(../../images/user/step3.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step4{background:url(../../images/user/step4.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step5{background:url(../../images/user/step5.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step6{background:url(../../images/user/step6.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step7{background:url(../../images/user/step7.png) no-repeat}.orderdetailbox .user-right .stausbox .staustime{margin-top:6px;color:#666;font-size:14px}.orderdetailbox .user-right .stausbox .staustime div{width:72px;text-align:center;position:relative}.orderdetailbox .user-right .stausbox .staustime div.left10{left:-10px}.orderdetailbox .user-right .stausbox .staustime div.left8{left:-8px}.orderdetailbox .user-right .stausbox .staustime div.left5{left:-5px}.orderdetailbox .user-right .stausbox .staustime div.left1{left:5px}.orderdetailbox .user-right .h3{font-size:16px;font-weight:bold;color:#222;padding:0 28px;margin-top:50px;margin-bottom:20px}.orderdetailbox .user-right .list-table1{width:974px;margin:0 auto;border-radius:0px 0px 8px 8px;margin-top:20px}.orderdetailbox .user-right .list-table1 .w47{width:47px}.orderdetailbox .user-right .list-table1 .w184{width:184px}.orderdetailbox .user-right .list-table1 .w155{width:155px}.orderdetailbox .user-right .list-table1 .w120{width:120px}.orderdetailbox .user-right .list-table1 .w88{width:88px}.orderdetailbox .user-right .list-table1 .w103{width:103px}.orderdetailbox .user-right .list-table1 .w100{width:100px}.orderdetailbox .user-right .list-table1 .thead{height:38px;background:#DFEAFA;line-height:38px;border-radius:8px 8px 0px 0px;padding:0 15px}.orderdetailbox .user-right .list-table1 .thead .th{font-size:14px;color:#333;font-weight:bold;box-sizing:border-box;padding-right:5px}.orderdetailbox .user-right .list-table1 .tbody{font-size:14px;color:#555;border-radius:0px 0px 8px 8px;background:#F7FAFF;overflow:hidden}.orderdetailbox .user-right .list-table1 .tbody input{width:132px;height:26px;background:#FAFAFA;border:1px solid #DFEAFA;border-radius:4px;line-height:26px;color:#333}.orderdetailbox .user-right .list-table1 .tbody .tr{line-height:20px;border-bottom:1px solid #DFEAFA;padding:20px 15px;box-sizing:border-box}.orderdetailbox .user-right .list-table1 .tbody .tr .td{word-break:break-all;box-sizing:border-box;padding-right:5px}.orderdetailbox .user-right .list-table1 .tbody .tr:last-child{border:0px}.orderdetailbox .user-right .list-table1 .tbody .tr.sxbox{background:rgba(51,51,51,0.2)}.orderdetailbox .user-right .list-table1 .tbody .tr.sxbox input{background:none;border:1px solid #BCBCBC}.orderdetailbox .user-right .list-table1 .tbody .pdf{color:#F68332;font-size:20px}.orderdetailbox .user-right .list-table1 .tbody .sx{width:100px;height:20px;border:1px solid #EE1919;border-radius:14px;color:#EE1919;font-size:14px;text-align:center;line-height:20px;position:relative;top:1px}.orderdetailbox .user-right .bot{width:974px;margin:0 auto;margin-top:20px}.orderdetailbox .user-right .bot .info-group{width:487px;margin-bottom:20px}.orderdetailbox .user-right .bot .info-group.rp{width:974px}.orderdetailbox .user-right .bot .info-group .ht{font-size:16px;color:#222;font-weight:bold;margin-bottom:10px}.orderdetailbox .user-right .bot .info-group .ml20{margin-left:30px}.orderdetailbox .user-right .bot .info-group .hcon{font-size:14px;color:#555;padding-left:18px}.orderdetailbox .user-right .bot .info-group p{line-height:30px}.orderdetailbox .salebox{padding:20px}.orderdetailbox .salebox .sale-head{font-size:16px;color:#222;height:36px;line-height:36px}.orderdetailbox .salebox .sale-head span{font-weight:bold}.orderdetailbox .salebox .sale-head .icarrow{color:#174D9A;margin-right:398px;position:relative;top:-2px;cursor:pointer}.orderdetailbox .salebox .h4{font-size:16px;color:#333;font-weight:bold;margin-top:15px}.orderdetailbox .salebox .list-table{margin:0 auto;border-radius:0px 0px 8px 8px;margin-top:20px}.orderdetailbox .salebox .list-table .w43{width:43px}.orderdetailbox .salebox .list-table .w100{width:100px}.orderdetailbox .salebox .list-table .w80{width:80px}.orderdetailbox .salebox .list-table .w90{width:90px}.orderdetailbox .salebox .list-table .w110{width:110px}.orderdetailbox .salebox .list-table .w120{width:120px}.orderdetailbox .salebox .list-table .w130{width:130px}.orderdetailbox .salebox .list-table .thead{height:38px;background:#DFEAFA;line-height:38px;border-radius:8px 8px 0px 0px}.orderdetailbox .salebox .list-table .thead .th{font-size:14px;color:#333;font-weight:bold;box-sizing:border-box;padding:0 3px;text-align:center}.orderdetailbox .salebox .list-table .tbody{font-size:14px;color:#555;border-radius:0px 0px 8px 8px;background:#F7FAFF;overflow:hidden}.orderdetailbox .salebox .list-table .tbody .tr{line-height:20px;border-bottom:1px solid #DFEAFA;padding:10px 0px;box-sizing:border-box}.orderdetailbox .salebox .list-table .tbody .tr .td{word-break:break-all;box-sizing:border-box;padding:0 3px;text-align:center}.orderdetailbox .salebox .list-table .tbody .tr:last-child{border:0px}.orderdetailbox .salebox .sale-total{font-size:14px;color:#222;font-weight:bold;text-align:right;margin-top:20px}.orderdetailbox .salebox .sale-total span{font-weight:bold}.orderdetailbox .salebox .address-group{padding:0 15px;font-size:14px;color:#555;position:relative}.orderdetailbox .salebox .address-group .info{margin-top:22px}.orderdetailbox .salebox .address-group .info .name{min-width:159px;margin-right:70px}.orderdetailbox .salebox .address-group .info .email{margin-left:70px;margin-right:70px}.orderdetailbox .salebox .address-group .addre{height:32px;line-height:32px;margin-top:23px}.orderdetailbox .salebox .address-group .edit-shipping-btn{width:74px;height:32px;background:#164D9A;border-radius:8px;line-height:32px;text-align:center;color:#fff;cursor:pointer;position:absolute;top:-10px;right:50px}.getCountryBox{position:relative}.getCountryBox .conps{display:none;position:absolute;top:33px;left:0px;width:320px;height:200px;overflow-y:auto;background:#fff;box-shadow:0 0 10px #ccc;padding:15px 0}.getCountryBox .conps .citem{height:28px;line-height:28px;padding:0 20px;color:#164D9A;cursor:pointer}.getCountryBox .conps .citem:hover{background:#DFEAFA}
\ No newline at end of file
+.orderdetailbox .user-right{width:1024px;min-height:500px;background:#FFFFFF;padding-bottom:30px}.orderdetailbox .user-right .head{height:22px;line-height:22px;padding:0 28px;padding-top:28px}.orderdetailbox .user-right .head .ordersn{font-size:16px;color:#222;font-weight:bold}.orderdetailbox .user-right .head .sale{color:#174D9A;font-size:14px;margin-left:60px}.orderdetailbox .user-right .head .down{display:block;color:#555;height:22px;font-size:14px;cursor:pointer}.orderdetailbox .user-right .head .down i{font-size:22px;margin-left:40px}.orderdetailbox .user-right .head .down span{margin-right:4px;position:relative;top:-3px}.orderdetailbox .user-right .head .down:hover{color:#174D9A}.orderdetailbox .user-right .stausbox{margin-top:44px}.orderdetailbox .user-right .stausbox .stausimg{width:940px;height:80px;margin:0 auto}.orderdetailbox .user-right .stausbox .stausimg.step1{background:url(../../images/user/step1.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step2{background:url(../../images/user/step2.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step3{background:url(../../images/user/step3.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step4{background:url(../../images/user/step4.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step5{background:url(../../images/user/step5.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step6{background:url(../../images/user/step6.png) no-repeat}.orderdetailbox .user-right .stausbox .stausimg.step7{background:url(../../images/user/step7.png) no-repeat}.orderdetailbox .user-right .stausbox .staustime{margin-top:6px;color:#666;font-size:14px}.orderdetailbox .user-right .stausbox .staustime div{width:72px;text-align:center;position:relative}.orderdetailbox .user-right .stausbox .staustime div.left10{left:-10px}.orderdetailbox .user-right .stausbox .staustime div.left8{left:-8px}.orderdetailbox .user-right .stausbox .staustime div.left5{left:-5px}.orderdetailbox .user-right .stausbox .staustime div.left1{left:5px}.orderdetailbox .user-right .h3{font-size:16px;font-weight:bold;color:#222;padding:0 28px;margin-top:50px;margin-bottom:20px}.orderdetailbox .user-right .list-table1{width:974px;margin:0 auto;border-radius:0px 0px 8px 8px;margin-top:20px}.orderdetailbox .user-right .list-table1 .w47{width:47px}.orderdetailbox .user-right .list-table1 .w184{width:184px}.orderdetailbox .user-right .list-table1 .w155{width:155px}.orderdetailbox .user-right .list-table1 .w120{width:120px}.orderdetailbox .user-right .list-table1 .w88{width:88px}.orderdetailbox .user-right .list-table1 .w103{width:103px}.orderdetailbox .user-right .list-table1 .w100{width:100px}.orderdetailbox .user-right .list-table1 .thead{height:38px;background:#DFEAFA;line-height:38px;border-radius:8px 8px 0px 0px;padding:0 15px}.orderdetailbox .user-right .list-table1 .thead .th{font-size:13px;color:#333;font-weight:bold;box-sizing:border-box;padding-right:5px}.orderdetailbox .user-right .list-table1 .tbody{font-size:14px;color:#555;border-radius:0px 0px 8px 8px;background:#F7FAFF;overflow:hidden}.orderdetailbox .user-right .list-table1 .tbody input{width:132px;height:26px;background:#FAFAFA;border:1px solid #DFEAFA;border-radius:4px;line-height:26px;color:#333}.orderdetailbox .user-right .list-table1 .tbody .tr{line-height:20px;border-bottom:1px solid #DFEAFA;padding:20px 15px;box-sizing:border-box}.orderdetailbox .user-right .list-table1 .tbody .tr .td{word-break:break-all;box-sizing:border-box;padding-right:5px}.orderdetailbox .user-right .list-table1 .tbody .tr:last-child{border:0px}.orderdetailbox .user-right .list-table1 .tbody .tr.sxbox{background:rgba(51,51,51,0.2)}.orderdetailbox .user-right .list-table1 .tbody .tr.sxbox input{background:none;border:1px solid #BCBCBC}.orderdetailbox .user-right .list-table1 .tbody .pdf{color:#F68332;font-size:20px}.orderdetailbox .user-right .list-table1 .tbody .sx{width:100px;height:20px;border:1px solid #EE1919;border-radius:14px;color:#EE1919;font-size:14px;text-align:center;line-height:20px;position:relative;top:1px}.orderdetailbox .user-right .bot{width:974px;margin:0 auto;margin-top:20px}.orderdetailbox .user-right .bot .info-group{width:487px;margin-bottom:20px}.orderdetailbox .user-right .bot .info-group.rp{width:974px}.orderdetailbox .user-right .bot .info-group .ht{font-size:16px;color:#222;font-weight:bold;margin-bottom:10px}.orderdetailbox .user-right .bot .info-group .ml20{margin-left:30px}.orderdetailbox .user-right .bot .info-group .hcon{font-size:14px;color:#555;padding-left:18px}.orderdetailbox .user-right .bot .info-group p{line-height:30px}.orderdetailbox .salebox{padding:20px}.orderdetailbox .salebox .sale-head{font-size:16px;color:#222;height:36px;line-height:36px}.orderdetailbox .salebox .sale-head span{font-weight:bold}.orderdetailbox .salebox .sale-head .icarrow{color:#174D9A;margin-right:398px;position:relative;top:-2px;cursor:pointer}.orderdetailbox .salebox .h4{font-size:16px;color:#333;font-weight:bold;margin-top:15px}.orderdetailbox .salebox .list-table{margin:0 auto;border-radius:0px 0px 8px 8px;margin-top:20px}.orderdetailbox .salebox .list-table .w43{width:43px}.orderdetailbox .salebox .list-table .w100{width:100px}.orderdetailbox .salebox .list-table .w80{width:80px}.orderdetailbox .salebox .list-table .w90{width:90px}.orderdetailbox .salebox .list-table .w110{width:110px}.orderdetailbox .salebox .list-table .w120{width:120px}.orderdetailbox .salebox .list-table .w130{width:130px}.orderdetailbox .salebox .list-table .thead{height:38px;background:#DFEAFA;line-height:38px;border-radius:8px 8px 0px 0px}.orderdetailbox .salebox .list-table .thead .th{font-size:14px;color:#333;font-weight:bold;box-sizing:border-box;padding:0 3px;text-align:center}.orderdetailbox .salebox .list-table .tbody{font-size:14px;color:#555;border-radius:0px 0px 8px 8px;background:#F7FAFF;overflow:hidden}.orderdetailbox .salebox .list-table .tbody .tr{line-height:20px;border-bottom:1px solid #DFEAFA;padding:10px 0px;box-sizing:border-box}.orderdetailbox .salebox .list-table .tbody .tr .td{word-break:break-all;box-sizing:border-box;padding:0 3px;text-align:center}.orderdetailbox .salebox .list-table .tbody .tr:last-child{border:0px}.orderdetailbox .salebox .sale-total{font-size:14px;color:#222;font-weight:bold;text-align:right;margin-top:20px}.orderdetailbox .salebox .sale-total span{font-weight:bold}.orderdetailbox .salebox .address-group{padding:0 15px;font-size:14px;color:#555;position:relative}.orderdetailbox .salebox .address-group .info{margin-top:22px}.orderdetailbox .salebox .address-group .info .name{min-width:159px;margin-right:70px}.orderdetailbox .salebox .address-group .info .email{margin-left:70px;margin-right:70px}.orderdetailbox .salebox .address-group .addre{height:32px;line-height:32px;margin-top:23px}.orderdetailbox .salebox .address-group .edit-shipping-btn{width:74px;height:32px;background:#164D9A;border-radius:8px;line-height:32px;text-align:center;color:#fff;cursor:pointer;position:absolute;top:-10px;right:50px}.getCountryBox{position:relative}.getCountryBox .conps{display:none;position:absolute;top:33px;left:0px;width:320px;height:200px;overflow-y:auto;background:#fff;box-shadow:0 0 10px #ccc;padding:15px 0}.getCountryBox .conps .citem{height:28px;line-height:28px;padding:0 20px;color:#164D9A;cursor:pointer}.getCountryBox .conps .citem:hover{background:#DFEAFA}
\ No newline at end of file

resources/views/auth/login.blade.php

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