@@ -85,6 +105,8 @@
import elDragDialog from '@/directive/el-drag-dialog'
import bannerApi from '@/api/Banner.js'
import db from '@/utils/localstorage'
+import creditGoodsApi from "@/api/creditGoods/CreditGoods.js";
+import ActivityTweets from '@/api/ActivityTweets'
import {
downloadFile,
loadEnums,
@@ -110,6 +132,19 @@ export default {
default: () => {}
}
},
+ watch: {
+ banner() {
+ if(this.banner.contentType == 1) {
+ this.getGoodList()
+ }
+ if(this.banner.contentType == 2) {
+ this.getActivityList()
+ }
+ if(this.banner.contentType == 3) {
+ this.getArticleList()
+ }
+ }
+ },
data() {
return {
typeOptions: [],
@@ -129,7 +164,26 @@ export default {
dataObj: {
folderId: 1
},
- unStart: false
+ unStart: false,
+ contentTypeList:[
+ {
+ value: 0,
+ label: '不跳转'
+ },
+ {
+ value: 1,
+ label: '积分商品'
+ },
+ {
+ value: 2,
+ label: '活动'
+ },
+ {
+ value: 3,
+ label: '文章'
+ }
+ ],
+ currentList: [],
}
},
computed: {
@@ -146,11 +200,9 @@ export default {
return this.$t('common.' + this.type)
},
},
- watch: {},
created(){
this.headers.token = 'Bearer ' + db.get('TOKEN', '')
- this.headers.tenant = 'MDAwMA=='
- console.log(this.headers,"this.headers")
+ this.headers.tenant = '0000'
},
mounted() {
window.onresize = () => {
@@ -160,6 +212,92 @@ export default {
}
},
methods: {
+ //商品列表
+ getGoodList() {
+ let data = {
+ current: 1,
+ map: {},
+ model: {},
+ order: "descending",
+ size: 999,
+ sort: "id",
+ timeRange: null
+ }
+ this.currentList = []
+ creditGoodsApi.page(data).then(response=> {
+ const res = response.data;
+ if (res.isSuccess) {
+ res.data.list.forEach(v => {
+ let data = {}
+ data.id = v.id
+ data.name = v.name
+ this.currentList.push(data)
+ });
+ console.log(this.currentList,"this.currentList")
+ }
+ })
+ },
+ getArticleList() {
+ let data = {
+ "pageNum": 1,
+ "pageSize": 999,
+ "searchKey": "",
+ "type": 2,
+ state: 1
+ }
+ this.currentList = []
+ ActivityTweets.page(data).then(response=> {
+ const res = response.data;
+ if (res.isSuccess) {
+ res.data.list.forEach(v => {
+ let data = {}
+ data.id = v.id
+ data.name = v.mainTitle
+ this.currentList.push(data)
+ });
+ console.log(this.currentList,"this.currentList")
+ }
+ })
+ },
+ getActivityList() {
+ let data = {
+ "pageNum": 1,
+ "pageSize": 999,
+ "searchKey": "",
+ "type": 1,
+ state: 1
+ }
+ this.currentList = []
+ ActivityTweets.page(data).then(response=> {
+ const res = response.data;
+ if (res.isSuccess) {
+ res.data.list.forEach(v => {
+ let data = {}
+ data.id = v.id
+ data.name = v.mainTitle
+ this.currentList.push(data)
+ });
+ console.log(this.currentList,"this.currentList")
+ }
+ })
+ },
+ changeContentType() {
+ if(this.banner.contentType == 0) {
+ this.banner.content = ''
+ }
+ if(this.banner.contentType == 1) {
+ this.getGoodList()
+ return
+ }
+ if(this.banner.contentType == 2) {
+ this.getActivityList()
+ return
+ }
+ if(this.banner.contentType == 3) {
+ this.getArticleList()
+ return
+ }
+ },
handleAvatarSuccess (response) {
const { url } = response.data
this.banner.imgUrl = url
@@ -271,4 +409,7 @@ export default {
},
}
-
+
diff --git a/src/views/brand/Edit.vue b/src/views/brand/Edit.vue
index 6175a21..1ed798c 100644
--- a/src/views/brand/Edit.vue
+++ b/src/views/brand/Edit.vue
@@ -115,7 +115,7 @@ export default {
watch: {},
created() {
this.headers.token = 'Bearer ' + db.get('TOKEN', '')
- this.headers.tenant = 'MDAwMA=='
+ this.headers.tenant = '0000'
},
mounted() {
window.onresize = () => {
diff --git a/src/views/classification/Edit.vue b/src/views/classification/Edit.vue
index 327e94a..8a973c7 100644
--- a/src/views/classification/Edit.vue
+++ b/src/views/classification/Edit.vue
@@ -225,7 +225,7 @@ export default {
},
created () {
this.headers.token = 'Bearer ' + db.get('TOKEN', '')
- this.headers.tenant = 'MDAwMA=='
+ this.headers.tenant = '0000'
// console.log(this.headers)
},
methods: {
diff --git a/src/views/creditGoods/goods/Edit.vue b/src/views/creditGoods/goods/Edit.vue
index dcf0e0a..0cd1a73 100644
--- a/src/views/creditGoods/goods/Edit.vue
+++ b/src/views/creditGoods/goods/Edit.vue
@@ -86,6 +86,8 @@
:limit="3"
:on-exceed="handleExceed"
:on-success="multipleFilesSuccess"
+ :file-list="fileList"
+ list-type="picture"
>
点击上传
@@ -133,13 +135,13 @@
}}
-
+
{{
@@ -177,13 +179,9 @@
placeholder="状态：1-上架，0-下架"
/>
-
+
+
+