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

Application/Home/View/Home/index.html

@@ -58,7 +58,7 @@
                         <div class="search_command clr">
                             <span class="fl comman_title">热门搜索:</span>
                             <div class="fl command_name">
-                                <div class="fl active">LM358</div>
+                                <div class="fl">LM358</div>
                                 <div class="fl">LM358</div>
                                 <div class="fl">LM358</div>
                                 <div class="fl">LM358</div>

dist/css/common/base.css

@@ -296,9 +296,9 @@ body {
 }
 .goods_data_list .my_xj_list .my_xj_item {
   background-color: #fff;
-  box-shadow: 0px 5px 10px 0px rgba(216, 223, 230, 0.5);
   margin: 20px 0 0 20px;
   padding: 20px;
+  transition: all 0.2s ease-in-out;
 }
 .goods_data_list .my_xj_list .my_xj_item .item_top .num {
   font-size: 16px;
@@ -360,6 +360,9 @@ body {
   margin-left: 10px;
   width: calc(100% - 58px);
 }
+.goods_data_list .my_xj_list .my_xj_item:hover {
+  box-shadow: 0px 5px 10px 0px rgba(216, 223, 230, 0.5);
+}
 @media screen and (max-width: 1440px) {
   .goods_data_list .my_xj_list .my_xj_item {
     width: calc(33.33% - 20px);
@@ -744,7 +747,7 @@ body {
   font-size: 16px;
   cursor: pointer;
   color: #686E73;
-  border: 1px solid #fff;
+  border-top: 1px solid #E6ECF2;
   box-shadow: 2px 2px 10px 0px rgba(230, 236, 242, 0.5);
 }
 .right_header {

dist/css/common/base.less

@@ -353,9 +353,9 @@ body {
 
     .my_xj_item {
       background-color: #fff;
-      box-shadow: 0px 5px 10px 0px rgba(216, 223, 230, 0.5);
       margin: 20px 0 0 20px;
       padding: 20px;
+      transition: all 0.2s ease-in-out;
 
       .item_top {
         .num {
@@ -436,6 +436,10 @@ body {
 
         }
       }
+
+      &:hover {
+        box-shadow: 0px 5px 10px 0px rgba(216, 223, 230, 0.5);
+      }
     }
 
     @media screen and (max-width: 1440px) {

dist/css/common/navleft.less

@@ -118,7 +118,7 @@
       font-size: 16px;
       cursor: pointer;
       color: #686E73;
-      border: 1px solid #fff;
+      border-top: 1px solid #E6ECF2;
       box-shadow: 2px 2px 10px 0px rgba(230, 236, 242, 0.5);
     }
   }

dist/css/home.css

@@ -115,7 +115,8 @@
   cursor: pointer;
   transition: all 0.2s ease-in-out;
 }
-.home_content .search_section .search_command .command_name div.active {
+.home_content .search_section .search_command .command_name div.active,
+.home_content .search_section .search_command .command_name div:hover {
   color: #0D84D1;
 }
 .home_content .xj_title {
@@ -123,7 +124,7 @@
 }
 .home_content .xj_title span {
   height: 20px;
-  width: 2px;
+  width: 4px;
   background-color: #0D84D1;
   vertical-align: sub;
   margin-right: 13px;
@@ -232,3 +233,4 @@
   margin: 0;
   cursor: pointer;
 }
+/*# sourceMappingURL=home.css.map */
\ No newline at end of file

dist/css/home.css.map

-{"version":3,"sources":["home.less"],"names":[],"mappings":"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","file":"home.css"}
\ No newline at end of file
+{"version":3,"sources":["home.less"],"names":[],"mappings":"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","file":"home.css"}
\ No newline at end of file

dist/css/home.less

@@ -141,7 +141,7 @@
                     cursor: pointer;
                     transition: all 0.2s ease-in-out;
 
-                    &.active {
+                    &.active ,&:hover{
                         color: #0D84D1;
                     }
                 }
@@ -155,7 +155,7 @@
 
         span {
             height: 20px;
-            width: 2px;
+            width: 4px;
             background-color: #0D84D1;
             vertical-align: sub;
             margin-right: 13px;