Skip to content

Commit 034c4c8

Browse files
lilJay-linlilJay-lin
committed
#fixed 收尾优化1.2.3
1 parent 9fdfb62 commit 034c4c8

File tree

22 files changed

+63
-61
lines changed

22 files changed

+63
-61
lines changed

‎config/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module.exports = {
55
build: {
66
sitEnv: require('./sit.env'),
77
prodEnv: require('./prod.env'),
8-
index: path.resolve(__dirname, '../dist', pkg.version, 'index.html'),
9-
assetsRoot: path.resolve(__dirname, '../dist', pkg.version),
8+
index: path.resolve(__dirname, '../dist', pkg.version + '_mi', 'index.html'),
9+
assetsRoot: path.resolve(__dirname, '../dist', pkg.version + '_mi'),
1010
assetsSubDirectory: 'static',
1111
assetsPublicPath: './', //请根据自己路径配置更改
1212
staticPath:'./static/', //请根据自己路径配置更改

‎src/router/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const asyncRouterMap = [
7575
icon: 'xinrenzhinan',
7676
meta: { role: [Constant.shopClassification_r, Constant.shop_r, Constant.cashCoupon_r, Constant.promotionalPartner_r, Constant.indexContactWay_manage, Constant.promotionalPartner_manage] },
7777
children: [
78-
{ path: 'index', component: _import('shop/index'), name: '商家帐号管理', meta: { role: [Constant.shop_r] } },
78+
{ path: 'index', component: _import('shop/index'), name: '商家管理', meta: { role: [Constant.shop_r] } },
7979
{ path: 'classification', component: _import('classification/index'), name: '商家分类管理', meta: { role: [Constant.shopClassification_r] } },
8080
{ path: 'promotionalPartner', component: _import('promotionalPartner/index'), name: '合作伙伴管理', meta: { role: [Constant.promotionalPartner_r] } },
8181
{ path: 'contact', component: _import('contact/index'), name: '联系方式维护', meta: { role: [Constant.indexContactWay_manage] } },
@@ -95,11 +95,11 @@ export const asyncRouterMap = [
9595
redirect: 'noredirect',
9696
name: '抽奖模块',
9797
icon: 'table',
98-
meta: { role: [Constant.refundReason_r, Constant.advertisement_r, Constant.shopAccountRedPack_manage] },
98+
meta: { role: [Constant.presentOrder_r, Constant.present_r, Constant.shopAccountRedPack_manage] },
9999
children: [
100-
{ path: 'present', component: _import('present/index'), name: '礼品管理', meta: { role: [Constant.advertisement_r] } },
101-
{ path: 'presentOrder', component: _import('presentOrder/index'), name: '抽奖管理', meta: { role: [Constant.refundReason_r] } },
102-
{ path: 'redPack', component: _import('redPack/index'), name: '抽奖维护', meta: { role: [Constant.shopAccountRedPack_manage] } }
100+
{ path: 'present', component: _import('present/index'), name: '礼品管理', meta: { role: [Constant.present_r] } },
101+
{ path: 'presentOrder', component: _import('presentOrder/index'), name: '礼品订单管理', meta: { role: [Constant.presentOrder_r] } },
102+
{ path: 'redPack', component: _import('redPack/index'), name: '抽红包维护', meta: { role: [Constant.shopAccountRedPack_manage] } }
103103
]
104104
},
105105
{

‎src/views/admin/detail.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<el-form-item label="手机号码" prop="mobile">
2222
<el-input v-model="detail.mobile"></el-input>
2323
</el-form-item>
24-
<el-form-item label="状态">
24+
<el-form-item label="状态" v-if="dialogStatus !== 'info'">
2525
<el-select class="filter-item" :disabled="dialogStatus === 'info'" v-model="detail.locked" placeholder="状态">
2626
<el-option v-for="item in statusOptions" :key="item.key" :label="item.label" :value="item.value">
2727
</el-option>
2828
</el-select>
2929
</el-form-item>
30-
<el-form-item label="关联角色">
30+
<el-form-item label="关联角色" v-if="dialogStatus !== 'info'">
3131
<span v-if ="detail.roleList.length === 0">无关联角色</span>
3232
<el-tooltip v-else v-for="role in detail.roleList" :key="role.id" :content="role.description" placement="top">
3333
<el-tag type="success" :closable="dialogStatus=='create' || checkPermission(permissionConstant.admin_u) && dialogStatus === 'update'"

‎src/views/admin/records.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</template>
1414
</div>
1515
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="crpUsers.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
16-
<el-table-column
16+
<el-table-column v-if="isMain && checkPermission(permissionConstant.admin_d)"
1717
type="selection"
1818
width="55">
1919
</el-table-column>
@@ -35,10 +35,10 @@
3535
</template>
3636
</el-table-column>
3737
<template v-if="isMain" >
38-
<el-table-column v-if="checkPermission(permissionConstant.admin_d)" align="center" label="操作" width="150" >
38+
<el-table-column align="center" label="操作" width="150" >
3939
<template scope="scope">
4040
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
41-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
41+
<el-button v-if="checkPermission(permissionConstant.admin_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
4242
</template>
4343
</el-table-column>
4444
</template>

‎src/views/advertisement/records.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</template>
1414
</div>
1515
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="advertisement.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
16-
<el-table-column v-if="isMain"
16+
<el-table-column v-if="isMain && checkPermission(permissionConstant.advertisement_d)"
1717
type="selection"
1818
width="55">
1919
</el-table-column>
@@ -43,10 +43,10 @@
4343
</template>
4444
</el-table-column>
4545
<template v-if="isMain" >
46-
<el-table-column v-if="checkPermission(permissionConstant.advertisement_d)" align="center" label="操作" width="150" >
46+
<el-table-column align="center" label="操作" width="150" >
4747
<template scope="scope">
4848
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
49-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
49+
<el-button v-if="checkPermission(permissionConstant.advertisement_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
5050
</template>
5151
</el-table-column>
5252
</template>

‎src/views/cashCoupon/records.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</template>
1818
</div>
1919
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="cashCoupon.records" v-loading="listLoading" border fit highlight-current-row style="width: 100%">
20-
<el-table-column v-if="isMain"
20+
<el-table-column v-if="isMain && checkPermission(permissionConstant.cashCoupon_d)"
2121
type="selection"
2222
width="55">
2323
</el-table-column>
@@ -63,10 +63,10 @@
6363
</template>
6464
</el-table-column>
6565
<template v-if="isMain" >
66-
<el-table-column v-if="checkPermission(permissionConstant.cashCoupon_d)" align="center" label="操作" width="150" >
66+
<el-table-column align="center" label="操作" width="150" >
6767
<template scope="scope">
6868
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
69-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
69+
<el-button v-if="checkPermission(permissionConstant.cashCoupon_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
7070
</template>
7171
</el-table-column>
7272
</template>

‎src/views/cashCouponOrder/records.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</template>
1717
</div>
1818
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="cashCouponOrder.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
19-
<el-table-column v-if="isMain"
19+
<el-table-column v-if="isMain && checkPermission(permissionConstant.cashCouponOrder_d)"
2020
type="selection"
2121
width="55">
2222
</el-table-column>
@@ -25,7 +25,7 @@
2525
<span :class="{'link-type': isMain}" @click="handleUpdate(scope.row)">{{scope.row.number}}</span>
2626
</template>
2727
</el-table-column>
28-
<el-table-column align="center" label="支付编码" width="280">
28+
<el-table-column align="center" label="支付编码" width="300">
2929
<template scope="scope">
3030
<span>{{scope.row.payOrderNumber}}</span>
3131
</template>
@@ -46,10 +46,10 @@
4646
<el-tag >{{scope.row.status | statusFilter}}</el-tag>
4747
</template>
4848
</el-table-column>
49-
<el-table-column v-if="checkPermission(permissionConstant.cashCouponOrder_d)" align="center" label="操作" width="150" >
49+
<el-table-column align="center" label="操作" width="150" >
5050
<template scope="scope">
5151
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
52-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
52+
<el-button v-if="checkPermission(permissionConstant.cashCouponOrder_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
5353
</template>
5454
</el-table-column>
5555
</template>

‎src/views/classification/records.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</template>
1414
</div>
1515
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="shopClassification.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
16-
<el-table-column v-if="isMain"
16+
<el-table-column v-if="isMain && checkPermission(permissionConstant.shopClassification_d)"
1717
type="selection"
1818
width="55">
1919
</el-table-column>
@@ -38,10 +38,10 @@
3838
</template>
3939
</el-table-column>
4040
<template v-if="isMain" >
41-
<el-table-column v-if="checkPermission(permissionConstant.shopClassification_d)" align="center" label="操作" width="150" >
41+
<el-table-column align="center" label="操作" width="150" >
4242
<template scope="scope">
4343
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
44-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
44+
<el-button v-if="checkPermission(permissionConstant.shopClassification_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
4545
</template>
4646
</el-table-column>
4747
</template>

‎src/views/layout/Navbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
}
8888
.screenfull {
8989
position: absolute;
90-
right: 90px;
90+
/*right: 90px;*/
9191
top: 16px;
9292
color: red;
9393
}

‎src/views/present/records.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</template>
1818
</div>
1919
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="present.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
20-
<el-table-column v-if="isMain"
20+
<el-table-column v-if="isMain && checkPermission(permissionConstant.present_d)"
2121
type="selection"
2222
width="55">
2323
</el-table-column>
@@ -68,10 +68,10 @@
6868
</template>
6969
</el-table-column>
7070
<template v-if="isMain" >
71-
<el-table-column v-if="checkPermission(permissionConstant.present_d)" align="center" label="操作" width="150" >
71+
<el-table-column align="center" label="操作" width="150" >
7272
<template scope="scope">
7373
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
74-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
74+
<el-button v-if="checkPermission(permissionConstant.present_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
7575
</template>
7676
</el-table-column>
7777
</template>

‎src/views/presentOrder/records.vue

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</template>
1616
</div>
1717
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="presentOrder.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
18-
<el-table-column v-if="isMain"
18+
<el-table-column v-if="isMain && checkPermission(permissionConstant.presentOrder_d)"
1919
type="selection"
2020
width="55">
2121
</el-table-column>
@@ -24,7 +24,7 @@
2424
<span :class="{'link-type': isMain}" @click="handleUpdate(scope.row)">{{scope.row.id}}</span>
2525
</template>
2626
</el-table-column>-->
27-
<el-table-column align="center" label="礼品ID">
27+
<!-- <el-table-column align="center" label="礼品ID">
2828
<template scope="scope">
2929
<span >{{scope.row.presentId}}</span>
3030
</template>
@@ -33,10 +33,10 @@
3333
<template scope="scope">
3434
<span >{{scope.row.userId}}</span>
3535
</template>
36-
</el-table-column>
36+
</el-table-column>-->
3737
<el-table-column align="center" label="订单编码">
3838
<template scope="scope">
39-
<span>{{scope.row.number}}</span>
39+
<span :class="{'link-type': isMain}" @click="handleUpdate(scope.row)">{{scope.row.number}}</span>
4040
</template>
4141
</el-table-column>
4242
<el-table-column class-name="status-col" label="状态" width="60">
@@ -45,10 +45,10 @@
4545
</template>
4646
</el-table-column>
4747
<template v-if="isMain" >
48-
<el-table-column v-if="checkPermission(permissionConstant.presentOrder_d)" align="center" label="操作" width="150" >
48+
<el-table-column align="center" label="操作" width="150" >
4949
<template scope="scope">
5050
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
51-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
51+
<el-button v-if="checkPermission(permissionConstant.presentOrder_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
5252
</template>
5353
</el-table-column>
5454
</template>
@@ -211,7 +211,6 @@
211211
detail.present.expiryDate = String(detail.present.expiryDate)
212212
detail.present.hide = String(detail.present.hide)
213213
detail.present.expired = String(detail.present.expired)
214-
detail.presentOrder.status = String(detail.presentOrder.status)
215214
detail.user.locked = String(detail.user.locked)
216215
this.temp = Object.assign({}, detail)
217216
})

‎src/views/promotionalPartner/records.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</template>
1010
</div>
1111
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="promotionalPartner.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
12-
<el-table-column v-if="isMain"
12+
<el-table-column v-if="isMain && checkPermission(permissionConstant.promotionalPartner_d)"
1313
type="selection"
1414
width="55">
1515
</el-table-column>
@@ -46,10 +46,10 @@
4646
</template>
4747
</el-table-column>
4848
<template v-if="isMain" >
49-
<el-table-column v-if="checkPermission(permissionConstant.promotionalPartner_d)" align="center" label="操作" width="150" >
49+
<el-table-column align="center" label="操作" width="150" >
5050
<template scope="scope">
5151
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
52-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
52+
<el-button v-if="checkPermission(permissionConstant.promotionalPartner_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
5353
</template>
5454
</el-table-column>
5555
</template>

‎src/views/refund/detail.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<el-form-item label="退款代金券信息" >
1010
<img style="width: 220px;cursor: pointer;" @click="showCashCoupon()" :src="detail.cashCoupon.preImage"/>
1111
</el-form-item>
12+
<el-form-item label="退款凭证" >
13+
<img style="width: 220px;cursor: pointer;" :src="detail.refund.evidence"/>
14+
</el-form-item>
1215
<el-form-item label="退款金额">
1316
<el-input v-model="detail.refund.refundAmount" :disabled="true"></el-input>
1417
</el-form-item>

‎src/views/refund/records.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</template>
1414
</div>
1515
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="refund.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
16-
<el-table-column v-if="isMain"
16+
<el-table-column v-if="isMain && checkPermission(permissionConstant.refund_d)"
1717
type="selection"
1818
width="55">
1919
</el-table-column>
@@ -51,7 +51,7 @@
5151
<el-table-column align="center" label="操作" width="280" >
5252
<template scope="scope">
5353
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
54-
<template v-if="checkPermission(permissionConstant.refund_u) && (scope.row.status === 0 || scope.row.status === 3)">
54+
<template v-if="checkPermission(permissionConstant.refund_u) && (scope.row.status === 0 || scope.row.status === 4)">
5555
<el-button size="small" type="primary" @click="dealOrdreHandle(scope.row, true)">同意</el-button>
5656
<el-button size="small" type="primary" @click="dealOrdreHandle(scope.row, false)">拒绝</el-button>
5757
</template>

‎src/views/refundReason/records.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</template>
1010
</div>
1111
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="refundReason.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
12-
<el-table-column v-if="isMain"
12+
<el-table-column v-if="isMain && checkPermission(permissionConstant.refundReason_d)"
1313
type="selection"
1414
width="55">
1515
</el-table-column>
@@ -34,10 +34,10 @@
3434
</template>
3535
</el-table-column>
3636
<template v-if="isMain" >
37-
<el-table-column v-if="checkPermission(permissionConstant.refundReason_d)" align="center" label="操作" width="150" >
37+
<el-table-column align="center" label="操作" width="150" >
3838
<template scope="scope">
3939
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
40-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
40+
<el-button v-if="checkPermission(permissionConstant.refundReason_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
4141
</template>
4242
</el-table-column>
4343
</template>

‎src/views/register/detail.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</el-form-item>
1717
<el-form-item label="状态">
1818
<el-select class="filter-item" v-model="detail.locked" placeholder="状态">
19-
<el-option v-for="item in statusOptions" :key="item.key" :label="item.label" :value="item.value">
19+
<el-option v-for="item in statusOptions" :key="item.key" :label="item.label" :value="item.key">
2020
</el-option>
2121
</el-select>
2222
</el-form-item>

‎src/views/register/records.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</template>
1414
</div>
1515
<el-table :key='tableKey' @selection-change="handleSelectionChange" :data="register.records" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
16-
<el-table-column v-if="isMain"
16+
<el-table-column v-if="isMain && checkPermission(permissionConstant.admin_d)"
1717
type="selection"
1818
width="55">
1919
</el-table-column>
@@ -39,10 +39,10 @@
3939
</template>
4040
</el-table-column>
4141
<template v-if="isMain" >
42-
<el-table-column v-if="checkPermission(permissionConstant.admin_d)" align="center" label="操作" width="150" >
42+
<el-table-column align="center" label="操作" width="150" >
4343
<template scope="scope">
4444
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">详情</el-button>
45-
<el-button size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
45+
<el-button v-if="checkPermission(permissionConstant.admin_d)" size="small" type="danger" @click="handleModifyStatus(scope.row, true)">删除</el-button>
4646
</template>
4747
</el-table-column>
4848
</template>

0 commit comments

Comments
 (0)