优惠移动端楼层装修

manager/src/api/promotion.js

@@ -41,7 +41,7 @@ export const getPromotionGoods = (promotionId, params) => {
 
 // 获取当前进行中的促销活动
 export const getAllPromotion = params => {
-  return getRequest("/promotion/current", params);
+  return getRequest("/promotion/promotion/current", params);
 };
 
 // 获取拼团数据

manager/src/views/lili-floor-renovation/wap/config.js

@@ -519,6 +519,24 @@ export const modelData = [
       ]
     }
   },
+  {
+    type: "notice",
+    name: "公告",
+    img: "md-image",
+    notAdd: false,
+    notLink: true,
+    notImg: true,
+    options: {
+      list: [
+        {
+          title: [{context: "这是一条公告"}],
+          color: "#666",
+          bk_color: "#FFF",
+          img: 'http://files.sxcfx.cn/upload/20220318/71e5d27aca82aeedf647052e1e4ceaaa.png'
+        }
+      ]
+    }
+  },
   {
     type: "promotions",
     name: "促销活动",

manager/src/views/lili-floor-renovation/wap/decorate.scss

@@ -148,7 +148,9 @@
   display: flex;
 }
 
-.decorate-notice {}
+.decorate-notice {
+  margin-top: 10px;
+}
 
 .card {}
 

manager/src/views/lili-floor-renovation/wap/decorate.vue

@@ -274,6 +274,11 @@
                 class="decorate-notice"
               >
                 <Input v-model="t.context" style="width: 200px" />
+                <Icon
+                  @click="removeNotice(tindex)"
+                  size="16"
+                  type="md-close-circle"
+                />
               </div>
             </div>
           </div>
@@ -503,6 +508,11 @@ export default {
       this.selectedGoods = item;
       this.picModelFlag = true;
     },
+    removeNotice(index) {
+      this.$nextTick(() => {
+        this.res.options.list[0].title.splice(index, 1);
+      });
+    },
     // 关闭
     closeDecorate(index) {
       this.$nextTick(() => {

manager/src/views/lili-floor-renovation/wap/index.vue

@@ -178,7 +178,7 @@ export default {
                       color1: val.subColor,
                       bk_color: val.subBkColor,
                       data: res.result.commodityList
-                        ? res.result.commodityList
+                        ? res.result.commodityList.splice(0,2)
                         : [],
                     });
                   }
@@ -195,7 +195,7 @@ export default {
             if (res.success && !exist) {
               this.contentData.list[newIndex].options.list.push({
                 data: res.result[val.promotionsType]
-                  ? res.result[val.promotionsType]
+                  ? res.result[val.promotionsType].splice(0,2)
                   : [],
                 type: val.promotionsType,
                 title1: val.subName,

manager/src/views/lili-floor-renovation/wap/template/index.js

@@ -46,5 +46,4 @@ export default {
   tpl_ad_list,
   promotions: tpl_promotions,
   tpl_activity_list,
-  tpl_adv
 };

manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue

@@ -1,38 +1,39 @@
 <template>
-    <div class="layout">
-        <div class="menu-list">
-            <div class="menu-item" v-for="(item,index) in res.list" :key="index">
-                <div>
-                    <img class="menu-img" :src="item.img" alt="">
-                </div>
-                <div class="menu-title">{{item.title}}</div>
-            </div>
+  <div class="layout">
+    <div class="menu-list">
+      <div class="menu-item" v-for="(item, index) in res.list" :key="index">
+        <div>
+          <img class="menu-img" :src="item.img" alt="" />
         </div>
+        <div class="menu-title">{{ item.title }}</div>
+      </div>
     </div>
+  </div>
 </template>
 <script>
 export default {
-    props:['res']
-}
+  props: ["res"],
+};
 </script>
 <style lang="scss" scoped>
-   @import "./tpl.scss";
-   .menu-list{
-       display: flex;
-       align-items: center;
-       flex-wrap: wrap;
+@import "./tpl.scss";
+.menu-list {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
 
-       >.menu-item{
-           text-align: center;
-           width: 20%;
-           margin:10px 0;
-       }
-   }
-   .menu-img{
-       width: 44px;
-       height: 44px;
-   }
-   .menu-title{
-       font-size: 12px;
-   }
+  > .menu-item {
+    text-align: center;
+    width: 20%;
+    margin: 10px 0;
+  }
+}
+.menu-img {
+  width: 44px;
+  height: 44px;
+}
+.menu-title {
+  font-size: 12px;
+}
 </style>