From 2ea2723aed024be2bcff251aa73e0bf2c989244b Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Wed, 16 Mar 2022 11:31:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/Search.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue
index 76d34ccd..1ac92403 100644
--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -147,12 +147,14 @@ export default {
   cursor: pointer;
 }
 .store-search{
-  width:63px;
+  width:55.6px;
   padding: 0 9px;
   border-radius: 0;
+  border-radius: 3px;
   &:nth-child(2){
-    width:62px;
-    margin-left: -5px;
+    width:55px;
+    margin-left: -2px;
+    border-radius: 3px;
   }
 }
 .btn-div{

From e27070e089dea93e358f091c4fe2de05e22d41fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 17 Mar 2022 16:35:10 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99bug=20=E4=BB=A5=E5=8F=8A=20buyer=E7=AB=AF?=
 =?UTF-8?q?=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/indexDecorate/modelList/Recommend.vue | 4 ++--
 manager/src/views/my-components/lili/upload-pic-thumb.vue  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buyer/src/components/indexDecorate/modelList/Recommend.vue b/buyer/src/components/indexDecorate/modelList/Recommend.vue
index eefa0aa3..41862ff2 100644
--- a/buyer/src/components/indexDecorate/modelList/Recommend.vue
+++ b/buyer/src/components/indexDecorate/modelList/Recommend.vue
@@ -161,7 +161,7 @@ export default {
           padding: 0 10px;
           font-size: 12px;
           >div:nth-child(1) {
-            width: 130px;
+
             margin-top: 30px;
             span:nth-child(1){
                 color: #fff;
@@ -169,7 +169,7 @@ export default {
                 padding: 0 5px;
                 background-color: #a25684;
                 display: block;
-                width: 120px;
+
                 overflow: hidden;
                 white-space: nowrap;
                 margin: 0 10px 10px 0;
diff --git a/manager/src/views/my-components/lili/upload-pic-thumb.vue b/manager/src/views/my-components/lili/upload-pic-thumb.vue
index 55103adb..3f464c76 100644
--- a/manager/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/manager/src/views/my-components/lili/upload-pic-thumb.vue
@@ -62,7 +62,7 @@ export default {
   },
   props: {
     value: {
-      type: Object
+      type: null
     },
     draggable: {
       type: Boolean,

From baaeef0978c5eb013fa1fc665d15a26a53fc8809 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 18 Mar 2022 17:41:29 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/member/list/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 303a7b9d..758c6ce8 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -51,6 +51,9 @@
     <!-- 修改模态框 -->
     <Modal v-model="descFlag" :title="descTitle" @on-ok="handleSubmitModal" width="500">
       <Form ref="form" :model="form" :rules="ruleValidate" :label-width="80">
+
+        <Input v-model="form.id" v-show="false"/>
+
         <FormItem label="头像">
           <img :src="form.face" class="face" />
           <Button type="text" class="upload" @click="() => {
@@ -462,7 +465,7 @@ export default {
 
     // 提交修改数据
     handleSubmitModal() {
-      const { nickName, sex, username, face, newPassword } = this.form;
+      const { nickName, sex, username, face, newPassword,id } = this.form;
       let time = new Date(this.form.birthday);
       let birthday =
         time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
@@ -474,6 +477,7 @@ export default {
         sex,
         birthday,
         face,
+        id
       };
       if (this.region != "undefined") {
         submit.regionId = this.regionId;

From 9a33db76e91ef9a7d5512e14d0f99333ae9939be Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Tue, 22 Mar 2022 10:14:31 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/lili-floor-renovation/floorList.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue
index c65b84cd..39e4cd5a 100644
--- a/manager/src/views/lili-floor-renovation/floorList.vue
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -82,7 +82,9 @@ export default {
         pageNumber:1,
         pageSize:10,
         sort: 'createTime',
-        order: 'desc'
+        order: 'desc',
+        pageType:"INDEX",
+        pageClientType:"PC",
       },
       columns: [
         // 列表展示的column

From 97d88abf80e42d52d054af1445c5c634bbcccf19 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Mon, 28 Mar 2022 18:21:44 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=BA=A2=E5=87=BA=20=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/goodsDetail/ShowGoodsDetail.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index 8e27e6c6..862e59e9 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height:auto;">
     <div class="item-intro-show">
       <div class="item-intro-detail" ref="itemIntroDetail">
         <div class="item-intro-nav item-tabs">
@@ -71,7 +71,7 @@
             </TabPane>
             <TabPane label="商品参数">
               <template v-if="detail.goodsParamsDTOList && detail.goodsParamsDTOList.length">
-                <div class="goods-params" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
+                <div class="goods-params" style="height:inherit;" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
                   <span class="ml_10">{{item.groupName}}</span>
                   <table class="mb_10" cellpadding='0' cellspacing="0" >
                     <tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
@@ -220,6 +220,7 @@ export default {
   width: 1200px;
   margin: 15px auto;
   display: flex;
+  overflow: scroll;
   flex-direction: row;
 
 }