From 57ff6c8d70d6dba474f1f395d6610a750cd83dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 17 Jun 2021 14:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88pc=E6=A5=BC=E5=B1=82=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E6=8F=90=E7=A4=BA=E6=A1=86=EF=BC=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=97=A0=E7=97=95=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/lili-floor-renovation/floorList.vue  |  6 +++---
 manager/src/views/lili-floor-renovation/renovation.vue | 10 +---------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue
index e47f4239..29d8fd47 100644
--- a/manager/src/views/lili-floor-renovation/floorList.vue
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -25,7 +25,7 @@
               <span slot="close">关</span>
             </i-switch>
             <Button type="info" placement="right" @click="Template(item)" size="small">编辑</Button>
-            <Button type="success" placement="right" @click="decorate(item.id)" size="small">装修</Button>
+            <Button type="success" placement="right" @click="decorate(item)" size="small">装修</Button>
             <Poptip confirm title="删除此模板？" @on-ok="delTemplate(item.id)" @on-cancel="cancel">
               <Button type="error" size="small">删除</Button>
             </Poptip>
@@ -139,9 +139,9 @@ export default {
       this.showModal = true;
     },
 
-    decorate(id) {
+    decorate(val) {
       // 装修
-      this.$router.push({ name: "renovation", query: { id: id } });
+      this.$router.push({ name: "renovation", query: { id: val.id,pageShow:val.pageShow } });
     },
 
     getTemplateList() {
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
index 11faa20b..48ff7743 100644
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -40,15 +40,7 @@ export default {
   methods: {
     saveTemplate() {
       // 保存模板
-      this.$Modal.confirm({
-        title: "是否立即发布？",
-        onOk: () => {
-          this.submitTemplate("OPEN");
-        },
-        onCancel: () => {
-          this.submitTemplate("CLOSE");
-        },
-      });
+      this.submitTemplate(this.$route.query.pageShow ? 'OPEN' : 'CLOSE')
     },
     // 提交模板
     submitTemplate(pageShow) {