From cc80242896be8199e8afb94e19351933cd60e430 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Wed, 11 Aug 2021 14:56:02 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E6=B7=BB=E5=8A=A02=E4=B8=AA?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=A5=BC=E5=B1=82?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E8=B7=9Fpc=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E6=A5=BC=E5=B1=82=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0=E7=9A=84bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/indexDecorate/ModelForm.vue    |   4 +-
 .../indexDecorate/ModelFormItem.vue           | 138 +++---------
 .../indexDecorate/modelList/Carousel1.vue     |  76 +++++++
 .../indexDecorate/modelList/Carousel2.vue     | 211 ++++++++++++++++++
 buyer/src/components/nav/CateNav.vue          |  47 ++--
 buyer/src/pages/Index.vue                     |  18 +-
 .../src/pages/home/memberCenter/Favorites.vue |   4 +-
 .../src/views/lili-dialog/goods-dialog.vue    |   4 +-
 .../views/lili-floor-renovation/modelForm.vue |   4 +-
 .../modelList/carousel.vue                    |  34 +--
 .../lili-floor-renovation/renovation.vue      |  13 +-
 .../src/views/sys/menu-manage/menuManage.vue  |  31 ++-
 .../src/views/sys/oss-manage/ossManage.vue    |  44 ++--
 13 files changed, 428 insertions(+), 200 deletions(-)
 create mode 100644 buyer/src/components/indexDecorate/modelList/Carousel1.vue
 create mode 100644 buyer/src/components/indexDecorate/modelList/Carousel2.vue

diff --git a/buyer/src/components/indexDecorate/ModelForm.vue b/buyer/src/components/indexDecorate/ModelForm.vue
index c9d3fb2e..28df54be 100644
--- a/buyer/src/components/indexDecorate/ModelForm.vue
+++ b/buyer/src/components/indexDecorate/ModelForm.vue
@@ -25,9 +25,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .model-content {
-  width: 1200px;
-  margin: 0 auto;
-  // background: #fff;
+  width: 100%;
   min-height: 1200px;
 }
 </style>
diff --git a/buyer/src/components/indexDecorate/ModelFormItem.vue b/buyer/src/components/indexDecorate/ModelFormItem.vue
index 2330e581..003a4b14 100644
--- a/buyer/src/components/indexDecorate/ModelFormItem.vue
+++ b/buyer/src/components/indexDecorate/ModelFormItem.vue
@@ -2,11 +2,17 @@
   <div class="model-item" v-if="element && element.key">
     <!-- 轮播图模块，包括个人信息，快捷导航模块 -->
     <template v-if="element.type == 'carousel'">
-      <model-carousel :data="element" class="mb_20"></model-carousel>
+      <model-carousel :data="element" class="mb_20 width_1200_auto"></model-carousel>
+    </template>
+    <template v-if="element.type == 'carousel1'">
+      <model-carousel1 :data="element" class="mb_20"></model-carousel1>
+    </template>
+    <template v-if="element.type == 'carousel2'">
+      <model-carousel2 :data="element" class="mb_20 width_1200_auto"></model-carousel2>
     </template>
     <!-- 热门广告 -->
     <template v-if="element.type == 'hotAdvert'">
-      <div class="mb_20">
+      <div class="mb_20 width_1200_auto">
         <img
           style="display: block"
           class="hover-pointer"
@@ -16,7 +22,7 @@
           alt=""
         />
       </div>
-      <ul class="advert-list">
+      <ul class="advert-list width_1200_auto">
         <template v-for="(item, index) in element.options.list">
           <li
             v-if="index !== 0"
@@ -31,12 +37,12 @@
     </template>
     <!-- 限时秒杀 待完善 -->
     <template v-if="element.type == 'seckill' && element.options.list.length">
-      <seckill :data="element" class="mb_20"></seckill>
+      <seckill :data="element"  class="mb_20 width_1200_auto"></seckill>
     </template>
     <!-- 折扣广告 -->
     <template v-if="element.type == 'discountAdvert'">
       <div
