diff --git a/src/api/lib.js b/src/api/lib.js new file mode 100644 index 0000000..2dd0d70 --- /dev/null +++ b/src/api/lib.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 获取图片列表 +export function getPics(params) { + return request({ + url: '/maps', + method: 'get', + params, + }) +} + +// 新增图片信息 +export function addPic(data) { + return request({ + url: '/maps', + method: 'post', + data + }) +} + +// 删除图片 +export function delPic(data) { + return request({ + url: '/maps', + method: 'delete', + data + }) + } \ No newline at end of file diff --git a/src/components/PicLib/index.vue b/src/components/PicLib/index.vue new file mode 100644 index 0000000..17c8de5 --- /dev/null +++ b/src/components/PicLib/index.vue @@ -0,0 +1,331 @@ + + + + + + + + + + + + + diff --git a/src/icons/svg/close.svg b/src/icons/svg/close.svg new file mode 100644 index 0000000..4cd7355 --- /dev/null +++ b/src/icons/svg/close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/pic.svg b/src/icons/svg/pic.svg new file mode 100644 index 0000000..ddfa485 --- /dev/null +++ b/src/icons/svg/pic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 99d3972..8a53c30 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,7 @@ import adRouter from './ad' import comRouter from './com' import adminRouter from './admin' import userRouter from './user' +import libRouter from './lib' import errRouter from './error' /** @@ -56,6 +57,7 @@ export const constantRoutes = [ // TODO: 首页暂时隐藏 // dashboardRouter, adRouter, + libRouter, // comRouter, // adminRouter, errRouter, diff --git a/src/router/lib.js b/src/router/lib.js new file mode 100644 index 0000000..d02d1e1 --- /dev/null +++ b/src/router/lib.js @@ -0,0 +1,23 @@ +/** When your routing table is too long, you can split it into small modules **/ + +import Layout from '@/layout' + +const libRouter = { + path: '/lib', + component: Layout, + name: 'lib', + meta: { + title: '资源库', + icon: 'pic', + }, + children: [ + { + path: '', + component: () => import('@/views/lib/index'), // Parent router-view + name: 'LibPic', + meta: {title: '图片管理'}, + }, + ], +} + +export default libRouter diff --git a/src/views/ad/edit.vue b/src/views/ad/edit.vue index 9ac47a4..60c43e6 100644 --- a/src/views/ad/edit.vue +++ b/src/views/ad/edit.vue @@ -162,7 +162,7 @@ name="image-file" :on-success="uploadSuccess" :on-error="uploadErr" - :disabled="!writeable" + :disabled="true" :show-file-list="false" :before-upload="beforeUpload" > @@ -180,6 +180,11 @@ class="ipt-tip" style="margin-top: 6px;" >只能上传小于 600k 的图片 + 选择图片 + + + + + + + + + 取 消 + 确 定 + + + @@ -286,9 +321,17 @@ import {getAdPos, getAd, addAd, updateAd, getAdAreaList} from '@/api/ad' import {getGameList} from '@/api/game' import {typeList, modeList} from '@/utils/ad-data' import moment from 'moment' +import PicLib from '@/components/PicLib' +import {mapGetters} from 'vuex' export default { name: 'AdEdit', + components: { + PicLib, + }, + computed: { + ...mapGetters(['username']), + }, data() { const validateJumpParams = (rule, value, callback) => { if ( @@ -313,6 +356,7 @@ export default { return { //common + user: '', writeable: false, companyid: 0, allGame: [], @@ -388,9 +432,15 @@ export default { {type: 'number', message: '是否推荐必须是数值', trigger: 'blur'}, ], }, + // modal + modalVisible: false, + tempPic: '', } }, async mounted() { + // 获取用户 + this.user = this.username + // 位置相关数据导入 this.modeList = modeList this.typeList = typeList @@ -647,8 +697,32 @@ export default { console.log(err) } }, + // modal + openModal() { + this.modalVisible = true + }, + closeModal() { + this.modalVisible = false + }, + changePic(data) { + this.tempPic = data.imgs[0] && data.imgs[0].url + }, + confirmPic() { + this.adForm.ad_image = this.tempPic + this.closeModal() + }, }, } + + diff --git a/src/views/lib/index.vue b/src/views/lib/index.vue new file mode 100644 index 0000000..4de885c --- /dev/null +++ b/src/views/lib/index.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/文档 (E) - 快捷方式.lnk b/文档 (E) - 快捷方式.lnk deleted file mode 100644 index 4fa844f..0000000 Binary files a/文档 (E) - 快捷方式.lnk and /dev/null differ