From 9213aed8e06b4901d37cf347f8f6470e870812db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 11 Aug 2021 10:19:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili-floor-renovation/wap/template/tpl_flex_five.vue    | 2 +-
 .../lili-floor-renovation/wap/template/tpl_flex_four.vue    | 2 +-
 .../lili-floor-renovation/wap/template/tpl_flex_three.vue   | 2 +-
 .../lili-floor-renovation/wap/template/tpl_flex_two.vue     | 5 ++---
 manager/src/views/sys/app-version/appVersion.vue            | 6 +-----
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
index 7b405c4a..eba7ea0c 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
@@ -25,6 +25,6 @@ export default {
   background-size: cover;
 }
 img {
-  width: 67px;
+  width: 67px !important;
 }
 </style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
index a3ac9350..e31dc7e2 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
@@ -28,6 +28,6 @@ export default {
 }
 
 img{
-  width: 84px;
+  width: 84px !important;
 }
 </style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
index e0916e1b..f6e8744f 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
@@ -24,6 +24,6 @@ export default {
   background-size: cover;
 }
 img{
-   width: 111px;
+   width: 111px !important;
 }
 </style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue
index 8c84872f..5cb0ae6b 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue
@@ -23,13 +23,12 @@ export default {
   display: flex;
   height: 110px;
   overflow: hidden;
-
 }
 .flex-item {
-    width: 50%;
+  width: 50%;
   > img {
     display: block;
-     max-width: 100%;
+    max-width: 100%;
     height: 100%;
   }
 }
diff --git a/manager/src/views/sys/app-version/appVersion.vue b/manager/src/views/sys/app-version/appVersion.vue
index b4a3eb01..84156bbb 100644
--- a/manager/src/views/sys/app-version/appVersion.vue
+++ b/manager/src/views/sys/app-version/appVersion.vue
@@ -387,11 +387,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.ivu-form-item {
-  margin-bottom: 14px;
-  vertical-align: top;
-  zoom: 1;
-}
+
 .search-form {
   width: 100%;
 }

From e521e723d502cba40cef6535b2a6580e3856b3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 11 Aug 2021 11:57:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili-floor-renovation/wap/decorate.vue     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue
index d47f53db..dfea9350 100644
--- a/manager/src/views/lili-floor-renovation/wap/decorate.vue
+++ b/manager/src/views/lili-floor-renovation/wap/decorate.vue
@@ -146,7 +146,7 @@ import { modelData } from "./config";
 import ways from "@/views/lili-dialog/wap.js"; // 选择链接的类型
 export default {
   components: {
-    ossManage
+    ossManage,
   },
   data() {
     return {
@@ -179,16 +179,18 @@ export default {
     },
     // 回调的商品信息
     selectedGoodsData(val) {
+     
       if (!val) return false;
-      val.forEach((item) => {
+      let data = val.map((item) => {
         delete item.selected;
-        item.img = item.thumbnail;
-        item.title = item.goodsName;
-        item.type = this.selectedGoods.title;
+        return {
+          img: item.thumbnail,
+          title: item.goodsName,
+          type: this.selectedGoods.title,
+          ...item
+        };
       });
-      this.res.options.list[0].listWay = this.res.options.list[0].listWay.concat(
-        val
-      );
+      this.res.options.list[0].listWay.push(...data);
       this.linkType = "";
     },
     // 绑定商品