diff --git a/.env.development b/.env.development index ad07c38..d21c7d5 100644 --- a/.env.development +++ b/.env.development @@ -9,3 +9,5 @@ VITE_EDITOR = vscode // VITE_EDITOR = webstorm 如果使用webstorm开发且要使用dom定位到代码行功能 请先自定添加 webstorm到环境变量 再将VITE_EDITOR值修改为webstorm // 如果使用docker-compose开发模式，设置为下面的地址或本机主机IP //VITE_BASE_PATH = http://177.7.0.12 + +VITE_WWW_PATH = 'http://w1.zkzk.org.cn' diff --git a/.env.production b/.env.production index 0e1c391..d0cd929 100644 --- a/.env.production +++ b/.env.production @@ -5,3 +5,5 @@ VITE_BASE_API = /api VITE_FILE_API = /api #下方修改为你的线上ip（如果需要在线使用表单构建工具时使用，其余情况无需使用以下环境变量） VITE_BASE_PATH = '' + +VITE_WWW_PATH = 'http://w1.zkzk.org.cn' diff --git a/src/api/academician.js b/src/api/academician.js new file mode 100644 index 0000000..476c536 --- /dev/null +++ b/src/api/academician.js @@ -0,0 +1,82 @@ +import service from '@/utils/request' + +// @Summary 获取列表 +// @Produce application/json +// @Router /cms/academician/getList [post] +export const getAcademicianList = (data) => { + return service({ + url: '/cms/academician/getList', + method: 'post', + data + }) +} + +// @Summary 新增 +// @Produce application/json +// @Param Object +// @Router /cms/academician/add [post] +export const addAcademician = (data) => { + return service({ + url: '/cms/academician/add', + method: 'post', + data + }) +} + +// @Summary 删除 +// @Produce application/json +// @Param ID int +// @Router /cms/academician/delete [delete] +export const deleteAcademician = (data) => { + return service({ + url: '/cms/academician/delete', + method: 'delete', + data + }) +} + +// @Summary 批量删除 +// @Param data body request.IdsReq true "批量删除" +// @Router /cms/academician/deleteByIds [delete] +export const deleteAcademicianByIds = (params) => { + return service({ + url: '/cms/academician/deleteByIds', + method: 'delete', + params + }) +} + +// @Summary 修改 +// @Produce application/json +// @Param Object +// @Router /cms/academician/update [put] +export const updateAcademician = (data) => { + return service({ + url: '/cms/academician/update', + method: 'put', + data + }) +} + +// @Summary 根据id获取 +// @Param data body api.GetById true "根据id获取" +// @Router /cms/academician/get [get] +export const getAcademicianById = (params) => { + return service({ + url: '/cms/academician/get', + method: 'get', + params + }) +} + +// @Summary 修改 +// @Produce application/json +// @Param Object +// @Router /cms/academician/setRel [put] +export const setAcademicianRel = (data) => { + return service({ + url: '/cms/academician/setRel', + method: 'put', + data + }) +} diff --git a/src/style/main.scss b/src/style/main.scss index 86e5bf2..2e2606a 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -699,3 +699,9 @@ li { } } } + +.section-title { + font-size: 16px; + line-height: 1.2; + margin-bottom: 15px; +} diff --git a/src/utils/format.js b/src/utils/format.js index 851b77c..edcab45 100644 --- a/src/utils/format.js +++ b/src/utils/format.js @@ -59,3 +59,16 @@ export const ReturnArrImg = (arr) => { export const onDownloadFile = (url) => { window.open(path + url) } + +const wwwPath = import.meta.env.VITE_WWW_PATH +export const getArticlePreviewPath = (ID) => { + return wwwPath + '/article/' + ID + '.html' +} + +export const getAcademicianPreviewPath = (ID) => { + return wwwPath + '/academician/' + ID + '.html' +} + +export const getEntrepreneurPreviewPath = (ID) => { + return wwwPath + '/entrepreneur/' + ID + '.html' +} diff --git a/src/utils/options.js b/src/utils/options.js new file mode 100644 index 0000000..b973314 --- /dev/null +++ b/src/utils/options.js @@ -0,0 +1,20 @@ + +export const articleTypeOptions = [ + { key: 1, label: '图文' }, + { key: 2, label: '视频' }, +] +export const statusOptions = [ + { key: 1, label: '草稿' }, + { key: 2, label: '待审核' }, + { key: 3, label: '待发布' }, + { key: 4, label: '已发布' }, + { key: 5, label: '已撤销' }, +] +export const formatArticleType = (value) => { + const rowLabel = articleTypeOptions.filter(item => item.key === value) + return rowLabel && rowLabel[0] && rowLabel[0].label +} +export const formatStatus = (value) => { + const rowLabel = statusOptions.filter(item => item.key === value) + return rowLabel && rowLabel[0] && rowLabel[0].label +} diff --git a/src/view/ad/content.vue b/src/view/ad/content.vue index 6f1b155..98b7231 100644 --- a/src/view/ad/content.vue +++ b/src/view/ad/content.vue @@ -94,9 +94,8 @@ :title="`文件类型为：${uploadInfo.mediaTypeInfo}, 大小不超过${uploadInfo.fileSizeInfo}, 宽*高: ${uploadInfo.mediaWidth}px*${uploadInfo.mediaHeight}px`" />
+ :action="`${imgUploadPath}/cms/mediaFile/upload?category=ad_content_imgs`" :show-file-list="false" + :on-success="uploadSuccess" :on-error="uploadFailure" :before-upload="beforeUpload"> 上传
diff --git a/src/view/ad/position.vue b/src/view/ad/position.vue index 5cf73d1..9b38235 100644 --- a/src/view/ad/position.vue +++ b/src/view/ad/position.vue @@ -56,9 +56,8 @@ - + diff --git a/src/view/content/academician/index.vue b/src/view/content/academician/index.vue index e69de29..3d44c00 100644 --- a/src/view/content/academician/index.vue +++ b/src/view/content/academician/index.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/view/content/article/index.vue b/src/view/content/article/index.vue index 045392e..b4aefb6 100644 --- a/src/view/content/article/index.vue +++ b/src/view/content/article/index.vue @@ -52,7 +52,7 @@