From 2213f0d0ced82e5d3c07c8f972c3238b6226961f Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Fri, 21 Apr 2023 17:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=A5=BC=E5=B1=82=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/assets/styles/global.scss           |  4 +
 buyer/src/components/Search.vue               | 10 +--
 buyer/src/components/fixed/index.vue          | 14 +--
 buyer/src/components/header/Header.vue        |  4 +-
 buyer/src/components/header/ShopHeader.vue    | 62 -------------
 .../indexDecorate/ModelFormItem.vue           |  5 --
 .../indexDecorate/modelList/Carousel.vue      | 15 ++--
 .../indexDecorate/modelList/NotEnough.vue     | 14 +--
 buyer/src/components/nav/CateNav.vue          | 11 ++-
 buyer/src/pages/GoodsDetail.vue               |  4 +-
 buyer/src/pages/GoodsList.vue                 | 87 ++-----------------
 .../views/member/advance/withdrawApply.vue    |  4 +-
 12 files changed, 47 insertions(+), 187 deletions(-)
 delete mode 100644 buyer/src/components/header/ShopHeader.vue

diff --git a/buyer/src/assets/styles/global.scss b/buyer/src/assets/styles/global.scss
index ccfd7297..751a741d 100644
--- a/buyer/src/assets/styles/global.scss
+++ b/buyer/src/assets/styles/global.scss
@@ -296,7 +296,11 @@ li {
   justify-content: center;
 }
 
+.width_1200_auto {
+  width: 1184px;
+  margin: 0 auto;
 
+}
 
 
 
diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue
index 92792288..2c7d9693 100644
--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="navbar" :class="{'small-search-box':useClass == 'fixed-show'}">
-    <div class="container flex flex-a-c">
+    <div class="container width_1200_auto flex flex-a-c">
       <img
         :src="$store.state.logoImg"
         v-if="showLogo"
@@ -17,7 +17,7 @@
           @keyup.enter.native="search"
         >
 
-          <div class="search-icon" slot="append">
+          <div class="search-icon" slot="append" @click="search">
             <Icon type="ios-search" size="21"/>
           </div>
         </i-input>
@@ -130,14 +130,10 @@ export default {
 
   margin: 0 !important;
 }
-.search-input {
-
-}
 
 .container {
   position: relative;
-  width: 1200px;
-  margin: 0 auto;
+
   height: 100%;
 }
 
