客诉订单列表样式

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -56,7 +56,7 @@
             <br>
             <#--<input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">-->
          <div class="search-other" >
-            <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="margin-left:30px;height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
+            <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="margin-left:94px;height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
                 <option value="">处理结果</option>
                 <#if procTypeList?? &&  (procTypeList?size > 0) >
                     <#list procTypeList as type>
@@ -130,7 +130,7 @@
                     </#list>
                 </#if>
             </select>
-            <select class="my-select" name="storeId" id="storeId" style="height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
+            <select class="my-select" name="storeId" id="storeId" style="height: 36px;width: 198px;padding: 12px 10px 6px 15px;">
             <option value="">店铺名称</option>
         <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
             <#list listStoreInfo as info>

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}