From 7711e5ca7b9903c9b6f71ff71dde75981ff2e7ac Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 16 Jun 2021 17:55:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=94=A8=E6=88=B7=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/user/Home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buyer/src/pages/user/Home.vue b/buyer/src/pages/user/Home.vue
index 7f27f69e..28f9eb7f 100644
--- a/buyer/src/pages/user/Home.vue
+++ b/buyer/src/pages/user/Home.vue
@@ -17,7 +17,7 @@
               <div class="user-img">
                 <img :src="userInfo.face" />
               </div>
-              <p>{{userInfo.username | secrecyMobile}}</p>
+              <p>{{userInfo.nickName}}</p>
             </div>
 
             <!--   循环导航栏       -->

From 0cbcb4d37a22508ada9e70ecf8b4606f02aabea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 17 Jun 2021 11:40:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E7=AB=AF=E5=95=86=E5=93=81=E5=8F=91=E5=B8=83=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A5=BC=E5=B1=82?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AEpc=E7=AB=AF=E5=87=BA=E7=8E=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E4=B8=AD=E5=87=BA=E7=8E=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/api/goods.js                      |   6 +-
 .../src/views/goods/goods-manage/brand.vue    |   4 +-
 .../src/views/goods/goods-manage/category.vue |   1 +
 .../lili-floor-renovation/renovation.vue      | 324 +++++++++---------
 .../src/views/promotion/seckill/seckill.vue   |  11 +-
 .../views/goods/goods-seller/addGoods.scss    |   6 +
 .../goods/goods-seller/goodsOperation.vue     |   3 +-
 7 files changed, 189 insertions(+), 166 deletions(-)

diff --git a/manager/src/api/goods.js b/manager/src/api/goods.js
index a33eff91..935d1e1e 100644
--- a/manager/src/api/goods.js
+++ b/manager/src/api/goods.js
@@ -5,10 +5,14 @@ import { getRequest, postRequest, putRequest, deleteRequest} from '@/libs/axios'
 export const getManagerBrandPage = (params) => {
     return getRequest('/goods/brand/getByPage', params)
 }
-//  添加或修改品牌设置
+//  添加
 export const addBrand = (params) => {
     return postRequest('/goods/brand', params)
 }