-        class="discountAdvert mb_20"
+        class="discountAdvert"
         :style="{'backgroundImage' :'url(' + require('@/assets/images/decorate.png') + ')'}"
       >
         <img
@@ -64,15 +70,15 @@
 
     <!-- 好货推荐 -->
     <template v-if="element.type == 'recommend'">
-      <recommend :data="element" class="mb_20"></recommend>
+      <recommend :data="element" class="mb_20 width_1200_auto"></recommend>
     </template>
     <!-- 新品排行 -->
     <template v-if="element.type == 'newGoodsSort'">
-      <new-goods-sort :data="element" class="mb_20"></new-goods-sort>
+      <new-goods-sort :data="element" class="mb_20 width_1200_auto"></new-goods-sort>
     </template>
     <!-- 首页广告 -->
     <template v-if="element.type == 'firstAdvert'">
-      <first-page-advert :data="element" class="mb_20"></first-page-advert>
+      <first-page-advert :data="element" class="mb_20 width_1200_auto"></first-page-advert>
     </template>
     <!-- 横幅广告 -->
     <template v-if="element.type == 'bannerAdvert'">
@@ -85,13 +91,15 @@
       />
     </template>
     <template v-if="element.type == 'notEnough'">
-      <not-enough :data="element" class="mb_20"></not-enough>
+      <not-enough :data="element" class="mb_20 width_1200_auto"></not-enough>
     </template>
   </div>
 </template>
 
 <script>
 import ModelCarousel from './modelList/Carousel.vue';
+import ModelCarousel1 from './modelList/Carousel1.vue';
+import ModelCarousel2 from './modelList/Carousel2.vue';
 import FirstPageAdvert from './modelList/FirstPageAdvert.vue';
 import NewGoodsSort from './modelList/NewGoodsSort.vue';
 import Recommend from './modelList/Recommend.vue';
