feat: ✨ 新增楼层装修 更改部分买家端UI

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/GoodsDetail.vue

@@ -3,7 +3,6 @@
     <BaseHeader></BaseHeader>
     <Search></Search>
     <drawer></drawer>
-    <ShopHeader :detail="storeMsg"></ShopHeader>
     <div class="shop-item-path">
       <div class="shop-nav-container">
         <Breadcrumb>
@@ -45,7 +44,7 @@
 
 <script>
 import Search from "@/components/Search";
-import ShopHeader from "@/components/header/ShopHeader";
+
 import ShowGoods from "@/components/goodsDetail/ShowGoods";
 import empty from "@/components/empty/Main";
 import ShowGoodsDetail from "@/components/goodsDetail/ShowGoodsDetail";
@@ -192,7 +191,6 @@ export default {
   watch: {},
   components: {
     Search,
-    ShopHeader,
     ShowGoods,
     ShowGoodsDetail,
     empty

buyer/src/pages/GoodsList.vue

@@ -1,9 +1,9 @@
 <template>
-  <div>
+  <div class="wrapper">
     <BaseHeader></BaseHeader>
     <Search @search="handleSearch"></Search>
     <drawer></drawer>
-    <cateNav></cateNav>
+    <cateNav class="cate-nav" useClass="background-white"></cateNav>
     <div class="container">
       <!-- 商品筛选栏 -->
       <GoodsClassNav @getParams="getParams"></GoodsClassNav>
@@ -261,6 +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;
@@ -288,7 +291,7 @@ export default {
 }
 .container {
   margin: 15px auto;
-  width: 1200px;
+  width: 1184px;
   min-width: 1000px;
   position: relative;
 }
@@ -299,92 +302,14 @@ export default {
   display: flex;
 }
 /* ---------------侧边广告栏开始------------------- */
-.as-box {
-  width: 200px;
-  border: 1px solid #ccc;
-}
+
 .goods-show-right {
   display: flex;
   flex-direction: row;
   margin-top: 5px;
 }
 
-.goods-show-self {
-  float: left;
-  height: 16px;
-  line-height: 16px;
-  padding: 0 3px;
-  margin-right: 3px;
-  overflow: hidden;
-  text-align: center;
-  font-style: normal;
-  font-size: 12px;
-  background: #e23a3a;
-  color: #fff;
-  border-radius: 2px;
-}
 
-.goods-show-middle {
-  float: left;
-  height: 16px;
-  line-height: 16px;
-  padding: 0 3px;
-  margin-right: 3px;
-  overflow: hidden;
-  text-align: center;
-  font-style: normal;
-  font-size: 12px;
-  border: 1px solid rgba(112, 123, 187, 0.8);
-  color: rgba(112, 123, 187, 0.8);
-}
-
-// .goods-show-middle:hover {
-//   color: rgba(2, 15, 88, 0.6);
-//   border: 0.2px solid rgba(0, 13, 87, 0.6);
-//   border-radius: 4px;
-//   line-height: 18px;
-// }
-
-.item-as-title {
-  width: 100%;
-  height: 36px;
-  color: $theme_color;
-  line-height: 36px;
-  font-size: 18px;
-}
-.item-as-title span:first-child {
-  margin-left: 20px;
-}
-.item-as-title span:last-child {
-  float: right;
-  margin-right: 15px;
-  font-size: 10px;
-  color: rgb(204, 204, 204);
-}
-.item-as {
-  width: 160px;
-  margin: 18px auto;
-}
-.item-as-img {
-  width: 160px;
-  height: 160px;
-  margin: 0px auto;
-}
-.item-as-price span {
-  font-size: 18px;
-}
-.item-as-intro {
-  margin-top: 5px;
-  font-size: 12px;
-}
-.item-as-selled {
-  margin-top: 5px;
-  font-size: 12px;
-}
-.item-as-selled span {
-  color: #005aa0;
-}
-/* ---------------侧边广告栏结束------------------- */
 
 /* ---------------商品栏开始------------------- */
 .goods-list-box {

buyer/src/pages/Index.vue

@@ -22,7 +22,7 @@
                 <Button type="error" @click="showCpmodel=false">确定</Button>
             </template>
         </Modal>
-    <drawer></drawer>
+
     <!-- 固定头部 -->
     <hover-search class="hover-search" :class="{show: topSearchShow}"></hover-search>
     <!-- 顶部广告 -->
@@ -37,6 +37,8 @@
     <model-form ref="modelForm" :data="modelForm"></model-form>
     <!-- 底部栏 -->
     <BaseFooter></BaseFooter>
+    <!-- 侧边栏 -->
+    <fixedBar class="fixed-bar" :class="{'show-fixed': topSearchShow}"></fixedBar>
   </div>
 </template>
 
@@ -44,6 +46,7 @@
 import Search from '@/components/Search';
 import ModelForm from '@/components/indexDecorate/ModelForm';
 import HoverSearch from '@/components/header/hoverSearch';
+import fixedBar from '@/components/fixed/index';
 import storage from "@/plugins/storage";
 import { indexData,getAutoCoup } from '@/api/index.js';
 import {seckillByDay} from '@/api/promotion'
@@ -77,7 +80,7 @@ export default {
     };
   },
   // created(){
-   
+
   // },
   methods: {
     // 优惠券可用范围
@@ -114,7 +117,7 @@ export default {
         // window.localStorage.setItem('getTimes',datas)//存储缓存
         this.getcps()
       }
-    },  
+    },
     getcps(){
       console.log(123123)
       let data = new Date()
@@ -139,10 +142,10 @@ export default {
               storage.setItem('getTimes',datas)//存储缓存
             }
       })