+// 修改品牌设置
+export const updateBrand = (params) => {
+    return putRequest(`/goods/brand/${params.id}`, params)
+}
 // 禁用品牌
 export const disableBrand = (id, params) => {
     return putRequest(`/goods/brand/disable/${id}`, params)
diff --git a/manager/src/views/goods/goods-manage/brand.vue b/manager/src/views/goods/goods-manage/brand.vue
index 1e502c93..e11e1f19 100644
--- a/manager/src/views/goods/goods-manage/brand.vue
+++ b/manager/src/views/goods/goods-manage/brand.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-  import {getManagerBrandPage, addBrand, disableBrand} from "@/api/goods";
+  import {getManagerBrandPage, addBrand,updateBrand, disableBrand} from "@/api/goods";
   import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
 
   export default {
@@ -323,7 +323,7 @@
               });
             } else {
               // 编辑
-              addBrand(this.form).then((res) => {
+              updateBrand(this.form).then((res) => {
                 this.submitLoading = false;
                 if (res.success) {
                   this.$Message.success("操作成功");
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
index 4efb51a1..b4183fe8 100644
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -376,6 +376,7 @@ export default {
       });
     },
     getAllList(parent_id) {
+      this.sortCateList = []
       this.loading = true;
       getCategoryTree(parent_id).then((res) => {
         this.loading = false;
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
index d5074863..11faa20b 100644
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -1,172 +1,182 @@
 <template>
-    <div class="renovation">
-        <!-- 左侧模块列表 -->
-        <div class="model-list">
-            <div class="classification-title">基础模块</div>
-            <draggable tag="ul" :list="modelData" 
-              v-bind="{group:{ name:'model', pull:'clone',put:false},sort:false, ghostClass: 'ghost'}"
-              @end="handleMoveEnd"
-              @start="handleMoveStart"
-              :move="handleMove"
-            >
-                <li v-for="(model, index) in modelData" :key="index" class="model-item">
-                    <Icon :type="model.icon" />
-                    <span>{{model.name}}</span>
-                </li>
-            </draggable>
-        </div>
-        <!-- 中间展示模块 -->
-        <div class="show-content">
-            <model-form  ref="modelForm" :data="modelForm"></model-form>
-        </div>
-        <!-- 保存按钮 -->
-        <div class="btn-bar"><Button type="primary" @click="saveTemplate">保存模板</Button> <Button @click="resetTemplate">还原模板</Button></div>
+  <div class="renovation">
+    <!-- 左侧模块列表 -->
+    <div class="model-list">
+      <div class="classification-title">基础模块</div>
+      <draggable tag="ul" :list="modelData" v-bind="{group:{ name:'model', pull:'clone',put:false},sort:false, ghostClass: 'ghost'}" @end="handleMoveEnd" @start="handleMoveStart" :move="handleMove">
+        <li v-for="(model, index) in modelData" :key="index" class="model-item">
+          <Icon :type="model.icon" />
+          <span>{{model.name}}</span>
+        </li>
+      </draggable>
     </div>
+    <!-- 中间展示模块 -->
+    <div class="show-content">
+      <model-form ref="modelForm" :data="modelForm"></model-form>
+    </div>
+    <!-- 保存按钮 -->
+    <div class="btn-bar"><Button type="primary" @click="saveTemplate">保存模板</Button> <Button @click="resetTemplate">还原模板</Button></div>
+  </div>
 </template>
 <script>
-import { modelData } from './modelConfig';
+import { modelData } from "./modelConfig";
 import Draggable from "vuedraggable";
-import ModelForm from './modelForm.vue';
-import * as API_floor from '@/api/other.js';
+import ModelForm from "./modelForm.vue";
+import * as API_floor from "@/api/other.js";
 export default {
-    components:{
-        Draggable, ModelForm
-    },
-    mounted(){
-        this.getTemplateItem(this.$route.query.id)
-    },
-    data() {
-        return {
-            modelData, // 可选模块数据
-            modelForm:{list:[]} // 模板数据
-        }
-    },
-    methods:{
-        saveTemplate(){ // 保存模板
-            this.modelForm.list.unshift(this.$refs.modelForm.navList)
-            this.modelForm.list.unshift(this.$refs.modelForm.topAdvert)
-            const modelForm = JSON.stringify(this.modelForm)
-            const data = {
-                id:this.$route.query.id,
-                pageData:modelForm,
-            }
-            API_floor.updateHome(this.$route.query.id, data).then(res=> {
-                if(res.success) {
-                    this.$Message.success('保存模板成功');
-                } else {
-                    this.$Message.error(res.message)
-                }
-            })
+  components: {
+    Draggable,
+    ModelForm,
+  },
+  mounted() {
+    this.getTemplateItem(this.$route.query.id);
+  },
+  data() {
+    return {
+      modelData, // 可选模块数据
+      modelForm: { list: [] }, // 模板数据
+    };
+  },
+  methods: {
+    saveTemplate() {
+      // 保存模板
+      this.$Modal.confirm({
+        title: "是否立即发布？",
+        onOk: () => {
+          this.submitTemplate("OPEN");
         },
-        resetTemplate(){ // 还原模板
-            this.getTemplateItem(this.$route.query.id)
+        onCancel: () => {
+          this.submitTemplate("CLOSE");
         },
-        getTemplateItem(id){ // 获取模板数据
-            API_floor.getHomeData(id).then(res => {
-                if (res.success) {
-                    let pageData = res.result.pageData;
-                    if(pageData) {
-                        pageData = JSON.parse(pageData);
-                        if (pageData.list[0].type === 'topAdvert') { // topAdvert 为顶部广告 navList为导航栏
-                            this.$refs.modelForm.topAdvert = pageData.list[0];
-                            this.$refs.modelForm.navList = pageData.list[1];
-                            pageData.list.splice(0,2)
-                            this.modelForm = pageData;
-                        } else {
-                            this.modelForm = {list:[]}
-                        }
-                        
-                    } else {
-                        this.modelForm = {list:[]}
-                    }
-                }
-                
-                // this.$refs.modelForm.topAdvert = {};
-                // this.$refs.modelForm.navList = {}
-            })
-        }
-        
+      });
     },
-    watch: {
-        modelForm: {
-            deep: true,
-            handler: function (val) {
-                console.log(val)
+    // 提交模板
+    submitTemplate(pageShow) {
+      this.modelForm.list.unshift(this.$refs.modelForm.navList);
+      this.modelForm.list.unshift(this.$refs.modelForm.topAdvert);
+      const modelForm = JSON.stringify(this.modelForm);
+      const data = {
+        id: this.$route.query.id,
+        pageData: modelForm,
+        pageShow,
+      };
+      API_floor.updateHome(this.$route.query.id, data).then((res) => {
+        if (res.success) {
+          this.$Message.success("保存模板成功");
+        } else {
+          this.$Message.error(res.message);
+        }
+      });
+    },
+    resetTemplate() {
+      // 还原模板
+      this.getTemplateItem(this.$route.query.id);
+    },
+    getTemplateItem(id) {
+      // 获取模板数据
+      API_floor.getHomeData(id).then((res) => {
+        if (res.success) {
+          let pageData = res.result.pageData;
+          if (pageData) {
+            pageData = JSON.parse(pageData);
+            if (pageData.list[0].type === "topAdvert") {
+              // topAdvert 为顶部广告 navList为导航栏
+              this.$refs.modelForm.topAdvert = pageData.list[0];
+              this.$refs.modelForm.navList = pageData.list[1];
+              pageData.list.splice(0, 2);
+              this.modelForm = pageData;
+            } else {
+              this.modelForm = { list: [] };
             }
-        } 
-    }
-}
+          } else {
+            this.modelForm = { list: [] };
+          }
+        }
+
+        // this.$refs.modelForm.topAdvert = {};
+        // this.$refs.modelForm.navList = {}
+      });
+    },
+  },
+  watch: {
+    modelForm: {
+      deep: true,
+      handler: function (val) {
+        console.log(val);
+      },
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-.renovation{
-    position: relative;
-    display: flex;
+.renovation {
+  position: relative;
+  display: flex;
 }
-.model-list{
-    width: 120px;
-    height:auto;
-    padding: 10px;
-    background: #fff;
-    margin-top: 60px;
-    position: fixed;
-    z-index: 100;
-    box-shadow: 1px 1px 10px #999;
-    .classification-title{
-        width: 100%;
-        height: 30px;
-        line-height: 30px;
-    }
-    .model-item{
-        width: 100px;
-        height: 30px;
-        background: #eee;
-        margin-top: 10px;
-        line-height: 30px;
-        text-align: center;
-        color: #999;
-        &:hover{
-            border: 1px dashed #409EFF;
-            color: #409EFF;
-            cursor: move;
-        }
-    }
-    .ghost::after{
-        border:none;
-        height: 0;
-        content: '';
-    }
-}
-.show-content{
-    margin-left: 150px;
-    margin-top: 60px;
-}
-.ghost{
-    background: #fff;
-    height: 30px;
-    position: relative;
-    &::after{
-        content: '松开鼠标添加模块';
-        position: absolute;
-        background: #fff;
-        border: 1px dashed #409EFF;
-        color: #409EFF;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 50px;
-        text-align: center;
-        line-height: 50px;
-    }
-}
-.btn-bar{
-    position: fixed;
+.model-list {
+  width: 120px;
+  height: auto;
+  padding: 10px;
+  background: #fff;
+  margin-top: 60px;
+  position: fixed;
+  z-index: 100;
+  box-shadow: 1px 1px 10px #999;
+  .classification-title {
     width: 100%;
-    background:#fff;
-    height: 50px;
-    padding: 10px;
-    box-shadow: 1px 1px 10px #999;
-    z-index: 99;
-    top: 100px;
+    height: 30px;
+    line-height: 30px;
+  }
+  .model-item {
+    width: 100px;
+    height: 30px;
+    background: #eee;
+    margin-top: 10px;
+    line-height: 30px;
+    text-align: center;
+    color: #999;
+    &:hover {
+      border: 1px dashed #409eff;
+      color: #409eff;
+      cursor: move;
+    }
+  }
+  .ghost::after {
+    border: none;
+    height: 0;
+    content: "";
+  }
 }
-
-</style>
\ No newline at end of file
+.show-content {
+  margin-left: 150px;
+  margin-top: 60px;
+}
+.ghost {
+  background: #fff;
+  height: 30px;
+  position: relative;
+  &::after {
+    content: "松开鼠标添加模块";
+    position: absolute;
+    background: #fff;
+    border: 1px dashed #409eff;
+    color: #409eff;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 50px;
+    text-align: center;
+    line-height: 50px;
+  }
+}
+.btn-bar {
+  position: fixed;
+  width: 100%;
+  background: #fff;
+  height: 50px;
+  padding: 10px;
+  box-shadow: 1px 1px 10px #999;
+  z-index: 99;
+  top: 100px;
+}
+</style>
diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue
index 16ef3934..47ae392a 100644
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -70,7 +70,7 @@
             @click="edit(row)"
             >编辑</Button
           >
-          &nbsp;
+
           <Button
             type="info"
             size="small"
@@ -79,7 +79,7 @@
             @click="manage(row)"
             >查看</Button
           >
-          &nbsp;
+
           <Button
             type="primary"
             size="small"
@@ -88,7 +88,7 @@
             @click="manage(row)"
             >管理</Button
           >
-          &nbsp;
+
           <!-- <Button type="success" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'END'" @click="upper(row)">上架</Button>   -->
           <Button
             type="error"
@@ -100,7 +100,7 @@
             @click="off(row)"
             >下架</Button
           >
-          &nbsp;
+
           <Button
             type="error"
             size="small"
@@ -311,4 +311,7 @@ export default {
 </script>
 <style lang="scss">
 @import "@/styles/table-common.scss";
+.mr_5{
+  margin: 0 4px;
+}
 </style>
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
index dda4752a..08989ea6 100644
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -385,3 +385,9 @@ div.base-info-item {
   font-size: 20px;
   cursor: pointer;
 }
+
+.tree-bar{
+  height: auto !important;
+  max-height: auto !important;
+  min-height: 240px !important;
+}
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index ea90ac09..516759fc 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -485,7 +485,7 @@
           </div>
           <h4>商品详情描述</h4>
           <div class="form-item-view">
-            <div class="tree-bar" :style="{ maxHeight: maxHeight }">
+            <div class="tree-bar" >
               <FormItem
                 class="form-item-view-el"
                 label="店内分类"
@@ -815,7 +815,6 @@ export default {
       /** 3级分类列表*/
       categoryListLevel3: [],
 
-      maxHeight: "240px",
       /** 请求的商品参数组列表 */
       goodsParams: [
         {