fe / yoho-shop-manage · Commits

Go to a project

Authored by htoooth
Commit 212e6000e24af13a23f2866deafa6a9d2328bb5a 2 parents 0362e45d 76877838

Merge remote-tracking branch 'origin/release/1.0' into release/1.0

Inline Side-by-side
Showing 4 changed files with 14 additions and 10 deletions
... ... @@ -214,9 +214,7 @@ let tableCols = [
render: function(row, column, index) {
return `<div class="action-btn-row">
<i-button type="primary" size="small" @click="editSize(row.productSkn)">尺码维护</i-button>
<i-button v-if="row._disabled" type="primary" size="small"
@click="editProduct(${row.productSkn})" disabled>内容编辑</i-button>
<i-button v-else type="primary" size="small" @click="editProduct(${row.productSkn})">内容编辑</i-button>
<i-button type="primary" size="small" @click="editProduct(${row.productSkn})">内容编辑</i-button>
</div>
<div class="btn-row-space">
<i-button v-if="row._disabled" type="success" size="small"
... ...
... ... @@ -2,7 +2,7 @@
<LayoutBody>
<LayoutFilter>
<FilterItem :label="filters.sknCode.label">
<Input v-model.trim.trim="filters.sknCode.model"
<Input v-model.trim="filters.sknCode.model"
:placeholder="filters.sknCode.holder"></Input>
</FilterItem>
<FilterItem :label="filters.prodCode.label">
... ...
... ... @@ -131,7 +131,7 @@ let tableCols = [
title: '商品信息',
key: 'info',
align: 'center',
render(row, column, index) {
render(row) {
return `<cell-info
:skn="row.productSkn"
:product-name="row.productName"
... ... @@ -175,7 +175,7 @@ let tableCols = [
title: '审核状态',
key: 'verify',
align: 'center',
render(row, column, index) {
render(row) {
return `${auditStatus[row.auditStatus]}`
}
},
... ... @@ -184,12 +184,10 @@ let tableCols = [
key: 'action',
width: 180,
align: 'center',
render: function(row, column, index) {
render: function(row) {
return `<div class="action-btn-row">
<i-button type="primary" size="small" @click="editSize(row.productSkn)">尺码维护</i-button>
<i-button v-if="row._disabled" type="primary" size="small"
@click="editProduct(${row.productSkn})" disabled>内容编辑</i-button>
<i-button v-else type="primary" size="small" @click="editProduct(${row.productSkn})">内容编辑</i-button>
<i-button type="primary" size="small" @click="editProduct(${row.productSkn})">内容编辑</i-button>
</div>
<div class="btn-row-space">
<i-button v-if="row._disabled" type="error" size="small"
... ...
... ... @@ -59,6 +59,14 @@ class UserController extends Context {
delete req.session.USER;
delete req.session.LOGIN_UID;
delete req.session.CURRENT_SHOP;
res.clearCookie('PHPSESSID', {
domain: '.yohobuy.com'
});
res.clearCookie('connect.sid', {
domain: '.yohobuy.com'
});
res.clearCookie('yoho-shop');
res.clearCookie('yoho-shop.sig');
return res.json({
code: 200,
data: '登出成功'
... ...