@@ -103,6 +111,8 @@ export default {
   props: ['element', 'select', 'index', 'data'],
   components: {
     ModelCarousel,
+    ModelCarousel1,
+    ModelCarousel2,
     Recommend,
     NewGoodsSort,
     FirstPageAdvert,
@@ -118,9 +128,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
 .model-item {
   position: relative;
-  background-color: #fff;
 }
 
 /** 热门广告 */
@@ -153,10 +163,13 @@ export default {
 }
 /** 折扣广告 */
 .discountAdvert {
+  width: 1300px;
   height: 566px;
+  margin: 0 auto;
+  margin-bottom: 20px;
   background-repeat: no-repeat;
-  margin-left: -97px;
   position: relative;
+  left: -47px;
   padding-left: 295px;
   display: flex;
   flex-wrap: wrap;
@@ -171,104 +184,6 @@ export default {
     }
   }
 }
-/** 首页品牌 */
-.brand {
-  .brand-view {
-    display: flex;
-    margin-top: 10px;
-    .brand-view-content {
-      width: 470px;
-      margin-left: 10px;
-      img {
-        width: 100%;
-        height: 316px;
-      }
-      .brand-view-title {
-        height: 50px;
-        padding: 0 5px;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-      }
-    }
-    .brand-view-content:first-child {
-      width: 240px;
-      margin-left: 0;
-    }
-  }
-  .brand-list {
-    margin-top: 10px;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    li {
-      width: 121px;
-      height: 112px;
-      position: relative;
-      overflow: hidden;
-      border: 1px solid #f5f5f5;
-      margin: -1px -1px 0 0;
-      &:hover {
-        .brand-mash {
-          display: flex;
-        }
-      }
-      .brand-img {
-        text-align: center;
-        margin-top: 30px;
-        img {
-          width: 100px;
-          height: auto;
-        }
-      }
-      .brand-mash {
-        display: none;
-        position: absolute;
-        top: 0;
-        left: 0;
-        background: rgba(0, 0, 0, 0.5);
-        width: inherit;
-        height: inherit;
-        font-size: 12px;
-        font-weight: bold;
-        .ivu-icon {
-          position: absolute;
-          right: 10px;
-          top: 10px;
-          font-size: 15px;
-        }
-        align-items: center;
-        justify-content: center;
-        flex-direction: column;
-        color: #fff;
-        cursor: pointer;
-        div:last-child {
-          background-color: $theme_color;
-          border-radius: 9px;
-          padding: 0 10px;
-          margin-top: 5px;
-        }
-      }
-    }
-    .refresh {
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      justify-content: center;
-      .ivu-icon {
-        font-size: 18px;
-        transition: all 0.3s ease-out;
-      }
-      &:hover {
-        background-color: $theme_color;
-        color: #fff;
-        .ivu-icon {
-          transform: rotateZ(360deg);
-        }
-      }
-    }
-  }
-}
 
 /** 装修模态框 内部样式start */
 .modal-top-advert {
@@ -280,4 +195,9 @@ export default {
     margin-bottom: 10px;
   }
 }
+.width_1200_auto{
+  width: 1200px;
+  margin: 0 auto;
+  background-color: #fff;
+}
 </style>
diff --git a/buyer/src/components/indexDecorate/modelList/Carousel1.vue b/buyer/src/components/indexDecorate/modelList/Carousel1.vue
new file mode 100644
index 00000000..59715aad
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelList/Carousel1.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="model-carousel1" :style="{background: bgColor}">
+    <div class="nav-body clearfix">
+      <!-- 侧边导航 -->
+      <div class="nav-side"></div>
+      <div class="nav-content">
+        <!-- 轮播图 -->
+        <Carousel autoplay @on-change="autoChange">
+          <CarouselItem v-for="(item, index) in data.options.list" :key="index" >
+            <div style="overflow: hidden">
+              <img :src="item.img" width="1200" height="470" />
+            </div>
+          </CarouselItem>
+        </Carousel>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'modelCarousel1',
+  props: ['data'],
+  data () {
+    return {
+      showModal: false, // modal显隐
+      selected: null, // 已选数据
+      picModelFlag: false, // 选择图片modal
+      bgColor: '#fff' // 轮播背景色
+    };
+  },
+  mounted () {
+    this.bgColor = this.data.options.list[0].bgColor
+  },
+  methods: {
+    // 自动切换时改变背景色
+    autoChange (oVal, val) {
+      this.bgColor = this.data.options.list[val].bgColor
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.model-carousel1 {
+  width: 100%;
+  height: 470px;
+  background: #fff;
+}
+
+/*大的导航信息，包含导航，幻灯片等*/
+.nav-body {
+  width: 1200px;
+  height: 470px;
+  margin: 0px auto;
+}
+.nav-side {
+  height: 470px;
+  width: 200px;
+  padding: 0px;
+  color: #fff;
+  line-height: 470px;
+  text-align: center;
+  position: absolute;
+  z-index: 1;
+}
+
+/*导航内容*/
+.nav-content {
+  width: 1200px;
+  height: 470px;
+  overflow: hidden;
+  float: left;
+  position: relative;
+}
+</style>
diff --git a/buyer/src/components/indexDecorate/modelList/Carousel2.vue b/buyer/src/components/indexDecorate/modelList/Carousel2.vue
new file mode 100644
index 00000000..68468248
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelList/Carousel2.vue
@@ -0,0 +1,211 @@
+<template>
+  <div class="model-carousel2">
+    <div class="nav-body clearfix">
+      <!-- 侧边导航 -->
+      <div class="nav-side"></div>
+      <div class="nav-content">
+        <!-- 轮播图 -->
+        <Carousel autoplay>
+          <CarouselItem v-for="(item, index) in data.options.list" :key="index">
+            <div style="overflow: hidden">
+              <img :src="item.img" width="590" height="470" />
+            </div>
+          </CarouselItem>
+        </Carousel>
+      </div>
+      <div class="nav-content1">
+        <!-- 轮播图 -->
+        <Carousel autoplay :autoplay-speed="5000">
+          <CarouselItem v-for="(item, index) in data.options.listRight" :key="index">
+            <div class="mb_10">
+              <img :src="item[0].img" width="190" height="150" />
+            </div>
+            <div class="mb_10">
+              <img :src="item[1].img" width="190" height="150" />
+            </div>
+            <div>
+              <img :src="item[2].img" width="190" height="150" />
+            </div>
+          </CarouselItem>
+        </Carousel>
+      </div>
+      <div class="nav-right">
+        <div class="person-msg">
+          <img :src="userInfo.face" v-if="userInfo.face" alt />
+          <Avatar icon="ios-person" class="mb_10" v-else size="80" />
+          <div>Hi，{{ userInfo.nickName || "欢迎来到LiLi Shop" | secrecyMobile }}</div>
+          <div v-if="userInfo.id">
+            <Button type="error" shape="circle">会员中心</Button>
+          </div>
+          <div v-else>
+            <Button type="error" shape="circle">请登录</Button>
+          </div>
+        </div>
+        <div class="shop-msg">
+          <div>
+            <span>常见问题</span>
+            <ul class="article-list">
+              <li class="ellipsis" :alt="article.title" v-for="(article, index) in articleList" :key="index" @click="goArticle(article.id)">
+                {{article.title}}
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {articleList} from '@/api/common.js'
+import storage from '@/plugins/storage';
+export default {
+  name: 'modelCarousel2',
+  props: ['data'],
+  data () {
+    return {
+      userInfo: {}, // 用户信息
+      articleList: [], // 常见问题
+      params: { // 请求常见问题参数
+        pageNumber: 1,
+        pageSize: 10,
+        type: 'ANNOUNCEMENT',
+        sort: 'sort'
+      }
+    };
+  },
+  methods: {
+    getArticleList () { // 获取常见问题列表
+      articleList(this.params).then(res => {
+        if (res.success) {
+          this.articleList = res.result.records
+        }
+      })
+    },
+    goArticle (id) { // 跳转文章详情
+      let routeUrl = this.$router.resolve({
+        path: '/article',
+        query: {id}
+      });
+      window.open(routeUrl.href, '_blank');
+    }
+  },
+  mounted () {
+    if (storage.getItem('userInfo')) this.userInfo = JSON.parse(storage.getItem('userInfo'));
+    this.getArticleList()
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.model-carousel2 {
+  width: 1200px;
+  height: 470px;
+  overflow: hidden;
+}
+
+.nav-item li {
+  float: left;
+  font-size: 16px;
+  font-weight: bold;
+  margin-left: 30px;
+}
+.nav-item a {
+  text-decoration: none;
+  color: #555555;
+}
+.nav-item a:hover {
+  color: $theme_color;
+}
+/*大的导航信息，包含导航，幻灯片等*/
+.nav-body {
+  width: 1200px;
+  height: 470px;
+  margin: 0px auto;
+}
+.nav-side {
+  height: 100%;
+  width: 200px;
+  padding: 0px;
+  color: #fff;
+  float: left;
+  background-color: #6e6568;
+  line-height: 470px;
+  text-align: center;
+}
+
+/*导航内容*/
+.nav-content,.nav-content1 {
+  width: 590px;
+  height: 470px;
+  overflow: hidden;
+  float: left;
+  position: relative;
+  margin-left: 10px;
+}
+.nav-content1{
+  width: 190px;
+}
+.nav-right {
+  float: left;
+  width: 190px;
+  margin-left: 10px;
+  .person-msg {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    margin: 20px auto;
+
+    button {
+      height: 25px !important;
+      margin-top: 10px;
+    }
+
+    .ivu-btn-default {
+      color: $theme_color;
+      border-color: $theme_color;
+    }
+
+    img {
+      margin-bottom: 10px;
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+    }
+  }
+  .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;
+        margin: 5px 0;
+        color: #999395;
+        width: 150px;
+        font-size: 12px;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/buyer/src/components/nav/CateNav.vue b/buyer/src/components/nav/CateNav.vue
index 5dfc6517..ae702872 100644
--- a/buyer/src/components/nav/CateNav.vue
+++ b/buyer/src/components/nav/CateNav.vue
@@ -4,7 +4,6 @@
       <div class="all-categories hover-pointer" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">全部商品分类</div>
       <ul class="nav-item" v-if="showNavBar">
         <li
-          class="hover-color"
           v-for="(item, index) in navList.list"
           :key="index"
           @click="linkTo(item.url)"
@@ -16,7 +15,7 @@
     <!-- 全部商品分类 -->
     <div class="cate-list" v-show="showAlways || showFirstList" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">
       <!-- 第一级分类 -->
-      <div class="nav-side" @mouseleave="panel = false">
+      <div class="nav-side" :class="{'large-nav': large, 'opacity-nav': opacity}" @mouseleave="panel = false">
         <ul>
           <li v-for="(item, index) in cateList" :key="index" @mouseenter="showDetail(index)" >
             <span class="nav-side-item" @click="goGoodsList(item.id)">{{item.name}}</span>
@@ -30,6 +29,7 @@
       <!-- 展开分类 -->
       <div
         class="detail-item-panel"
+        :style="{'minHeight': large?'470px':'340px'}"
         v-show="panel"
         @mouseenter="panel = true"
         @mouseleave="panel = false"
@@ -77,6 +77,14 @@ export default {
     hover: {
       default: false,
       type: Boolean
+    },
+    large: { // 是否更高的高度
+      default: false,
+      type: Boolean
+    },
+    opacity: { // 是否背景透明
+      default: false,
+      type: Boolean
     }
   },
   data () {
@@ -156,7 +164,6 @@ export default {
 .nav-con {
   width: 1200px;
   height: 40px;
-  // background: #eee;
   margin: 0 auto;
   display: flex;
   .all-categories {
@@ -176,7 +183,7 @@ export default {
     background-color: #eee;
     display: flex;
     li {
-      font-size: 16px;
+      float: left;
       font-weight: bold;
       margin-left: 20px;
       color: rgb(89, 88, 88);
@@ -187,24 +194,12 @@ export default {
     }
   }
 }
+// 分类列表
 .cate-list{
   margin: 0 auto;
   position: absolute;
   z-index: 1000;
 }
-.nav-item li {
-  float: left;
-  font-size: 16px;
-  font-weight: bold;
-  margin-left: 30px;
-}
-.nav-item a {
-  text-decoration: none;
-  color: #555555;
-}
-.nav-item a:hover {
-  color: $theme_color;
-}
 
 .nav-side {
   width: 200px;
@@ -215,6 +210,15 @@ export default {
   height: 335px;
   overflow: hidden;
 }
+.large-nav{
+  height: 470px;
+  ul>li{
+    line-height: 20px;
+  }
+}
+.opacity-nav{
+  background-color:rgba(0,0,0,.5);
+}
 .nav-side ul {
   width: 100%;
   padding: 0px;
@@ -226,9 +230,9 @@ export default {
   padding-left: 12px;
   font-size: 13px;
   line-height: 18px;
-}
-.nav-side li:hover {
-  background: #999395;
+  &:hover{
+    background: #999395;
+  }
 }
 .nav-side-item:hover {
   cursor: pointer;
@@ -237,7 +241,7 @@ export default {
 
 /*显示商品详细信息*/
 .detail-item-panel {
-  width: 815px;
+  width: 1000px;
   min-height: 340px;
   background-color: #fff;
   box-shadow: 0px 0px 15px #ccc;
@@ -265,7 +269,6 @@ export default {
 }
 .detail-item-panel li {
   line-height: 30px;
-  // margin-left: 40px;
 }
 .detail-item-title {
   font-weight: bold;
diff --git a/buyer/src/pages/Index.vue b/buyer/src/pages/Index.vue
index 4a059584..7c1244c4 100644
--- a/buyer/src/pages/Index.vue
+++ b/buyer/src/pages/Index.vue
@@ -10,7 +10,7 @@
     <!-- 搜索框、logo -->
     <Search></Search>
     <!-- 商品分类 -->
-    <cateNav :showAlways="true" v-if="showNav"></cateNav>
+    <cateNav :showAlways="true" v-if="showNav" :large="carouselLarge" :opacity="carouselOpacity"></cateNav>
     <!-- 楼层装修部分 -->
     <model-form ref="modelForm" :data="modelForm"></model-form>
     <!-- 底部栏 -->
@@ -44,7 +44,9 @@ export default {
       modelForm: { list: [] }, // 楼层装修数据
       topAdvert: {}, // 顶部广告
       showNav: false, // 是否展示分类栏
-      topSearchShow: false // 滚动后顶部搜索栏展示
+      topSearchShow: false, // 滚动后顶部搜索栏展示
+      carouselLarge: false, // 不同轮播分类尺寸
+      carouselOpacity: false // 不同轮播分类样式
     };
   },
   methods: {
@@ -53,15 +55,21 @@ export default {
       indexData({ clientType: 'PC' }).then((res) => {
         if (res.success) {
           let dataJson = JSON.parse(res.result.pageData);
-          this.modelForm = dataJson;
           // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
+          // 轮播图根据不同轮播，样式不同
           for (let i = 0; i < dataJson.list.length; i++) {
-            if (dataJson.list[i].type === 'seckill') {
+            let type = dataJson.list[i].type
+            if (type === 'carousel2') {
+              this.carouselLarge = true;
+            } else if (type === 'carousel1') {
+              this.carouselLarge = true
+              this.carouselOpacity = true
+            } else if (type === 'seckill') {
               let seckill = this.getListByDay()
               dataJson.list[i].options.list = seckill
-              break;
             }
           }
+          this.modelForm = dataJson;
           storage.setItem('navList', dataJson.list[1])
           this.showNav = true
           this.topAdvert = dataJson.list[0];
diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue
index ca2c75d1..f0188c8b 100644
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -24,8 +24,8 @@
           <div class="goodsBuy">
             <Button size="small" type="primary" @click="buynow(item.skuId, item.goodsId)" v-if="params.type === 'GOODS'">立即购买</Button>
             <Button size="small" type="primary" @click="goShop(item.id)" v-else>店铺购买</Button>
-            <Button size="small" type="error" ghost v-if="params.type === 'GOODS'" @click="cancel(item.skuId)">取消收藏</Button>
-            <Button size="small" type="error" ghost v-if="params.type === 'SHOP'" @click="cancel(item.id)">取消收藏</Button>
+            <Button size="small" v-if="params.type === 'GOODS'" @click="cancel(item.skuId)">取消收藏</Button>
+            <Button size="small" v-if="params.type === 'SHOP'" @click="cancel(item.id)">取消收藏</Button>
           </div>
         </div>
       </template>
diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue
index 2cd1712e..56979371 100644
--- a/manager/src/views/lili-dialog/goods-dialog.vue
+++ b/manager/src/views/lili-dialog/goods-dialog.vue
@@ -43,7 +43,6 @@ export default {
   data() {
     return {
       type: "multiple", //单选或者多选 single  multiple
-
       skuList: [], // 商品sku列表
       total: 0,  // 商品总数
       goodsParams: { // 商品请求参数
@@ -115,10 +114,9 @@ export default {
         res.result.records.forEach((item) => {
           item.selected = false;
           item.___type = "goods"; //设置为goods让pc wap知道标识
-          
           this.selectedWay.forEach(e => {
             if (e.id === item.id) {
-              item.selected = true 
+              item.selected = true
             }
           })
         });
diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue
index 21d50310..28cf7967 100644
--- a/manager/src/views/lili-floor-renovation/modelForm.vue
+++ b/manager/src/views/lili-floor-renovation/modelForm.vue
@@ -9,9 +9,9 @@
                 </div>
             </div>
             <div class="header-con">
-                <div><Icon type="md-pin" />北京</div>
+                <div></div>
                 <ul class="detail">
-                    <!-- <li>切换主题</li> -->
+                    <li>立即注册</li>
                     <li>请登录</li>
                     <li>我的订单</li>
                     <li>我的足迹</li>
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel.vue b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
index b9d70919..d4553555 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
@@ -20,24 +20,25 @@
       </div>
       <div class="nav-right">
         <div class="person-msg">
-          <img src="../../../assets/play.png" alt />
-          <div>Hi，欢迎来到LiLi Shop</div>
-          <div>
-            <Button type="error" shape="circle">请登录</Button> &nbsp;
-            <Button size="small" shape="circle">我要开店</Button>
+          <img :src="userInfo.face" v-if="userInfo.face" alt />
+          <Avatar icon="ios-person" class="mb_10" v-else size="80" />
+          <div>Hi，{{ userInfo.nickName || "欢迎来到LiLi Shop" | secrecyMobile }}</div>
+          <div v-if="userInfo.id">
+            <Button type="error" shape="circle">会员中心</Button>
+          </div>
+          <div v-else>
+            <Button type="error" shape="circle">请登录</Button>
           </div>
         </div>
         <div class="shop-msg">
           <div>
-            <span>店铺信息</span>
-            <span>|</span>
-            <span>网站帮助分类</span>
+            <span>常见问题</span>
+            <ul class="article-list">
+              <li class="ellipsis" :alt="article.title" v-for="(article, index) in articleList" :key="index" @click="goArticle(article.id)">
+                {{article.title}}
+              </li>
+            </ul>
           </div>
-          <ul>
-            <li>免责条款</li>
-            <li>联系我们</li>
-            <li>咨询热点</li>
-          </ul>
         </div>
       </div>
     </div>
@@ -131,6 +132,13 @@ export default {
       showModal: false, // modal显隐
       selected: null, // 已选数据
       picModelFlag: false, // 选择图片modal
+      userInfo:{},
+      articleList:[
+        {title:'促销计算规则'},
+        {title:'商家申请开店'},
+        {title:'商家账号注册'},
+        {title:'促销计算规则'}
+      ]
     };
   },
 
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
index 6265eaa0..468fd43a 100644
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -16,7 +16,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="btn-bar">
-      <Button type="primary" @click="saveTemplate">保存模板</Button>
+      <Button type="primary" :loading="submitLoading" @click="saveTemplate">保存模板</Button>
       <Button class="ml_10" @click="resetTemplate">还原模板</Button>
     </div>
   </div>
@@ -38,6 +38,7 @@ export default {
     return {
       modelData, // 可选模块数据
       modelForm: { list: [] }, // 模板数据
+      submitLoading: false, // 提交加载状态
     };
   },
   methods: {
@@ -47,15 +48,17 @@ export default {
     },
     // 提交模板
     submitTemplate(pageShow) {
-      this.modelForm.list.unshift(this.$refs.modelForm.navList);
-      this.modelForm.list.unshift(this.$refs.modelForm.topAdvert);
-      const modelForm = JSON.stringify(this.modelForm);
+      this.submitLoading = true
+      const modelForm = JSON.parse(JSON.stringify(this.modelForm)) 
+      modelForm.list.unshift(this.$refs.modelForm.navList);
+      modelForm.list.unshift(this.$refs.modelForm.topAdvert);
       const data = {
         id: this.$route.query.id,
-        pageData: modelForm,
+        pageData: JSON.stringify(modelForm),
         pageShow
       };
       API_floor.updateHome(this.$route.query.id, data).then((res) => {
+        this.submitLoading = false
         if (res.success) {
           this.$Message.success("保存模板成功");
         }
diff --git a/manager/src/views/sys/menu-manage/menuManage.vue b/manager/src/views/sys/menu-manage/menuManage.vue
index 5dc0aa24..e0884acb 100644
--- a/manager/src/views/sys/menu-manage/menuManage.vue
+++ b/manager/src/views/sys/menu-manage/menuManage.vue
@@ -1,10 +1,4 @@
-<style lang="scss" scoped>
-@import "@/styles/tree-common.scss";
-.desc{
-  font-size: 12px;
-  color: #999;
-}
-</style>
+
 <template>
   <div class="search">
     <Card>
@@ -130,7 +124,6 @@
                 @click="submitEdit"
                 :loading="submitLoading"
                 type="primary"
-                icon="ios-create-outline"
               >保存
               </Button
               >
@@ -232,6 +225,7 @@ import {
   addPermission,
   editPermission,
   deletePermission,
+  searchPermission,
 } from "@/api/index";
 import util from "@/libs/util.js";
 
@@ -436,6 +430,20 @@ export default {
         this.cancelEdit();
       }
     },
+    // 搜索菜单
+    search() {
+      if (this.searchKey) {
+        this.loading = true;
+        searchPermission({title: this.searchKey}).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result;
+          }
+        });
+      } else {
+        this.getAllList();
+      }
+    },
     // 取消选择
     cancelEdit() {
       let data = this.$refs.tree.getSelectedNodes()[0];
@@ -591,3 +599,10 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+@import "@/styles/tree-common.scss";
+.desc{
+  font-size: 12px;
+  color: #999;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue
index ec7383fe..ef557240 100644
--- a/manager/src/views/sys/oss-manage/ossManage.vue
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@@ -45,12 +45,20 @@
         </Row>
         <div class="oss-operation padding-row">
           <div>
-            <Button
-              @click="uploadVisible = true"
-              type="primary"
-            >上传文件
-            </Button
+            <Upload
+              style="display:inline-block;"
+              :action="baseUrl + '/common/upload/file'"
+              :headers="accessToken"
+              :on-success="handleSuccess"
+              :on-error="handleError"
+              :show-upload-list="false"
+              :max-size="1024"
+              :on-exceeded-size="handleMaxSize"
+              multiple
+              ref="up"
             >
+              <Button type="primary">上传文件</Button>
+            </Upload>
             <Dropdown @on-click="handleDropdown">
               <Button>
                 更多操作
@@ -181,28 +189,7 @@
       </Row>
     </Card>
 
-    <Drawer title="文件上传" class="drawer" styles="z-index:2000;" closable v-model="uploadVisible" width="500">
-      <Upload
-        :action="baseUrl + '/common/upload/file'"
-        :headers="accessToken"
-        :on-success="handleSuccess"
-        :on-error="handleError"
-        :max-size="1024"
-        :on-exceeded-size="handleMaxSize"
-        multiple
-        type="drag"
-        ref="up"
-
-      >
-        <div style="padding: 20px 0">
-          <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
-          <p>点击这里或将文件拖拽到这里上传</p>
-        </div>
-      </Upload>
-      <div class="drawer-footer">
-        <Button @click="clearFiles">清空上传列表</Button>
-      </div>
-    </Drawer>
+      
 
     <Modal
       :title="modalTitle"
@@ -497,7 +484,7 @@ export default {
                 "Button",
                 {
                   props: {
-                    type: "primary",
+                    type: "info",
                     size: "small",
                   },
                   style: {
@@ -517,6 +504,7 @@ export default {
                 {
                   props: {
                     size: "small",
+                    type: 'success'
                   },
                   style: {
                     marginRight: "5px",