优化了部分展示功能

buyer/src/components/header/Header.vue

@@ -223,7 +223,6 @@ export default {
   font-weight: normal;
   text-decoration: none;
 
-  border-left: 1px solid #ccc !important;
   cursor: pointer;
   color: #fff;
 }

buyer/src/components/indexDecorate/modelList/Carousel.vue

@@ -19,7 +19,7 @@
         </Carousel>
       </div>
       <div class="nav-right">
-        <div class="person-msg">
+        <div class="person-msg" @click="entryControl({ path: 'home' })">
           <img class="user-face" :src="userInfo.face || defaultAvatar"  alt />
           <div class="welcome">
             Hi, {{
@@ -27,7 +27,9 @@
             }}
           </div>
           <div v-if="userInfo.id">
-            <div class="icon-list flex flex-j-sb" >
+            <div class="icon-list"></div>
+            <!-- #TODO 后续增加 -->
+            <!-- <div class="icon-list flex flex-j-sb" >
               <div class="icon-item" :key="index"  @click="entryControl(item)" v-for="(item,index) in recentList">
                 <div class="value">
                   {{ item.value}}
@@ -36,7 +38,7 @@
                   {{ item.label}}
                 </div>
               </div>
-            </div>
+            </div> -->
           </div>
           <div v-else class="flex flex-a-c ">
             <div class="btns" @click="$router.push('login')" shape="circle"
@@ -173,6 +175,7 @@ export default {
 
   color: #666666;
 }
+
 .swiper-img {
   overflow: hidden;
   width: 637px;
@@ -182,14 +185,17 @@ export default {
 .icon-list {
   width: 216px
 }
+
 .icon-list:nth-last-of-type(1) {
   margin-top: 20px;
 }
+
 .hot-box {
   margin-top: 35px;
   width: 216px;
 
 }
+
 .hot-tag {
   margin-right: 6px;
   width: 36px;
@@ -202,21 +208,25 @@ export default {
   text-align: center;
   line-height: 18px;
 }
+
 .gray-line {
   width: 216px;
   height: 1px;
   border: 1px solid #E5E5E5;
   margin-bottom: 13px;
 }
+
 .icon {
   width: 20px !important;
   height: 20px !important;
   margin-bottom: 7px;
 }
+
 .icon-item {
 
   cursor: pointer;
   text-align: center;
+
   >div {
     font-size: 11px;
     font-weight: normal;
@@ -226,6 +236,7 @@ export default {
 
     color: #666666;
   }
+
   >.value {
     font-size: 14px;
 
@@ -236,6 +247,7 @@ export default {
     margin-bottom: 3px;
     color: $theme_color;
   }
+
   >.label {
     font-weight: 400;
     font-size: 12px;
@@ -247,11 +259,13 @@ export default {
     margin-bottom: 13px;
   }
 }
+
 .model-carousel {
   width: 1200px;
   height: 340px;
   overflow: hidden;
 }
+
 .hover-pointer {
   //display: block;
   //width: 100%;
@@ -263,6 +277,7 @@ export default {
 
 
 }
+
 .welcome {
   font-size: 14px;
   font-weight: normal;
@@ -272,11 +287,13 @@ export default {
 
   color: #333333;
 }
+
 .hr {
   width: 216px;
   height: 1px;
   border: 1px solid #E5E5E5;
 }
+
 .btns {
   margin-top: 21px;
   margin-bottom: 13px;
@@ -294,13 +311,16 @@ export default {
   color: #FFFFFF;
   background: $theme_color;
 }
+
 .sign-up {
   background: #F39519;
   margin-left: 10px;
 }
+
 .avatar {
   margin-bottom: 13px;
 }
+
 .user-face {
 
   margin-bottom: 12px;
@@ -342,6 +362,7 @@ export default {
   float: left;
   position: relative;
 }
+
 .nav-right {
   float: left;
   margin-top: 10px;
@@ -350,7 +371,9 @@ export default {
 
   border-radius: 10px;
   background: #FFFFFF;
+
   .person-msg {
+    cursor: pointer;
     height: 333px;
     display: flex;
     align-items: center;
@@ -360,27 +383,33 @@ export default {
 
 
   }
+
   .shop-msg {
     div {
       width: 100%;
       margin: 10px 27px;
+
       span {
         cursor: pointer;
         text-align: center;
         font-weight: bold;
         margin-left: 5px;
       }
+
       span:nth-child(1) {
         @include content_color($theme_color);
         margin-left: 0;
       }
+
       span:nth-child(2) {
         font-weight: normal;
       }
+
       span:nth-child(3):hover {
         color: $theme_color;
       }
     }
+
     ul {
       li {
         cursor: pointer;
@@ -388,6 +417,7 @@ export default {
         color: #999395;
         width: 150px;
         font-size: 12px;
+
         &:hover {
           color: $theme_color;
         }

buyer/src/pages/Cart.vue

@@ -10,7 +10,7 @@
           >)
         </div>
       </div>
-      <Search :showTag="false" :showLogo="false"></Search>
+
     </div>
     <Divider />
     <!-- 购物车主体 -->
@@ -245,7 +245,7 @@
       </div>
       <Spin size="large" fix v-if="loading"></Spin>
     </div>
-    <BaseFooter></BaseFooter>
+    <BaseFooter class="footer"></BaseFooter>
   </div>
 </template>
 
@@ -449,6 +449,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.footer{
+  margin-top: 10px;
+}
 /** logo 搜索 start **/
 .logo {
   height: 40px;
@@ -781,4 +784,5 @@ export default {
 .ivu-input-number-input {
   text-align: center;
 }
+
 </style>

buyer/src/pages/GoodsList.vue

@@ -3,7 +3,7 @@
     <BaseHeader></BaseHeader>
     <Search @search="handleSearch"></Search>
     <drawer></drawer>
-    <cateNav useClass="background-white"></cateNav>
+    <cateNav class="cate-nav" useClass="background-white"></cateNav>
     <div class="container">
       <!-- 商品筛选栏 -->
       <GoodsClassNav @getParams="getParams"></GoodsClassNav>
@@ -261,7 +261,9 @@ export default {
 
 <style scoped lang="scss">
 @import "../assets/styles/goodsList.scss";
-
+.cate-nav{
+  margin-top: 10px;
+}
 .goods-show-info > .goods-show-seller > .goods-show-buyer {
   width: 35px;
   height: 17px;

buyer/src/pages/ShoppingCart.vue

@@ -2,7 +2,7 @@
   <div>
     <BaseHeader></BaseHeader>
     <Search></Search>
-    <cateNav></cateNav>
+
     <!-- 添加成功提示 -->
     <div class="add-info-box-container">
       <div class="add-info-box">

manager/src/views/page-decoration/modelConfig.js

@@ -300,25 +300,6 @@ export const modelData = [{
       ]
     },
   },
-  {
-    type: 'seckill-only-album',
-    name: '促销活动-图片版',
-    icon: 'md-image',
-    showName: '',
-    options: {
-      list: [{
-        time: 6,
-        goodsList: [{
-          img: require('@/assets/nav/1.jpg'),
-
-          url: ''
-        },
-
-        ]
-      },
-      ]
-    },
-  },
   {
     type: 'discountAdvert',
     name: '折扣广告',