Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/webapp/WEB-INF/views/home/pc_index.ftl

@@ -38,7 +38,7 @@
 <header class="navbar-wrapper">
     <input type="hidden" id="parent_is_login" value="1" placeholder="用于判断是否存在父级页面！">
     <div class="navbar navbar-fixed-top">
-        <div class="container-fluid cl"> <a class="logo navbar-logo-m f-l mr-10 visible-xs" href="#">Watero-RST</a>
+        <div class="container-fluid cl"><a class="logo navbar-logo hidden-xs" href="#"><img src="/common/images/index/admin-login.png" style="height: 40px;"></a><a class="logo navbar-logo-m f-l mr-10 visible-xs" href="#">Watero-RST</a>
             <span class="logo navbar-slogan f-l mr-10 hidden-xs"></span>
             <a aria-hidden="false" class="nav-toggle Hui-iconfont visible-xs" href="javascript:;">&#xe667;</a>
             <nav id="Hui-userbar" class="nav navbar-nav navbar-userbar hidden-xs">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -76,7 +76,7 @@
             </div>
             <div class="row cl" id="salesCustomer" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-2 col-sm-2" style="margin-left: 10%;width: 100%;color: #c00;">
+                <div class="formControls col-2 col-sm-2" style="margin-left: 11.3%;width: 100%;color: #c00;">
                     <div class="formControls col-1 col-sm-1" id="selectCustomer" style="display: none;">
                         <input type="button" style="color: #32a3d8;border: 1px solid #32a3d8;" class="btn" onclick="add_customer()" value="选择客诉">
                     </div>

watero-rst-web/src/main/webapp/common/static/h-ui.admin/css/H-ui.admin.css

@@ -18,7 +18,7 @@ h4{line-height:30px}
 
 /*页面框架*/
 .Hui-header{position:absolute;top:0; right:0; left:0;height:44px;z-index:999; padding:0 15px}
-.Hui-aside{position: absolute;top:44px;bottom:0;left:0;padding-top:10px;width:199px;z-index:99;overflow:auto; background-color:#58d1eb;_background-color:#58d1eb;border-right: 1px solid #e5e5e5}
+.Hui-aside{position: absolute;top:44px;bottom:0;left:0;padding-top:10px;width:199px;z-index:99;overflow:auto; background-color:#58d1eb;_background-color:#58d1eb;border-right:0}
 .Hui-article-box{position: absolute;top:44px;right:0;bottom: 0;left:138px; overflow:hidden; z-index:1; background-color:#fff}
 	.Hui-article{position: absolute;top:34px;bottom:0;left:0; right:0;overflow:auto;z-index:1}
 .Hui-container{ padding:45px 0 0}
@@ -46,7 +46,7 @@ h4{line-height:30px}
 #Hui-msg .badge{ position:absolute; left:19px; top:4px; font-size:12px; font-weight:normal; padding:1px 5px}
 /*左侧菜单*/
 .Hui-aside .menu_dropdown dl{ margin-bottom:0}
-.Hui-aside .menu_dropdown dt{display:block;line-height:50px;padding-left:29px;cursor:pointer;position:relative;border-bottom: 1px solid #e5e5e5;font-weight:normal;border-left: 4px solid #292f36;}
+.Hui-aside .menu_dropdown dt{display:block;line-height:50px;padding-left:35px;cursor:pointer;position:relative;border-bottom: 1px solid #e5e5e5;font-weight:normal;border-left: 4px solid #292f36;}
 .Hui-aside .menu_dropdown dt .menu_dropdown-arrow{ position:absolute;overflow: hidden; top:0; right:15px;transition-duration:0.3s ;transition-property:all}
 .Hui-aside .menu_dropdown dd{ display:none}
 .Hui-aside .menu_dropdown dt.selected .menu_dropdown-arrow{transform: rotate(180deg)}
@@ -57,8 +57,8 @@ h4{line-height:30px}
 .Hui-aside .menu_dropdown li a i{ font-weight: normal}
 .Hui-aside .menu_dropdown dd ul{padding:3px 5px}
 .Hui-aside .menu_dropdown dd li{line-height:32px;text-indent: 0.5em;position: relative;font-size: 12px;}
-.Hui-aside .menu_dropdown dd li.active:after{ content: '';position: absolute;width: 6px;height: 6px;left: 10px;top: 18px;border-radius: 6px;background: #fff;}
-.Hui-aside .menu_dropdown dd li a{line-height:42px;padding-left:14px; border-bottom:none; font-weight:normal}
+.Hui-aside .menu_dropdown dd li.active:after{ content: '';position: absolute;width: 6px;height: 6px;left: 24px;top: 18px;border-radius: 6px;background: #fff;}
+.Hui-aside .menu_dropdown dd li a{line-height:42px;padding-left:28px; border-bottom:none; font-weight:normal}
 .Hui-aside .menu_dropdown li a:hover{text-decoration:none}
 .Hui-aside .menu_dropdown li.current a,.menu_dropdown li.current a:hover{background-color:#89e4f8;}
 /*菜单收缩切换*/