pc端添加2个轮播代码，楼层装修跟pc端样式不一致，楼层装修无法添加的bug修改

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
             }
           })
         });

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>

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:'促销计算规则'}
+      ]
     };
   },
 

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("保存模板成功");
         }

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>

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