From ccd5decbf794e71f6826e22d086838b4027181d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 18 Nov 2021 14:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A5=BC=E5=B1=82=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=20pc=E7=AB=AF=E4=B8=AD=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E5=9B=A0=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/lili-floor-renovation/floorList.vue    |  2 +-
 .../views/lili-floor-renovation/modelForm.vue    | 16 ++++++++--------
 .../lili-floor-renovation/modelFormItem.vue      | 13 +++++--------
 .../lili-floor-renovation/modelList/carousel.vue |  8 ++++----
 .../modelList/carousel1.vue                      |  8 ++++----
 .../modelList/carousel2.vue                      |  6 +++---
 .../modelList/firstPageAdvert.vue                |  8 ++++----
 .../modelList/newGoodsSort.vue                   | 12 ++++++------
 .../modelList/notEnough.vue                      |  4 +---
 .../modelList/recommend.vue                      | 12 ++++++------
 .../views/lili-floor-renovation/renovation.vue   |  2 +-
 11 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue
index 6962304e..560cf3b7 100644
--- a/manager/src/views/lili-floor-renovation/floorList.vue
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -42,7 +42,7 @@
       width="600"
       :z-index="100"
       :loading="loading"
-      mask-closable="false"
+      :mask-closable="false"
       @on-ok="newTemplate"
       @on-cancel="showModal = false"
     >
diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue
index 28cf7967..40da5323 100644
--- a/manager/src/views/lili-floor-renovation/modelForm.vue
+++ b/manager/src/views/lili-floor-renovation/modelForm.vue
@@ -22,7 +22,7 @@
             <div class="search-con">
                 <img :src="require('@/assets/logo.png')" class="logo" alt="">
                 <div class="search">
-                    <i-input v-model="searchData" size="large" placeholder="输入你想查找的商品">
+                    <i-input  size="large" placeholder="输入你想查找的商品">
                         <Button slot="append">搜索</Button>
                     </i-input>
                 </div>
@@ -58,9 +58,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+           
             >
             <!-- 顶部广告 -->
             <div class="modal-top-advert">
@@ -87,9 +87,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+          
             >
             <!-- 分类tab栏 -->
             <div class="modal-tab-bar">
@@ -121,7 +121,7 @@
         <liliDialog
             ref="liliDialog"
             @selectedLink="selectedLink"
-            @selectedGoodsData="selectedGoodsData"
+           
         ></liliDialog>
         <!-- 选择图片 -->
         <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue
index 47452bf2..121e514a 100644
--- a/manager/src/views/lili-floor-renovation/modelFormItem.vue
+++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue
@@ -147,9 +147,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-top-advert">
         <div>
@@ -216,7 +216,7 @@
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+  
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
@@ -287,10 +287,7 @@ export default {
     selectedLink(val) {
       this.selected.url = this.$options.filters.formatLinkType(val);
     },
-    // 拖动结束回调
-    handleMoveEnd({ newIndex, oldIndex }) {
-      console.log("index", newIndex, oldIndex);
-    },
+    
     handleSelectImg() {
       // 选择图片
       this.$refs.ossManage.selectImage = true;
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel.vue b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
index 970f57e9..cede534d 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
@@ -48,9 +48,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-tab-bar">
         <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -110,7 +110,7 @@
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+    
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
index 6c7396e0..3ee291f5 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
@@ -25,9 +25,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-tab-bar">
         <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -81,7 +81,7 @@
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+    
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel2.vue b/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
index 39a0606a..97c8d70b 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
@@ -70,7 +70,7 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
+      :mask-closable="false"
     >
       <div class="modal-tab-bar">
         <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -124,7 +124,7 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
+      :mask-closable="false"
     >
       <div class="modal-tab-bar">
         <Button type="primary" size="small" @click="handleAddGroup">添加组</Button>
@@ -173,7 +173,7 @@
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+     
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
index 0bf56950..8f8f0f90 100644
--- a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
@@ -18,9 +18,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
             >
             <div class="modal-top-advert">
                 <div>
@@ -54,7 +54,7 @@
         <liliDialog
             ref="liliDialog"
             @selectedLink="selectedLink"
-            @selectedGoodsData="selectedGoodsData"
+          
         ></liliDialog>
         <!-- 选择图片 -->
         <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
index 88196772..2acb66e9 100644
--- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
@@ -72,9 +72,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
             >
             <div class="modal-top-advert">
                 <div>
@@ -107,9 +107,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
             >
             <div class="modal-top-advert">
                 <div>
diff --git a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
index 7483e7c9..fc00097a 100644
--- a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
@@ -32,9 +32,7 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
             >
             <div class="modal-tab-bar">
                 <Button type="primary" size='small' @click="handleAddNav">添加分类</Button>
diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
index 7dddd9f3..a3847530 100644
--- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
@@ -107,9 +107,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-top-advert">
         <div>
@@ -169,9 +169,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-top-advert">
         <div><span>主标题：</span><Input v-model="selected.title" /></div>
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
index 468fd43a..59a73f9e 100644
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -3,7 +3,7 @@
     <!-- 左侧模块列表 -->
     <div class="model-list">
       <div class="classification-title">基础模块</div>
-      <draggable tag="ul" :list="modelData" v-bind="{group:{ name:'model', pull:'clone',put:false},sort:false, ghostClass: 'ghost'}" @end="handleMoveEnd" @start="handleMoveStart" :move="handleMove">
+      <draggable tag="ul" :list="modelData" v-bind="{group:{ name:'model', pull:'clone',put:false},sort:false, ghostClass: 'ghost'}"   >
         <li v-for="(model, index) in modelData" :key="index" class="model-item">
           <Icon :type="model.icon" />
           <span>{{model.name}}</span>