Skip to content

C
cust_web
Commit 904a5bbc authored by liwei's avatar liwei
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 589dddb8 8b0138b6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5625 additions and 613 deletions
src/api/contentManagement/activity.js
View file @ 904a5bbc
import request from '@/utils/request'
import Qs from 'qs'
import {parseTime} from '@/utils/common';
/**
* 1. 列表查询
......@@ -11,7 +12,7 @@ import Qs from 'qs'
*
*/
// 1. 查询新闻资讯列表
// 1. 查询活动列表
export function listCmsActivity(query) {
return request({
url: '/cmsActivity/queryCmsActivityByPagination',
......@@ -20,7 +21,7 @@ export function listCmsActivity(query) {
})
}
// 2. 查询新闻资讯详细信息
// 2. 查询活动详细信息
export function getCmsActivity(businessId) {
return request({
url: '/cmsActivity/detail/' + businessId,
......@@ -28,7 +29,7 @@ export function getCmsActivity(businessId) {
})
}
// 3. 新增新闻资讯
// 3. 新增活动
export function addCmsActivity(data) {
data = Qs.stringify(data)
return request({
......@@ -38,7 +39,7 @@ export function addCmsActivity(data) {
})
}
// 4. 修改新闻资讯
// 4. 修改活动
export function updateCmsActivity(data) {
const businessId = data.businessId
data = Qs.stringify(data)
......@@ -49,7 +50,7 @@ export function updateCmsActivity(data) {
})
}
// 5. 逻辑删除新闻资讯
// 5. 逻辑删除活动
export function delCmsActivity(businessId) {
return request({
url: '/cmsActivity/delete/' + businessId,
......@@ -57,7 +58,7 @@ export function delCmsActivity(businessId) {
})
}
// 6. 导出新闻资讯
// 6. 导出活动
export function exportCmsActivity(query) {
return request({
url: '/cmsActivity/export',
......@@ -66,7 +67,7 @@ export function exportCmsActivity(query) {
responseType: 'blob'
})
}
// 7. 修改新闻资讯状态
// 7. 修改活动状态
export function updateStatus(data) {
const businessId = data.businessId
data = Qs.stringify(data)
......
src/api/contentManagement/memInfo.js 0 → 100644
View file @ 904a5bbc
import request from '@/utils/request'
import Qs from 'qs'
/**
* 1. 列表查询
* 2. 查询详细信息
* 3. 新增
* 4. 修改
* 5. 逻辑删除
* 6. 导出
*
*/
// 1. 查询会员
export function listMemInfo(query) {
return request({
url: '/memInfo/list',
method: 'get',
params: query
})
}
// 2. 查询会员
export function getMemInfo(businessId) {
return request({
url: '/memInfo/detail/' + businessId,
method: 'get'
})
}
// 3. 新增会员
export function addMemInfo(data) {
data = Qs.stringify(data)
return request({
url: '/memInfo/add',
method: 'post',
data: data
})
}
// 4. 修改会员
export function updateMemInfo(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/memInfo/update/' + businessId,
method: 'put',
data
})
}
// 5. 逻辑删除会员
export function delMemInfo(businessId) {
return request({
url: '/memInfo/delete/' + businessId,
method: 'delete'
})
}
// 6. 导出会员
export function exportMemInfo(query) {
return request({
url: '/memInfo/export',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 7. 获取私密信息
export function getPrivateInfo(businessId) {
return request({
url: '/memInfo/getUserPhone',
method: 'get',
params: { businessId: businessId }
})
}
src/api/contentManagement/notice.js
View file @ 904a5bbc
......@@ -11,7 +11,7 @@ import Qs from 'qs'
*
*/
// 1. 查询新闻资讯列表
// 1. 查询公告列表
export function listCmsNotice(query) {
return request({
url: '/cmsNotice/queryCmsNoticeByPagination',
......@@ -20,7 +20,7 @@ export function listCmsNotice(query) {
})
}
// 2. 查询新闻资讯详细信息
// 2. 查询公告详细信息
export function getCmsNotice(businessId) {
return request({
url: '/cmsNotice/detail/' + businessId,
......@@ -28,7 +28,7 @@ export function getCmsNotice(businessId) {
})
}
// 3. 新增新闻资讯
// 3. 新增公告
export function addCmsNotice(data) {
data = Qs.stringify(data)
return request({
......@@ -38,7 +38,7 @@ export function addCmsNotice(data) {
})
}
// 4. 修改新闻资讯
// 4. 修改公告
export function updateCmsNotice(data) {
const businessId = data.businessId
data = Qs.stringify(data)
......@@ -49,7 +49,7 @@ export function updateCmsNotice(data) {
})
}
// 5. 逻辑删除新闻资讯
// 5. 逻辑删除公告
export function delCmsNotice(businessId) {
return request({
url: '/cmsNotice/delete/' + businessId,
......@@ -57,7 +57,7 @@ export function delCmsNotice(businessId) {
})
}
// 6. 导出新闻资讯
// 6. 导出公告
export function exportCmsNotice(query) {
return request({
url: '/cmsNotice/export',
......@@ -66,7 +66,7 @@ export function exportCmsNotice(query) {
responseType: 'blob'
})
}
// 7. 修改新闻资讯状态
// 7. 修改公告状态
export function updateStatus(data) {
const businessId = data.businessId
data = Qs.stringify(data)
......
src/api/contentManagement/topic.js 0 → 100644
View file @ 904a5bbc
import request from '@/utils/request'
import Qs from 'qs'
/**
* 1. 列表查询
* 2. 查询详细信息
* 3. 新增
* 4. 修改
* 5. 逻辑删除
* 6. 导出
*
*/
// 1. 查询话题列表
export function listOpmTopic(query) {
return request({
url: '/opmTopic/queryOpmTopicByPagination',
method: 'get',
params: query
})
}
// 2. 查询新闻资讯详细信息
export function getOpmTopic(businessId) {
return request({
url: '/opmTopic/detail/' + businessId,
method: 'get'
})
}
// 3. 新增新闻资讯
export function addOpmTopic(data) {
data = Qs.stringify(data)
return request({
url: '/opmTopic/add',
method: 'post',
data: data
})
}
// 4. 修改新闻资讯
export function updateOpmTopic(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/opmTopic/update/' + businessId,
method: 'post',
data
})
}
// 5. 逻辑删除新闻资讯
export function delOpmTopic(businessId) {
return request({
url: '/opmTopic/delete/' + businessId,
method: 'delete'
})
}
// 6. 导出新闻资讯
export function exportOpmTopic(query) {
return request({
url: '/opmTopic/export',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 7. 修改新闻资讯状态
export function updateStatus(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/opmTopic/updateStatus/' + businessId,
method: 'post',
data: data
})
}
// 7. 修改审核状态
export function updateExamStatus(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/opmTopic/updateExamStatus/' + businessId,
method: 'post',
data: data
})
}
export function updateNoExamStatus(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/opmTopic/updateNoExamStatus/' + businessId,
method: 'post',
data: data
})
}
src/utils/allPageData.js
View file @ 904a5bbc
// 命名导出
export { typeField, enableOrDisable, yesOrNo }
export { typeField, enableOrDisable, yesOrNo, isExam }
/** banner管理*/
/** 分类*/
const typeField = [
{ value: '0', label: '首页' },
{ value: '1', label: '活动' }
{ value: '1', label: '首页' },
{ value: '0', label: '活动' }
]
/** 启用、停用*/
const enableOrDisable = [
......@@ -14,6 +14,12 @@ const enableOrDisable = [
/** 是、否*/
const yesOrNo = [
{ value: 0, label: '是' },
{ value: 1, label: '否' }
{ value: 1, label: '是' },
{ value: 0, label: '否' }
]
const isExam = [
{ value: '0', label: '待审核' },
{ value: '1', label: '已通过' },
{ value: '2', label: '已审核' }
]
src/utils/options.js 0 → 100644
View file @ 904a5bbc
This diff is collapsed.
src/views/contentManagement/notice/index.vue
View file @ 904a5bbc
......@@ -67,42 +67,38 @@
</template>
</el-table-column>
<el-table-column align="center" prop="title" label="公告标题" min-width="200" show-overflow-tooltip />
<el-table-column align="center" prop="summary" label="公告摘要" min-width="200" show-overflow-tooltip />
<el-table-column align="center" label="封面" min-width="120" prop="pictureId">
<!-- <template slot-scope="scope">
<div :id="step(scope.$index)">
<el-image :src="scope.row.path" :preview-src-list="[scope.row.path]" style="width:100%;height:100%;" @mouseover="justEnter($event)" @mouseout="justOut($event)" />
</div>
</template>-->
<el-table-column align="center" label="图片" prop="pictureId" min-width="120">
<template slot-scope="scope">
<div :id="step(scope.$index)">
<!-- 修改 src 路径 -->
<el-image
:src="getImagePath(scope.row.path)"
:preview-src-list="[getImagePath(scope.row.path)]"
style="width:100%;height:100%;"
@mouseover="justEnter($event)"
@mouseout="justOut($event)" />
@mouseout="justOut($event)"
/>
</div>
</template>
</el-table-column>
<el-table-column align="left" prop="isTop" min-width="80" label="置顶" show-overflow-tooltip>
<!-- <template slot-scope="scope">
<el-table-column align="left" prop="isTop" min-width="80" label="置顶" show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ scope.row.isTop === 1 ? '是' : '否' }}</span>
</template>-->
<template slot-scope="scope">
<el-tag v-if="scope.row.isTop === 1" type="success" size="medium ">置顶</el-tag>
</template>
</el-table-column>
<el-table-column align="left" prop="isRecommended" min-width="80" label="推荐" show-overflow-tooltip>
<el-table-column align="left" prop="isRecommended" min-width="80" label="推荐" show-overflow-tooltip>
<template slot-scope="scope">
<el-tag v-if="scope.row.isRecommended === 1" type="warning" size="medium ">推荐</el-tag>
</template>
</el-table-column>
<el-form-item label="排序:" prop="weight">
<el-input-number v-model.trim="form.weight" style="width: 100%" controls-position="right" :min="0" />
</el-form-item>
<el-table-column align="left" prop="releaseStatus" label="发布状态" min-width="120" show-overflow-tooltip>
<el-table-column label="权重" prop="weight" :show-overflow-tooltip="true" min-width="55">
<template slot-scope="scope">
{{ scope.row.weight || '-' }}
</template>
</el-table-column>
<el-table-column align="left" prop="releaseStatus" label="状态" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
......@@ -113,7 +109,7 @@
/>
</template>
</el-table-column>
<!-- <el-table-column align="left" prop="createUser" label="提交人" show-overflow-tooltip>
<!-- <el-table-column align="left" prop="createUser" label="提交人" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.nickName }}</span>
</template>
......@@ -123,13 +119,13 @@
<span>{{ scope.row.publishDate }}</span>
</template>
</el-table-column>
<!-- <el-table-column align="left" prop="createDate" label="提交时间" show-overflow-tooltip>
<!-- <el-table-column align="left" prop="createDate" label="提交时间" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.createDate }}</span>
</template>
</el-table-column>-->
<el-table-column align="center" label="操作" min-width="160">
<el-table-column align="center" label="操作" min-width="160">
<template slot-scope="scope">
<el-button
v-has-permi="hasDetailPerm"
......@@ -158,8 +154,8 @@
</el-table>
</div>
<pagination
:key="pageKey"
v-show="total>0"
:key="pageKey"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.rows"
......@@ -176,11 +172,8 @@ import {
delCmsNotice,
listCmsNotice, updateStatus
} from '@/api/contentManagement/notice'
import { updateResponseUrl } from '@/utils/updateUrl'
import { error } from 'autoprefixer/lib/utils'
import { parseTime } from '@/utils'
import { getDataCache, setDataCache } from '@/assets/js/filterData'
import { listCmsActivity } from '@/api/contentManagement/activity'
export default {
name: 'Index',
// components: {
......@@ -192,8 +185,6 @@ export default {
hasAddPerm: ['sys:notice:add'],
hasUpdatePerm: ['sys:notice:update'],
hasDetailPerm: ['sys:notice:query'],
/* imageSrc: require('@/assets/image/test.png'),*/
// 显示开关
showSwitch: {
courseContent: true,
......@@ -215,10 +206,8 @@ export default {
formLabelWidth: '90px',
// 表格
tableData: [],
lineindex: 0,
teacode: '',
// edit form
labelPosition: 'right',
formLabelAlign: {
......@@ -230,21 +219,6 @@ export default {
},
// 日期范围
dateRange: [],
// 板块选择框
plateOptions: [
{
label: '板块一',
value: '1'
},
{
label: '板块二',
value: '2'
},
{
label: '板块三',
value: '3'
}
],
// 发布状态
releaseStatusOptions: [
{
......@@ -256,30 +230,18 @@ export default {
value: '0'
}
],
// 上传提交
uploadList: {
fm: ''
},
// search area
courseid: '',
coursename: '',
queryParams: {
page: 1,
rows: 10,
flag: ''
},
// pagination
total: 0,
actionUrl: '',
filelist: [],
bussid: [],
fullscreenLoading: false,
curCatForm: {
},
tableDataTips: '加载中'
}
},
......@@ -301,7 +263,7 @@ export default {
vm.queryParams.page = JSON.parse(getDataCache(vm.$route.path)).page
setTimeout(() => {
vm.loadData()
},500)
}, 500)
}
})
},
......@@ -315,17 +277,6 @@ export default {
step(index) {
return 'step' + index
},
changPlate(data) {
if (data === '1') {
return '板块一'
}
if (data === '2') {
return '板块二'
}
if (data === '3') {
return '板块三'
}
},
/**
* @description: 点击蒙版关闭预览图片
* @author: gaoyu
......@@ -469,8 +420,12 @@ export default {
},
// 获取图片的正确路径
getImagePath() {
return require(`@/assets/image/testImage/test.png`)
getImagePath(path) {
// 返回图片路径
if (path) {
return path
}
return ''
},
// 封面图片预览
justEnter(event) {
......
src/views/contentManagement/topic/index.vue
View file @ 904a5bbc
This diff is collapsed.
src/views/contentManagement/topic/info/index.vue 0 → 100644
View file @ 904a5bbc
This diff is collapsed.
src/views/operationsManagement/member/info/index.vue 0 → 100644
View file @ 904a5bbc
This diff is collapsed.
vue.config.js
View file @ 904a5bbc
......@@ -62,7 +62,7 @@ module.exports = {
// target: `http://49.232.167.247:20014/`,
// target: `http://192.168.10.185:8084/`,
// target: `http://106.3.97.198:20062/`,
target: `http://localhost:8082/`,
target: `http://localhost:8092/`,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment