chuangte/electripper-v2-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: chuangte:d0c983f0c60d2d63e5d1b5574458607bb8c07b82
Branches Tags
chuangte:master
chuangte:wjh
chuangte:chache-dev
chuangte:deploy
..
compare: chuangte:2be6bb44da25fdbcbb6fce1fdb16ea3c9043a7cf
Branches Tags
chuangte:wjh
chuangte:chache-dev
chuangte:deploy
chuangte:master

No commits in common. "d0c983f0c60d2d63e5d1b5574458607bb8c07b82" and "2be6bb44da25fdbcbb6fce1fdb16ea3c9043a7cf" have entirely different histories.
d0c983f0c6 ... 2be6bb44da

5 changed files with 12 additions and 59 deletions
Show Stats Expand all files Collapse all files

27
src/views/bst/area/view/view.vue
View File

@ -28,18 +28,9 @@
<el-tab-pane label="车辆列表" lazy v-if="checkPermi(['bst:device:list'])">
<device :query="{areaId: detail.id}" />
</el-tab-pane>
<el-tab-pane label="骑行订单" lazy v-if="checkPermi(['bst:order:list'])">
<el-tab-pane label="订单列表" lazy v-if="checkPermi(['bst:order:list'])">
<order :query="{areaId: detail.id}" />
</el-tab-pane>
<el-tab-pane label="卡券列表" lazy v-if="checkPermi(['bst:vip:list'])">
<vip :query="{areaId: detail.id}" />
</el-tab-pane>
<el-tab-pane label="卡券订单" lazy v-if="checkPermi(['bst:vipOrder:list'])">
<vip-order :query="{vipAreaId: detail.id}" />
</el-tab-pane>
<el-tab-pane label="用户卡券" lazy v-if="checkPermi(['bst:vipUser:list'])">
<vip-user :query="{areaId: detail.id}" />
</el-tab-pane>
<el-tab-pane label="加盟列表" lazy v-if="checkPermi(['bst:areaJoin:list'])">
<area-join :query="{areaId: detail.id, types: [AreaJoinType.JOIN, AreaJoinType.COOPERATE]}" />
</el-tab-pane>
@ -63,16 +54,13 @@
<script>
import { getArea } from '@/api/bst/area';
import UserLink from '@/components/Business/User/UserLink.vue';
import { AreaJoinType, LogBizType } from '@/utils/enums';
import Agreement from '@/views/bst/agreement/index.vue';
import AreaJoin from '@/views/bst/areaJoin/index.vue';
import AreaSub from '@/views/bst/areaSub/index.vue';
import CustomerService from '@/views/bst/customerService/index.vue';
import Device from '@/views/bst/device/index.vue';
import Order from '@/views/bst/order/index.vue';
import Vip from '@/views/bst/vip/index.vue';
import VipOrder from '@/views/bst/vipOrder/index.vue';
import VipUser from '@/views/bst/vipUser/index.vue';
import AreaJoin from '@/views/bst/areaJoin/index.vue';
import { AreaJoinType, LogBizType } from '@/utils/enums';
import CustomerService from '@/views/bst/customerService/index.vue';
import Agreement from '@/views/bst/agreement/index.vue';
import OperLog from '@/views/monitor/operlog/index.vue';
export default {
@ -86,10 +74,7 @@ export default {
AreaJoin,
CustomerService,
Agreement,
OperLog,
VipOrder,
Vip,
VipUser
OperLog
},
data() {
return {

7
src/views/bst/vip/index.vue
View File

@ -194,12 +194,6 @@ export default {
BooleanTag,
VipEditDialog
},
props: {
query: {
type: Object,
default: () => ({})
}
},
data() {
return {
VipType,
@ -260,7 +254,6 @@ export default {
};
},
created() {
Object.assign(this.queryParams, this.query);
this.getList();
},
methods: {

7
src/views/bst/vipOrder/index.vue
View File

@ -153,12 +153,6 @@ export default {
mixins: [$showColumns],
dicts: ['vip_type', 'vip_order_status', 'vip_limit_unit'],
components: {FormCol, AreaRemoteSelect, AreaLink, UserLink},
props: {
query: {
type: Object,
default: () => ({})
}
},
data() {
return {
VipType,
@ -252,7 +246,6 @@ export default {
};
},
created() {
Object.assign(this.queryParams, this.query);
this.getList();
},
methods: {

13
src/views/bst/vipUser/index.vue
View File

@ -50,7 +50,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="vipUserList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table v-loading="loading" :data="vipUserList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" />
<template v-for="column of showColumns">
<el-table-column
@ -76,7 +76,7 @@
<user-link :id="d.row.userId" :text="d.row.userName"/>
</template>
<template v-else-if="column.key === 'areaName'">
<area-link :id="d.row.areaId" :text="d.row.areaName" />
<area-link :id="d.row.areaId" :text="d.row.areaName"/>
</template>
<template v-else-if="column.key === 'surplusTotal'">
{{ d.row.surplusTotal | dv}} 次
@ -150,12 +150,6 @@ export default {
mixins: [$showColumns],
dicts: ['vip_type', 'vip_limit_unit'],
components: {FormCol, UserLink, AreaLink, AreaRemoteSelect},
props: {
query: {
type: Object,
default: () => ({})
}
},
data() {
return {
VipType,
@ -163,7 +157,7 @@ export default {
// 字段列表
columns: [
{key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
{key: 'name', visible: true, label: '卡券', minWidth: null, sortable: true, overflow: false, align: 'left', width: "250"},
{key: 'name', visible: true, label: '卡券', minWidth: null, sortable: true, overflow: false, align: 'left', width: null},
{key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'areaName', visible: true, label: '运营区', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'discount', visible: true, label: '优惠', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
@ -250,7 +244,6 @@ export default {
};
},
created() {
Object.assign(this.queryParams, this.query);
this.getList();
},
methods: {

17
src/views/system/user/view/view.vue
View File

@ -60,16 +60,10 @@
<el-tab-pane label="运营区" lazy v-if="checkPermi(['bst:area:list'])">
<area-index :query="{userId: detail.userId}" />
</el-tab-pane>
<el-tab-pane label="骑行消费" lazy v-if="checkPermi(['bst:order:list'])">
<el-tab-pane label="消费订单" lazy v-if="checkPermi(['bst:order:list'])">
<order :query="{userId: detail.userId}" />
</el-tab-pane>
<el-tab-pane label="卡券消费" lazy v-if="checkPermi(['bst:vipOrder:list'])">
<vip-order :query="{userId: detail.userId}" />
</el-tab-pane>
<el-tab-pane label="卡券" lazy v-if="checkPermi(['bst:vipUser:list'])">
<vip-user :query="{userId: detail.userId}" />
</el-tab-pane>
<el-tab-pane label="骑行收入" lazy v-if="checkPermi(['bst:order:list'])">
<el-tab-pane label="收入订单" lazy v-if="checkPermi(['bst:order:list'])">
<order :query="{bonusUserId: detail.userId}" />
</el-tab-pane>
<el-tab-pane label="出租记录" lazy v-if="checkPermi(['bst:orderDevice:list'])">
@ -139,13 +133,10 @@ import OrderDevice from '@/views/bst/orderDevice/index.vue'
import RealName from '@/views/bst/realName/index.vue'
import Suit from '@/views/bst/suit/index.vue'
import UserApp from '@/views/bst/userApp/index.vue'
import VipOrder from '@/views/bst/vipOrder/index.vue'
import VipUser from '@/views/bst/vipUser/index.vue'
import Withdraw from '@/views/bst/withdraw/index.vue'
import OperLog from '@/views/monitor/operlog/index.vue'
import UserStatistics from '@/views/system/user/view/components/UserStatistics'
export default {
name: 'UserView',
components: {
@ -170,9 +161,7 @@ export default {
AreaJoin,
OperLog,
CommandLog,
FeeLog,
VipOrder,
VipUser
FeeLog
},
data() {
return {