diff --git a/.env.development b/.env.development
index 14e1335..4db83b6 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
# 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 无终街管理系统
# 开发环境配置
VITE_APP_ENV = 'development'
diff --git a/.env.production b/.env.production
index 1109bc6..f55841d 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
# 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 无终街管理系统
# 生产环境配置
VITE_APP_ENV = 'production'
diff --git a/src/api/oms/aftersale.js b/src/api/oms/aftersale.js
index 23bce5e..fd27a00 100644
--- a/src/api/oms/aftersale.js
+++ b/src/api/oms/aftersale.js
@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
// 查询订单售后列表
export function listOmsAftersale(query, pageReq) {
@@ -7,7 +7,7 @@ export function listOmsAftersale(query, pageReq) {
method: 'post',
data: query,
params: pageReq
- })
+ });
}
// 查询订单售后详细
@@ -15,7 +15,7 @@ export function getOmsAftersale(id) {
return request({
url: '/oms/aftersale/' + id,
method: 'get'
- })
+ });
}
// 新增订单售后
@@ -24,7 +24,7 @@ export function addOmsAftersale(data) {
url: '/oms/aftersale',
method: 'post',
data: data
- })
+ });
}
// 修改订单售后
@@ -33,7 +33,7 @@ export function updateOmsAftersale(data) {
url: '/oms/aftersale',
method: 'put',
data: data
- })
+ });
}
// 删除订单售后
@@ -41,7 +41,7 @@ export function delOmsAftersale(id) {
return request({
url: '/oms/aftersale/' + id,
method: 'delete'
- })
+ });
}
// 导出订单售后
@@ -50,21 +50,21 @@ export function exportOmsAftersale(query) {
url: '/oms/aftersale/export',
method: 'get',
params: query
- })
+ });
}
// 售后订单操作
-export function dealWithAftersale(data){
+export function dealWithAftersale(data) {
return request({
url: '/oms/aftersale/dealWith',
method: 'post',
data: data
- })
+ });
}
-export function viewLog(orderId){
+export function viewLog(orderId) {
return request({
url: `/oms/aftersale/log/` + orderId,
method: 'get'
- })
+ });
}
diff --git a/src/router/index.ts b/src/router/index.ts
index 6699eab..da9fb4c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -96,6 +96,48 @@ export const constantRoutes: RouteRecordRaw[] = [
},
// 新迁移的菜单,开发阶段暂时放在固定菜单内,后续迁移到权限菜单里
+
+ // 内容中心
+ {
+ path: '/content-center',
+ component: Layout,
+ // hidden: true,
+ // permissions: ['system:role:edit'],
+ children: [
+ // 视频管理
+ {
+ path: 'video-manage',
+ component: () => import('@/views/contentManage/video/index.vue'),
+ name: 'Video',
+ meta: { title: '视频管理', icon: '', noCache: true }
+ },
+ // 评论和点赞
+ {
+ path: 'comments',
+ component: () => import('@/views/contentManage/video/index.vue'),
+ name: 'Comments',
+ meta: { title: '评论与点赞', icon: '', noCache: true }
+ },
+ // 粉丝与关注
+ {
+ path: 'fans',
+ component: () => import('@/views/contentManage/video/index.vue'),
+ name: 'Fans',
+ meta: { title: '粉丝与关注', icon: '', noCache: true }
+ },
+ // 云点播
+ {
+ path: 'cloud',
+ component: () => import('@/views/contentManage/video/index.vue'),
+ name: 'Cloud',
+ meta: { title: '云点播', icon: '', noCache: true }
+ }
+ ]
+ }
+];
+
+// 动态路由,基于用户权限动态去加载
+export const dynamicRoutes: RouteRecordRaw[] = [
{
path: '/system/user-auth',
component: Layout,
@@ -208,49 +250,9 @@ export const constantRoutes: RouteRecordRaw[] = [
meta: { title: '售后订单详情' }
}
]
- },
- // 内容中心
- {
- path: '/content-center',
- component: Layout,
- // hidden: true,
- // permissions: ['system:role:edit'],
- children: [
- // 视频管理
- {
- path: 'video-manage',
- component: () => import('@/views/contentManage/video/index.vue'),
- name: 'Video',
- meta: { title: '视频管理', icon: '', noCache: true }
- },
- // 评论和点赞
- {
- path: 'comments',
- component: () => import('@/views/contentManage/video/index.vue'),
- name: 'Comments',
- meta: { title: '评论与点赞', icon: '', noCache: true }
- },
- // 粉丝与关注
- {
- path: 'fans',
- component: () => import('@/views/contentManage/video/index.vue'),
- name: 'Fans',
- meta: { title: '粉丝与关注', icon: '', noCache: true }
- },
- // 云点播
- {
- path: 'cloud',
- component: () => import('@/views/contentManage/video/index.vue'),
- name: 'Cloud',
- meta: { title: '云点播', icon: '', noCache: true }
- }
- ]
}
];
-// 动态路由,基于用户权限动态去加载
-export const dynamicRoutes: RouteRecordRaw[] = [];
-
/**
* 创建路由
*/
diff --git a/src/utils/is-star-plugin.js b/src/utils/is-star-plugin.js
index f421308..cf13fae 100644
--- a/src/utils/is-star-plugin.js
+++ b/src/utils/is-star-plugin.js
@@ -1,5 +1,5 @@
// 用于检测用户是否 star 了仓库,如果没有 star,将弹窗提示用户 star 。
-import { Message, MessageBox } from 'element-ui'
+/*import { Message, MessageBox } from 'element-ui'*/
// 使用axios代替$.ajax
import axios from 'axios'
// 应用参数
@@ -19,7 +19,7 @@ const allowDisparity = 1000 * 60 * 60 * 24 * 7
* @param productLink 开源链接
*/
export function isStarRepo(owner, repo, userId, redirectUrl,productName,productLink) {
- const judge = process.env.VUE_APP_JUDGE_STAR
+ const judge = 0
if (!judge || judge == 0) {
return true;
}
@@ -75,7 +75,7 @@ function confirmStar(redirectUrl,productName,productLink) {
`
// 弹窗提示
- MessageBox.alert(tipStr, '温馨提示', {
+ ElMessageBox.alert(tipStr, '温馨提示', {
// if you want to disable its autofocus
// autofocus: false,
confirmButtonText: '同意授权检测',
@@ -100,7 +100,7 @@ function toStar(redirectUrl,productName,productLink,accessToken,owner,repo,key,c
本页面将在 star 后正常开放展示
`
- MessageBox.confirm(tipStr, '温馨提示', {
+ ElMessageBox.confirm(tipStr, '温馨提示', {
// if you want to disable its autofocus
// autofocus: false,
closeOnClickModal: false,
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index 1a4fdc1..b3ad5ae 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -3,30 +3,47 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -36,13 +53,10 @@
-
+
- {{
- getAftersaleStatusText(scope.row)
- }}
-
+ {{ getAftersaleStatusText(scope.row) }}
@@ -52,86 +66,90 @@
{{ scope.row.mark }}
-
+
- {{
- getAftersaleTypeText(scope.row)
- }}
-
+ {{ getAftersaleTypeText(scope.row) }}
-
+
{{ parseTime(scope.row.applyRefundTime, '') }}
-
+
{{ parseTime(scope.row.handleTime, '') }}
-
-
-
+
+
+
-
+
{{ scope.row.orderSn }}
-
+
- 详情
+ 详情
+ 日志
+ 同意
- 日志
+ 拒绝
- 同意
-
- 拒绝
-
- 确认收货
+ 确认收货
-
-
+
+
-
+
-
+
-
+
+
+
-
+
{{ getLogEvent(item.orderStatus) }}
-
+
操作人:{{ item.operateMan }}
-
+
备注:{{ item.note }}
@@ -150,14 +168,14 @@ import {
listOmsAftersale,
updateOmsAftersale,
viewLog
-} from "@/api/oms/aftersale";
+} from '@/api/oms/aftersale';
import dateUtil from '@/utils/DateUtil';
-import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
+import SeeAdsComponent from '@/components/SeeAdsComponent.vue';
export default {
- name: "OmsAftersale",
- components: {SeeAdsComponent},
- dicts: ["oms_aftersale_type", "oms_aftersale_status"],
+ name: 'OmsAftersale',
+ components: { SeeAdsComponent },
+ dicts: ['oms_aftersale_type', 'oms_aftersale_status'],
data() {
return {
show: true,
@@ -181,7 +199,7 @@ export default {
// 订单售后表格数据
omsAftersaleList: [],
// 弹出层标题
- title: "拒绝售后",
+ title: '拒绝售后',
// 是否显示弹出层
open: false,
// 查询参数
@@ -203,12 +221,10 @@ export default {
orderId: null,
optType: null,
remark: null,
- id: null,
+ id: null
},
rules: {
- remark: [
- {required: true, message: '请输入拒绝理由', trigger: 'blur'}
- ]
+ remark: [{ required: true, message: '请输入拒绝理由', trigger: 'blur' }]
},
logObj: {
title: '日志',
@@ -219,42 +235,42 @@ export default {
};
},
created() {
- const { status } = this.$route.query
- if (status){
- this.queryParams.status = status
+ const { status } = this.$route.query;
+ if (status) {
+ this.queryParams.status = status;
}
this.getList();
},
methods: {
confirmOk(success) {
if (success) {
- this.show = true
+ this.show = true;
this.getList();
}
},
copy(data) {
- let url = data;
- let oInput = document.createElement('input');
+ const url = data;
+ const oInput = document.createElement('input');
oInput.value = url;
document.body.appendChild(oInput);
oInput.select(); // 选择对象;
- console.log(oInput.value)
- document.execCommand("Copy"); // 执行浏览器复制命令
+ console.log(oInput.value);
+ document.execCommand('Copy'); // 执行浏览器复制命令
this.$modal.msgSuccess('复制成功');
- oInput.remove()
+ oInput.remove();
},
/** 查询订单售后列表 */
getList() {
if (this.queryParams.Time) {
- this.queryParams.startTime = this.queryParams.Time[0]
- this.queryParams.endTime = this.queryParams.Time[1]
+ this.queryParams.startTime = this.queryParams.Time[0];
+ this.queryParams.endTime = this.queryParams.Time[1];
}
this.loading = true;
- const {pageNum, pageSize} = this.queryParams;
- const query = {...this.queryParams, pageNum: undefined, pageSize: undefined};
- const pageReq = {page: pageNum - 1, size: pageSize};
- listOmsAftersale(query, pageReq).then(response => {
- const { content, totalElements } = response
+ const { pageNum, pageSize } = this.queryParams;
+ const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+ const pageReq = { page: pageNum - 1, size: pageSize };
+ listOmsAftersale(query, pageReq).then((response) => {
+ const { content, totalElements } = response;
this.omsAftersaleList = content;
this.total = totalElements;
this.loading = false;
@@ -281,7 +297,7 @@ export default {
updateBy: null,
updateTime: null
};
- this.resetForm("form");
+ this.resetForm('form');
},
/** 搜索按钮操作 */
handleQuery() {
@@ -290,44 +306,44 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- this.resetForm("queryForm");
+ this.resetForm('queryForm');
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
+ this.ids = selection.map((item) => item.id);
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
- this.title = "添加订单售后";
+ this.title = '添加订单售后';
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
- const id = row.id || this.ids
- getOmsAftersale(id).then(response => {
+ const id = row.id || this.ids;
+ getOmsAftersale(id).then((response) => {
this.form = response;
this.open = true;
- this.title = "修改订单售后";
+ this.title = '修改订单售后';
});
},
/** 提交按钮 */
submitForm() {
- this.$refs["form"].validate(valid => {
+ this.$refs['form'].validate((valid) => {
if (valid) {
if (this.form.id != null) {
- updateOmsAftersale(this.form).then(response => {
- this.$modal.msgSuccess("修改成功");
+ updateOmsAftersale(this.form).then((response) => {
+ this.$modal.msgSuccess('修改成功');
this.open = false;
this.getList();
});
} else {
- addOmsAftersale(this.form).then(response => {
- this.$modal.msgSuccess("新增成功");
+ addOmsAftersale(this.form).then((response) => {
+ this.$modal.msgSuccess('新增成功');
this.open = false;
this.getList();
});
@@ -338,104 +354,109 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('是否确认删除订单售后编号为"' + ids + '"的数据项?').then(function() {
- return delOmsAftersale(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("删除成功");
- }).catch(() => {});
+ this.$modal
+ .confirm('是否确认删除订单售后编号为"' + ids + '"的数据项?')
+ .then(function () {
+ return delOmsAftersale(ids);
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess('删除成功');
+ })
+ .catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
- this.$modal.confirm('是否确认导出所有订单售后数据项?').then(() => {
- this.exportLoading = true;
- return exportOmsAftersale(queryParams);
- }).then(response => {
- this.$download.download(response);
- this.exportLoading = false;
- }).catch(() => {});
+ this.$modal
+ .confirm('是否确认导出所有订单售后数据项?')
+ .then(() => {
+ this.exportLoading = true;
+ return exportOmsAftersale(queryParams);
+ })
+ .then((response) => {
+ this.$download.download(response);
+ this.exportLoading = false;
+ })
+ .catch(() => {});
},
/** 售后详情 */
- handleDetail(orderId){
- const id = orderId
- this.$router.push({ path: '/aftersale/detail', query: { id } })
+ handleDetail(orderId) {
+ const id = orderId;
+ this.$router.push({ path: '/aftersale/detail', query: { id } });
},
/** 同意售后 */
approve(order, type) {
- this.$confirm(`您确定要同意售后单号为【${order.id}】的售后申请吗?`, '温馨提示', {type: 'warning'}).then(
- () => {
- this.updateOrderForm.orderId = order.orderId
- this.updateOrderForm.optType = type
- dealWithAftersale(this.updateOrderForm).then((response) => {
- this.cancel()
- this.$message.success('操作成功')
- this.getList()
- })
- }
- )
+ this.$confirm(`您确定要同意售后单号为【${order.id}】的售后申请吗?`, '温馨提示', { type: 'warning' }).then(() => {
+ this.updateOrderForm.orderId = order.orderId;
+ this.updateOrderForm.optType = type;
+ dealWithAftersale(this.updateOrderForm).then((response) => {
+ this.cancel();
+ this.$message.success('操作成功');
+ this.getList();
+ });
+ });
},
/** 拒绝 */
handleOpen(order, type) {
- this.updateOrderForm.orderId = order.orderId
- this.updateOrderForm.optType = type
- this.updateOrderForm.id = order.id
- this.open = true
+ this.updateOrderForm.orderId = order.orderId;
+ this.updateOrderForm.optType = type;
+ this.updateOrderForm.id = order.id;
+ this.open = true;
},
confirmReceive(orderId, type) {
- this.$confirm(`您确认收到售后单号为【${order.id}】的货物了吗?`, '温馨提示', {type: 'warning'}).then(
- () => {
- this.updateOrderForm.orderId = orderId
- this.updateOrderForm.optType = type
- dealWithAftersale(this.updateOrderForm).then((response) => {
- this.cancel()
- this.$message.success('操作成功')
- this.getList()
- })
- })
+ this.$confirm(`您确认收到售后单号为【${order.id}】的货物了吗?`, '温馨提示', { type: 'warning' }).then(() => {
+ this.updateOrderForm.orderId = orderId;
+ this.updateOrderForm.optType = type;
+ dealWithAftersale(this.updateOrderForm).then((response) => {
+ this.cancel();
+ this.$message.success('操作成功');
+ this.getList();
+ });
+ });
},
getAftersaleStatusTag(row) {
switch (row.aftersaleStatus) {
case 0:
- return 'info'
+ return 'info';
case 1:
- return 'primary'
+ return 'primary';
case 2:
- return 'success'
+ return 'success';
case 3:
- return 'danger'
+ return 'danger';
case 4:
- return 'warning'
+ return 'warning';
}
},
getAftersaleStatusText(row) {
switch (row.aftersaleStatus) {
case 0:
- return '待处理'
+ return '待处理';
case 1:
- return '退货中'
+ return '退货中';
case 2:
- return '已完成'
+ return '已完成';
case 3:
- return '已拒绝'
+ return '已拒绝';
case 4:
- return '已关闭'
+ return '已关闭';
}
},
getAftersaleTypeTag(row) {
switch (row.applyRefundType) {
case 1:
- return 'primary'
+ return 'primary';
case 2:
- return 'warning'
+ return 'warning';
}
},
getAftersaleTypeText(row) {
switch (row.applyRefundType) {
case 1:
- return '退款'
+ return '退款';
case 2:
- return '退货退款'
+ return '退货退款';
}
},
cancel() {
@@ -444,22 +465,21 @@ export default {
orderId: null,
optType: null,
remark: null,
- id: null,
- }
+ id: null
+ };
},
- submitUpdate(formName){
- this.$refs[formName].validate(valid => {
+ submitUpdate(formName) {
+ this.$refs[formName].validate((valid) => {
if (valid) {
- this.$confirm(`您确定要拒绝售后单号为【${this.updateOrderForm.id}】的售后申请了吗?`, '温馨提示', {type: 'warning'}).then(
- () => {
- dealWithAftersale(this.updateOrderForm).then((response) => {
- this.cancel()
- this.$message.success('操作成功')
- this.getList()
- })
- })
+ this.$confirm(`您确定要拒绝售后单号为【${this.updateOrderForm.id}】的售后申请了吗?`, '温馨提示', { type: 'warning' }).then(() => {
+ dealWithAftersale(this.updateOrderForm).then((response) => {
+ this.cancel();
+ this.$message.success('操作成功');
+ this.getList();
+ });
+ });
}
- })
+ });
},
handleChange(value) {
if (!value) {
@@ -467,16 +487,16 @@ export default {
this.queryParams.endTime = null;
}
},
- showLog(orderId){
- this.logObj.loading = true
+ showLog(orderId) {
+ this.logObj.loading = true;
viewLog(orderId).then((response) => {
- this.logObj.logList = response
- this.logObj.open = true
- this.logObj.loading = false
- })
+ this.logObj.logList = response;
+ this.logObj.open = true;
+ this.logObj.loading = false;
+ });
},
- getLogEvent(status){
- switch (status){
+ getLogEvent(status) {
+ switch (status) {
case 11:
return '用户申请售后';
case 12:
@@ -486,7 +506,7 @@ export default {
case 14:
return '平台拒绝售后';
}
- },
+ }
}
};
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 4cda587..1be8946 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -2,17 +2,10 @@
-
+
-
+
搜索
@@ -22,64 +15,41 @@
- 新增
+ 新增
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
- 修改
-
- 删除
+
+ 修改
+ 删除
-
-
+
+
-
+
-
+
@@ -91,19 +61,21 @@
-
+
+
+