github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve: 优化

Browse Source
This commit is contained in:
From-wh 2023-04-18 14:48:40 +08:00
parent 1851c374e5
commit 9cd0f9968a
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
template/admin/src/libs/util.js
View File

@ -163,7 +163,7 @@ export const getHomeRoute = (routers, homeName = 'home') => {
export const getNewTagList = (list, newRoute) => {
const { name, path, meta } = newRoute;
let newList = [...list];
if (newList.findIndex((item) => item.name === name) >= 0) return newList;
if (newList.findIndex((item) => item.path === path) >= 0) return newList;
else newList.push({ name, path, meta });
return newList;
};

19
template/admin/src/pages/order/orderList/components/tableList.vue
View File

@ -63,13 +63,14 @@
</div>
</template>
<template slot-scope="{ row, index }" slot="action">
<a @click="edit(row)" v-if="row._status === 1">编辑</a>
<a @click="edit(row)" v-if="row._status === 1 && row.is_del !== 1">编辑</a>
<a
@click="sendOrder(row)"
v-if="
(row.status === 4 || row._status === 2 || row._status === 8) &&
row.shipping_type === 1 &&
(row.pinkStatus === null || row.pinkStatus === 2)
(row.pinkStatus === null || row.pinkStatus === 2) &&
row.is_del !== 1
"
>发送货</a
>
@ -81,12 +82,15 @@
>
<Divider
type="vertical"
v-if="(row._status === 8 || row.status === 0 || row.status === 4) && row.split.length"
v-if="(row._status === 8 || row.status === 0 || row.status === 4) && row.split.length && row.is_del !== 1"
/>
<a @click="splitOrderDetail(row)" v-if="row.split.length">查看子订单</a>
<a @click="splitOrderDetail(row)" v-if="row.split.length && row.is_del !== 1">查看子订单</a>
<Divider
type="vertical"
v-if="(row._status === 2 && row.shipping_type === 1 && row.pinkStatus === 2) || row.split.length"
v-if="
(row._status === 2 && row.shipping_type === 1 && row.pinkStatus === 2) ||
(row.split.length && row.is_del !== 1)
"
/>
<Divider
type="vertical"
@ -97,7 +101,8 @@
row._status === 3 ||
(row._status === 2 && !row.pinkStatus) ||
row._status === 4 ||
(row.shipping_type == 2 && row.status == 0 && row.paid == 1 && row.refund_status === 0))
(row.shipping_type == 2 && row.status == 0 && row.paid == 1 && row.refund_status === 0)) &&
row.is_del !== 1
"
/>
<template>
@ -110,7 +115,7 @@
<DropdownItem
name="1"
ref="ones"
v-show="row._status === 1 && row.paid === 0 && row.pay_type === 'offline'"
v-show="row._status === 1 && row.paid === 0 && row.pay_type === 'offline' && row.is_del !== 1"
>确认付款</DropdownItem
>
<DropdownItem name="2">订单详情</DropdownItem>

2
template/admin/src/pages/system/codeGeneration/list.vue
View File

@ -541,6 +541,6 @@ export default {
// 选项卡头部
>>> .ivu-tabs.ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-nav-container {
background-color: #333;
background-color: #fff;
}
</style>

13
template/admin/src/pages/user/list/index.vue
View File

@ -919,7 +919,7 @@ export default {
this.giveLevelTime(row.uid);
break;
case '4':
this.del(row, '清除 【 ' + row.nickname + ' 】的会员等级', index, 'user');
this.del(row, '清除 【 ' + this.tenText(row.nickname) + ' 】的会员等级', index, 'user');
break;
case '5':
this.$modalForm(userSetGroup(uids)).then(() => this.getList());
@ -931,9 +931,17 @@ export default {
this.editS(row);
break;
default:
this.del(row, '解除【 ' + row.nickname + ' 】的上级推广人', index, 'tuiguang');
this.del(row, '解除【 ' + this.tenText(row.nickname) + ' 】的上级推广人', index, 'tuiguang');
}
},
tenText(str) {
if (str.length > 10) {
//如果字符长度超过10，后面的字符就变成...可自行调整长度和代替字符
str = str.substr(0, 10) + '...'; //截取从第一个字符开始，往后取10个字符，剩余的用...代替
//console.log(str); // 'js字符超出指定个数...'
}
return str;
},
openLabel(row) {
this.labelShow = true;
this.labelActive.uid = row.uid;
@ -998,6 +1006,7 @@ export default {
url: name === 'user' ? `user/del_level/${row.uid}` : `agent/stair/delete_spread/${row.uid}`,
method: name === 'user' ? 'DELETE' : 'PUT',
ids: '',
width: 600,
};
this.$modalSure(delfromData)
.then((res) => {