From 64b6e516460dc6d5b54d1e768ac99031010939b8 Mon Sep 17 00:00:00 2001
From: rose <1942951600@qq.com>
Date: Fri, 21 May 2021 17:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debug.log                                |  2 ++
 src/components/Activity/ActivityEdit.vue |  6 +++---
 src/components/Banner/BannerAdd.vue      |  6 +++---
 src/components/Banner/BannerDate.vue     | 15 ++++++++++++++-
 src/components/Banner/BannerEdit.vue     | 23 +++++++++++++++++++++--
 src/views/BannerManage/BannerManage.vue  |  3 +++
 src/views/BannerManage/BannerManageM.vue |  3 +++
 7 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/debug.log b/debug.log
index 01df689..d0c9414 100644
--- a/debug.log
+++ b/debug.log
@@ -1,3 +1,5 @@
 [0517/154023.784:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0518/172215.096:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0519/162903.250:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0520/141445.581:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0521/162041.196:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
diff --git a/src/components/Activity/ActivityEdit.vue b/src/components/Activity/ActivityEdit.vue
index cd371e0..91fdd2c 100644
--- a/src/components/Activity/ActivityEdit.vue
+++ b/src/components/Activity/ActivityEdit.vue
@@ -2,9 +2,9 @@
   <div class="d-flex flex-wrap pb-3">
     <!-- 缂栬緫 -->
     <a-modal
-      :maskClosable="false"
+      :mask-closable="false"
       @cancel="$emit('closeModal')"
-      destroyOnClose
+      destroy-on-close
       footer
       title="淇敼娲诲姩鍏憡"
       v-model="editVisible"
@@ -247,8 +247,8 @@ const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };
 
 export default {
   name: 'ActivityEdit',
-  props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
   components: { QuillEditor },
+  props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
   data() {
     return {
       formItemLayout,
diff --git a/src/components/Banner/BannerAdd.vue b/src/components/Banner/BannerAdd.vue
index d36fde9..9a04400 100644
--- a/src/components/Banner/BannerAdd.vue
+++ b/src/components/Banner/BannerAdd.vue
@@ -56,7 +56,7 @@
           label="璁惧"
         >
           <a-select
-            @change="getUse($event, 'divice')"
+            @change="getUse($event, 'showPosition')"
             class="ml-3"
             default-value="PC"
             style="width: 150px"
@@ -129,7 +129,7 @@ export default {
       form: this.$form.createForm(this, { name: 'r-d-add' }),
       enable: ['鍚敤', '绂佺敤'],
       enable1: ['涓嶈烦杞�', 'H5'],
-      enable3: ['pc','mobile'],
+      enable3: ['鍏ㄩ儴','pc','灏忕▼搴�'],
       enable2: [
         {
           name: '棣栭〉',
@@ -196,7 +196,7 @@ export default {
         url: '',
         recStatus: 0,
         showPage: 0,
-        divice: ''
+        showPosition: 0
       },
       fileList: [],
       //闄愬埗鏂囦欢涓婁紶鐨勬牸寮忓拰澶у皬
diff --git a/src/components/Banner/BannerDate.vue b/src/components/Banner/BannerDate.vue
index c7a2c82..8f89095 100644
--- a/src/components/Banner/BannerDate.vue
+++ b/src/components/Banner/BannerDate.vue
@@ -26,12 +26,17 @@
           <span v-if="record.jumpUrl">{{ jumpUrl }}</span>
           <span v-else>鏃�</span>
         </template>
+        <!-- 鏄剧ず灞曠ず鐨勪綅缃� -->
+         <template slot="showPosition" slot-scope="text, record">
+          <span v-if="record.showPosition">{{ showPosition }}</span>
+          <span v-else>鏃�</span>
+        </template>
         <template slot="edit" slot-scope="text, record">
           <a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
           <a-popconfirm @confirm="() => onDelete(record.id)" title="纭畾瑕佸垹闄よ繖涓�鏉�?" v-if="lists.list">
             <a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
           </a-popconfirm>
-          <a-switch checked-children="鍚敤" class="ml-4" default-checked un-checked-children="绂佺敤" />
+          <a-switch checked-children="鍚敤" class="ml-4" :checked="!Boolean(record.recStatus)" un-checked-children="绂佺敤" />
         </template>
       </a-table>
     </div>
@@ -83,6 +88,14 @@ const columns = [
     key: 'jumpUrl',
     scopedSlots: { customRender: 'jumpUrl' },
   },
+  
+  {
+    title: '灞曠ず浣嶇疆',
+    align: 'center',
+    dataIndex: 'showPosition',
+    key: 'showPosition',
+    scopedSlots: { customRender: 'showPosition' },
+  },
   {
     title: '鍥剧墖鍙傛暟',
     align: 'center',
diff --git a/src/components/Banner/BannerEdit.vue b/src/components/Banner/BannerEdit.vue
index f7ebaff..97f27fb 100644
--- a/src/components/Banner/BannerEdit.vue
+++ b/src/components/Banner/BannerEdit.vue
@@ -1,13 +1,14 @@
 <template>
   <div class="d-flex flex-wrap pb-3">
-    <!-- 缂栬緫 -->
+    <!-- 缂栬緫    v-model="editVisible"-->
     <a-modal
       :mask-closable="false"
       @cancel="$emit('closeModal')"
       destroy-on-close
       footer
       title="淇敼杞挱鍥�"
-      v-model="editVisible"
+      :visible="editVisible"
+    
       width="700px"
     >
       <a-form :form="form" @submit="handleSubmit" v-if="editItem">
@@ -43,6 +44,20 @@
           >
             <a-select-option :key="item" :value="index" v-for="(item, index) in enable">{{ item }}</a-select-option>
           </a-select>
+        </a-form-item>
+         <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="璁惧"
+        >
+          <a-select
+            @change="getUse($event, 'showPosition')"
+            class="ml-3"
+            default-value="PC"
+            style="width: 150px"
+          >
+            <a-select-option :key="item" :value="index" v-for="(item, index) in enable3">{{ item }}</a-select-option>
+          </a-select>
         </a-form-item>
         <!-- 椤甸潰鏄剧ず浣嶇疆 -->
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="椤甸潰鏄剧ず浣嶇疆">
@@ -95,6 +110,7 @@ export default {
       form: this.$form.createForm(this, { name: 'r-d-add' }),
       enable: ['鍚敤', '绂佺敤'],
       enable1: ['涓嶈烦杞�', 'H5'],
+      enable3: ['鍏ㄩ儴','pc','灏忕▼搴�'],
       enable2: [
         {
           name: '棣栭〉',
@@ -169,6 +185,7 @@ export default {
         recStatus: '',
         showPage: '',
         url: '',
+        showPosition: ''
       },
       jumpType: '',
       recStatus: '',
@@ -200,6 +217,7 @@ export default {
     // 鏀瑰彉鎼滅储鏉′欢
     getUse(e, str) {
       this.editData[str] = e;
+      console.log(this.editData[str])
       if (str === 'jumpType' && e === 0) {
         console.log("=")
         this.editData.jumpUrl = '';
@@ -247,6 +265,7 @@ export default {
                 recStatus: this.editData.recStatus,
                 showPage: this.editData.showPage,
                 url: this.editData.url,
+                showPosition: this.editData.showPosition,
               },
             };
             const res = await updateCarousel(params);
diff --git a/src/views/BannerManage/BannerManage.vue b/src/views/BannerManage/BannerManage.vue
index 0d5f567..2000fdf 100644
--- a/src/views/BannerManage/BannerManage.vue
+++ b/src/views/BannerManage/BannerManage.vue
@@ -29,6 +29,7 @@ export default {
         jumpType: 0,
         recStatus: 0,
       },
+      device: 0
     };
   },
 
@@ -48,6 +49,8 @@ export default {
         }
         const params = {
           param: {
+            //to do 澧炲姞涓�涓叧浜巇evice鐨勫弬鏁�
+            device: this.device,
             showPage: this.paramData.showPage,
             jumpType: this.paramData.jumpType,
             recStatus: this.paramData.recStatus,
diff --git a/src/views/BannerManage/BannerManageM.vue b/src/views/BannerManage/BannerManageM.vue
index 22042ec..6d061ea 100644
--- a/src/views/BannerManage/BannerManageM.vue
+++ b/src/views/BannerManage/BannerManageM.vue
@@ -29,6 +29,7 @@ export default {
         jumpType: 0,
         recStatus: 0,
       },
+      device: 1
     };
   },
 
@@ -48,6 +49,8 @@ export default {
         }
         const params = {
           param: {
+            //to do 澧炲姞涓�涓叧浜巇evice鐨勫弬鏁�
+            device: this.device,
             showPage: this.paramData.showPage,
             jumpType: this.paramData.jumpType,
             recStatus: this.paramData.recStatus,