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 @@
{} } },
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="璁惧"
>
{{ jumpUrl }}
鏃
+
+
+ {{ showPosition }}
+ 鏃
+
onDelete(record.id)" title="纭畾瑕佸垹闄よ繖涓鏉?" v-if="lists.list">
-
+
@@ -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 @@
-
+
@@ -43,6 +44,20 @@
>
{{ item }}
+
+
+
+ {{ item }}
+
@@ -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,