-    }, 
+    },
     handleReachBottom(){
-      console.log(111)
-    } , 
+
+    } ,
     getIndexData () {
       // 获取首页装修数据
       indexData({ clientType: 'PC' }).then(async (res) => {
@@ -181,7 +184,8 @@ export default {
   components: {
     Search,
     ModelForm,
-    HoverSearch
+    HoverSearch,
+    fixedBar
   }
 };
 </script>
@@ -213,4 +217,55 @@ export default {
   transform: translateZ(0);
   top: 0;
 }
+.fixed-bar{
+  opacity: 0 !important;
+  transform: translateY(-10px);
+  transition: .35s;
+  z-index: 999999;
+  height: 0px !important;
+  overflow: hidden;
+}
+.show-fixed{
+  height: 354px !important;
+  opacity: 1 !important;
+  transform: translateY(0);
+  -webkit-transform: translateZ(0);
+  -moz-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  -o-transform: translateZ(0);
+  transform: translateZ(0);
+}
+
+
+/* 2K */
+@media screen and (min-width: 2561px) and (max-width: 3840px) {
+  /* 样式 */
+  .fixed-bar{
+    position: fixed;
+    right:900px;
+    top: 500px;
+  }
+}
+
+/* 1080p */
+@media screen and (max-width: 2560px) {
+  /* 样式 */
+  .fixed-bar{
+    position: fixed;
+    right:300px;
+    top: 500px;
+  }
+}
+
+
+
+@media screen and (max-width: 2025px) {
+  /* 样式 */
+  .fixed-bar{
+    position: fixed;
+    right:150px;
+    top: 300px;
+  }
+}
+
 </style>

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">

buyer/src/pages/home/memberCenter/Favorites.vue

@@ -53,11 +53,12 @@ export default {
       params: { // 请求参数
         pageNumber: 1,
         pageSize: 100,
-        type: 'GOODS'
+        type: this.$route.query.type || 'GOODS'
       },
       spinShow: false // 加载状态
     };
   },
+
   methods: {
     getList () { // 获取收藏列表
       this.spinShow = true
@@ -123,6 +124,7 @@ export default {
   mounted () {
     if (this.homePage) this.params.pageSize = 5;
     this.getList()
+
   }
 };
 </script>