Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

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 = "";
     },
     // 绑定商品

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>

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>

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>

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

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