diff --git a/buyer/src/components/fixed/index.vue b/buyer/src/components/fixed/index.vue
index 956f020e..be9422ce 100644
--- a/buyer/src/components/fixed/index.vue
+++ b/buyer/src/components/fixed/index.vue
@@ -20,9 +20,9 @@ export default {
           path:"/home"
         },
         {
-          icon:"consumer",
-          label:"客服",
-          path:"/home"
+          icon:"carts",
+          label:"购物车",
+          path:"/cart"
         },
         {
           icon:"notification",
@@ -30,9 +30,9 @@ export default {
           path:"/home/MsgList"
         },
         {
-          icon:"feedback",
-          label:"反馈",
-          path:"/home"
+          icon:"collage",
+          label:"收藏",
+          path:"/home/Favorites"
         },
         {
           icon:"back",
@@ -69,6 +69,8 @@ export default {
     handleClickIcon(val){
         if(val.path === 'back'){
           this.scrollToTop()
+        }else{
+          this.$router.push(val.path)
         }
     }
   }
diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue
index fe5fd749..d31b6ec0 100644
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="box">
-    <div class="nav">
+    <div class="nav width_1200_auto">
       <ul class="location flex">
         <li v-if="$route.path.includes('home')" style="margin-left:10px">
           <router-link to="/">首页</router-link>
@@ -199,8 +199,6 @@ export default {
 }
 
 .nav {
-  margin: 0 auto;
-  width: 1200px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
diff --git a/buyer/src/components/header/ShopHeader.vue b/buyer/src/components/header/ShopHeader.vue
deleted file mode 100644
index 33f32a02..00000000
--- a/buyer/src/components/header/ShopHeader.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <div class="shop-box">
-    <div class="shop-container">
-      <div class="shop-title-content">
-        <img class="hover-pointer" @click="linkTo(`/merchant?id=${storeDetail.storeId}`)" :src="storeDetail.storeLogo" height="40" alt="">
-        <p><router-link :to="`/merchant?id=${storeDetail.storeId}`">{{ storeDetail.storeName }}</router-link></p>
-        <div class="ml_20" v-html="storeDetail.storeDesc"></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ShopHeader',
-  props: {
-    detail: {
-      type: Object,
-      default: null
-    }
-  },
-  computed: {
-    storeDetail () { // 店铺详情
-      return this.detail;
-    }
-  }
-};
-</script>
-
-<style scoped>
-/* 店铺介绍 */
-.shop-box {
-  width: 100%;
-  height: 50px;
-  background-color: #484848;
-}
-
-.shop-container {
-  width: 1200px;
-  height: 100%;
-  margin: 0px auto;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  color: #fff;
-}
-
-.shop-title-content {
-  display: flex;
-  align-items: center;
-}
-
-.shop-title-content p {
-  font-size: 20px;
-  margin-left: 20px;
-}
-.shop-title-content a {
-  color: #fff;
-}
-
-</style>
diff --git a/buyer/src/components/indexDecorate/ModelFormItem.vue b/buyer/src/components/indexDecorate/ModelFormItem.vue
index 30f81579..b454ecdb 100644
--- a/buyer/src/components/indexDecorate/ModelFormItem.vue
+++ b/buyer/src/components/indexDecorate/ModelFormItem.vue
@@ -234,9 +234,4 @@ export default {
   }
 }
 
-.width_1200_auto {
-  width: 1184px;
-  margin: 0 auto;
-
-}
 </style>
diff --git a/buyer/src/components/indexDecorate/modelList/Carousel.vue b/buyer/src/components/indexDecorate/modelList/Carousel.vue
index c9c3b630..3d05aa0e 100644
--- a/buyer/src/components/indexDecorate/modelList/Carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel.vue
@@ -110,19 +110,23 @@ export default {
       appendList:[
         {
           icon:"support",
-          label:"帮助中心"
+          label:"帮助中心",
+          path:"/article"
         },
         {
           icon:"feedback",
-          label:"问题反馈"
+          label:"我的评论",
+          path:"/home/CommentList"
         },
         {
           icon:"notice",
-          label:"平台公告"
+          label:"收货地址",
+          path:"/home/MyAddress"
         },
         {
           icon:"notification",
-          label:"我的消息"
+          label:"我的消息",
+          path:"/home/MsgList"
         },
       ],
       recentList:[
@@ -148,7 +152,6 @@ export default {
   methods: {
     // 快捷跳转中心
     entryControl(val){
-      console.log(val)
       this.$router.push(val.path)
     },
   },
@@ -322,7 +325,7 @@ export default {
   float: left;
   padding: 0px;
   color: #fff;
-  background-color: #6e6568;
+  // background-color: #6e6568;
 
 
 }
diff --git a/buyer/src/components/indexDecorate/modelList/NotEnough.vue b/buyer/src/components/indexDecorate/modelList/NotEnough.vue
index 268fbe28..7157ea72 100644
--- a/buyer/src/components/indexDecorate/modelList/NotEnough.vue
+++ b/buyer/src/components/indexDecorate/modelList/NotEnough.vue
@@ -65,12 +65,12 @@ export default {
     handleScrollx(){
       // console.log('滚动高度',window.pageYOffset) // 获取滚动条的高度
       // console.log(this.$refs.obtain.getBoundingClientRect().top) //获取到距离顶部的距离
-      this.scrollHieght = Number(window.pageYOffset);//获取到距离顶部的距离
-      this.scrollTops = Number(this.$refs.obtain.getBoundingClientRect().top); // 获取到距离顶部的距离
-         this.topSearchShow = true; // 展示图钉
-          if(this.scrollTops < -660){ // 超过隐藏
-            this.topSearchShow = false;
-      }
+      // this.scrollHieght = Number(window.pageYOffset);//获取到距离顶部的距离
+      // this.scrollTops = Number(this.$refs.obtain.getBoundingClientRect().top); // 获取到距离顶部的距离
+      //    this.topSearchShow = true; // 展示图钉
+      //     if(this.scrollTops < -660){ // 超过隐藏
+      //       this.topSearchShow = false;
+      // }
     },
      toguid(path,id){
       var path =path;
@@ -81,7 +81,7 @@ export default {
     change(status){ //获取是否获取到图钉
       this.open = status
     },
-    gotoDemo(){ // 跳转到demo的位置 
+    gotoDemo(){ // 跳转到demo的位置
     if(this.open){ // 获取到图钉之后在跳转当前位置
        document.querySelector("#demo").scrollIntoView(true);
     }
diff --git a/buyer/src/components/nav/CateNav.vue b/buyer/src/components/nav/CateNav.vue
index b3b3e7dd..ae425c09 100644
--- a/buyer/src/components/nav/CateNav.vue
+++ b/buyer/src/components/nav/CateNav.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="cate-nav" :class="{'fixed-show':useClass == 'fixed-show'}">
-    <div class="nav-con"  >
+  <div class="cate-nav width_1200_auto" :class="{'fixed-show':useClass == 'fixed-show'}">
+    <div class="nav-con" :class="{'background-white':useClass == 'background-white'}">
       <div
         class="all-categories hover-pointer"
         @mouseenter="showFirstLists"
@@ -23,6 +23,7 @@
     <!-- 全部商品分类 -->
     <div
       class="cate-list"
+      :style="{'top':!showNavBar ?'60px':'46px'}"
       v-show="showAlways || showFirstList"
       @mouseenter="showFirstList = true"
       @mouseleave="showFirstList = false"
@@ -227,6 +228,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.background-white{
+  background: #fff;
+}
 .nav-lis:hover {
   color: $theme_color !important;
   cursor: pointer;
@@ -257,13 +261,11 @@ export default {
   right: 0;
 }
 .cate-nav {
-  width: 1200px;
   position: relative;
   margin: 14px auto 0 auto;
 }
 /** 商品分类 */
 .nav-con {
-  width: 1200px;
   height: 46px;
   margin: 0 auto;
   display: flex;
@@ -309,6 +311,7 @@ export default {
 .cate-list {
   margin: 0 auto;
   position: absolute;
+
   z-index: 1000;
 }
 
diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue
index 63a421f0..c4190ee3 100644
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/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>
@@ -39,7 +38,7 @@
 
 <script>
 import Search from "@/components/Search";
-import ShopHeader from "@/components/header/ShopHeader";
+
 import ShowGoods from "@/components/goodsDetail/ShowGoods";
 import ShowGoodsDetail from "@/components/goodsDetail/ShowGoodsDetail";
 import { goodsSkuDetail } from "@/api/goods";
@@ -176,7 +175,6 @@ export default {
   watch: {},
   components: {
     Search,
-    ShopHeader,
     ShowGoods,
     ShowGoodsDetail,
   },
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 68a5cc1b..6aca6b97 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/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 useClass="background-white"></cateNav>
     <div class="container">
       <!-- 商品筛选栏 -->
       <GoodsClassNav @getParams="getParams"></GoodsClassNav>
@@ -261,6 +261,7 @@ export default {
 
 <style scoped lang="scss">
 @import "../assets/styles/goodsList.scss";
+
 .goods-show-info > .goods-show-seller > .goods-show-buyer {
   width: 35px;
   height: 17px;
@@ -288,7 +289,7 @@ export default {
 }
 .container {
   margin: 15px auto;
-  width: 1200px;
+  width: 1184px;
   min-width: 1000px;
   position: relative;
 }
@@ -299,92 +300,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 {
diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue
index 891e7832..df9d4d63 100644
--- a/manager/src/views/member/advance/withdrawApply.vue
+++ b/manager/src/views/member/advance/withdrawApply.vue
@@ -194,7 +194,7 @@ export default {
                 "Button",
                 {
                   props: {
-                    type: "success",
+                    type: "primary",
                     size: "small",
                   },
                   style: {
@@ -216,7 +216,7 @@ export default {
                 "Button",
                 {
                   props: {
-                    type: "primary",
+                    type: "default",
                     size: "small",
                   },
                   style: {