From eeadfc1db97b50a98677c79252897f397f3f70d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 13 Jul 2022 09:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=A8=AA=E7=BA=B5=E5=90=91=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=88=91=E7=9A=84=E8=B6=B3=E8=BF=B9=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E5=B1=95=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexDecorate/modelList/Seckill.vue       |  2 +-
 buyer/src/pages/home/userCenter/MyTracks.vue  |  4 +-
 .../views/lili-floor-renovation/wap/config.js |  1 +
 .../lili-floor-renovation/wap/decorate.vue    | 45 ++++++++++++++++---
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/buyer/src/components/indexDecorate/modelList/Seckill.vue b/buyer/src/components/indexDecorate/modelList/Seckill.vue
index ea6c5da8..6b1be0bd 100644
--- a/buyer/src/components/indexDecorate/modelList/Seckill.vue
+++ b/buyer/src/components/indexDecorate/modelList/Seckill.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="seckill">
+  <div class="seckill" v-if="goodsList.length">
     <div class="aside hover-pointer" @click="goToSeckill">
       <div class="title">{{ actName }}</div>
       <div class="hour">
diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue
index b3cbb97c..d5c3b709 100644
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -111,8 +111,8 @@ export default {
       this.spinShow = true;
       tracksList(this.params).then((res) => {
         this.spinShow = false;
-        if (res.success && res.result) {
-          this.list = res.result;
+        if (res.success && res.result.records.length) {
+          this.list = res.result.records;
         } else {
           this.list = [];
         }
diff --git a/manager/src/views/lili-floor-renovation/wap/config.js b/manager/src/views/lili-floor-renovation/wap/config.js
index cc6808c4..e361fe34 100644
--- a/manager/src/views/lili-floor-renovation/wap/config.js
+++ b/manager/src/views/lili-floor-renovation/wap/config.js
@@ -532,6 +532,7 @@ export const modelData = [
           title: [{context: "这是一条公告"}],
           color: "#666",
           bk_color: "#FFF",
+          direction:"horizontal",
           img: 'http://files.sxcfx.cn/upload/20220318/71e5d27aca82aeedf647052e1e4ceaaa.png'
         }
       ]
diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue
index 9356dec5..3a447060 100644
--- a/manager/src/views/lili-floor-renovation/wap/decorate.vue
+++ b/manager/src/views/lili-floor-renovation/wap/decorate.vue
@@ -217,6 +217,23 @@
               <Input v-model="item.bk_color" />
             </div>
           </div>
+          <div
+            class="decorate-view"
+            v-if="item.title != void 0 && !res.notTitle && res.type == 'notice'"
+          >
+            <div class="decorate-view-title">方向</div>
+            <div class="decorate-view">
+              <Select
+                style="width: 200px"
+                @on-change="changeDirection($event, item)"
+                v-model="item.direction"
+              >
+              {{item.direction}}
+                <Option label="横向" value="horizontal"></Option>
+                <Option label="纵向" value="vertical"></Option>
+              </Select>
+            </div>
+          </div>
 
           <!-- 填写标题 -->
           <div
@@ -364,10 +381,11 @@
       v-if="
         res.type != 'tpl_ad_list' &&
         res.type != 'tpl_activity_list' &&
-        !res.notAdd
+        !res.notAdd &&
+        res.direction != 'horizontal'
       "
       type="primary"
-      @click="addDecorate(res.type)"
+      @click="addDecorate(res.type, res)"
       ghost
       >添加</Button
     >
@@ -414,6 +432,14 @@ export default {
   },
   props: ["res"],
   methods: {
+    // 改变横纵切换title内容
+    changeDirection(val, data) {
+      if (val == "horizontal") {
+        const props = {...data}
+        data.title = []
+        data.title.push( props.title[0]);
+      }
+    },
     // 选择风格
     selectStyle() {
       this.styleFlag = !this.styleFlag;
@@ -455,7 +481,7 @@ export default {
     },
     // 打开图片选择器
     liliDialogFlag(flag) {
-      this.$refs.liliDialog.clearGoodsSelected()
+      this.$refs.liliDialog.clearGoodsSelected();
       this.$refs.liliDialog.goodsFlag = flag;
       this.$refs.liliDialog.flag = true;
     },
@@ -482,11 +508,16 @@ export default {
       });
     },
     //添加设置
-    addDecorate(type) {
+    addDecorate(type, data) {
       if (type === "notice") {
-        this.res.options.list[0].title.push({
-          content: "",
-        });
+        console.log(data)
+        if (data.options.list[0].direction == "vertical") {
+          this.res.options.list[0].title.push({
+            content: "",
+          });
+        } else {
+          this.$Message.error("仅纵向支持多添加");
+        }
       } else {
         let way = {
           img: "https://picsum.photos/id/264/200/200",