tianyi 2 months ago
parent
commit
904514595b
  1. 116
      src/views/app/business/luckey/luckey.vue
  2. 1
      src/views/sys/order-manage/orderManage.vue

116
src/views/app/business/luckey/luckey.vue

@ -561,7 +561,7 @@
{ title: '奖励券', key: 'rewardTickets', width: 80 }, { title: '奖励券', key: 'rewardTickets', width: 80 },
{ title: '每日上限', key: 'dailyLimit', width: 90 }, { title: '每日上限', key: 'dailyLimit', width: 90 },
{ title: '商圈', key: 'regionId', width: 90 }, { title: '商圈', key: 'regionId', width: 90 },
{ title: '启用', width: 70, render: (h, p) => h('Tag', { props: { color: p.row.enabled === 1 ? 'green' : 'default' } }, p.row.enabled === 1 ? '是' : '否') }, { title: '启用', minWidth: 70, render: (h, p) => h('Tag', { props: { color: p.row.enabled === 1 ? 'green' : 'default' } }, p.row.enabled === 1 ? '是' : '否') },
{ {
title: '操作', width: 150, align: 'center', render: (h, params) => { title: '操作', width: 150, align: 'center', render: (h, params) => {
return h('div', [ return h('div', [
@ -580,7 +580,7 @@
{ title: '消耗券', key: 'costTickets', width: 80 }, { title: '消耗券', key: 'costTickets', width: 80 },
{ title: '时长(h)', key: 'durationHours', width: 80 }, { title: '时长(h)', key: 'durationHours', width: 80 },
{ title: '效果值', key: 'effectValue', width: 80 }, { title: '效果值', key: 'effectValue', width: 80 },
{ title: '启用', width: 70, render: (h, p) => h('Tag', { props: { color: p.row.enabled === 1 ? 'green' : 'default' } }, p.row.enabled === 1 ? '是' : '否') }, { title: '启用', minWidth: 70, render: (h, p) => h('Tag', { props: { color: p.row.enabled === 1 ? 'green' : 'default' } }, p.row.enabled === 1 ? '是' : '否') },
{ {
title: '操作', width: 150, align: 'center', render: (h, params) => { title: '操作', width: 150, align: 'center', render: (h, params) => {
return h('div', [ return h('div', [
@ -595,7 +595,7 @@
return [ return [
{ title: '类型', key: 'type', width: 90 }, { title: '类型', key: 'type', width: 90 },
{ title: '内容', key: 'content', minWidth: 260 }, { title: '内容', key: 'content', minWidth: 260 },
{ title: '商圈', key: 'regionId', width: 90 }, { title: '商圈', key: 'regionId', minWidth: 90 },
{ title: '置顶', width: 70, render: (h, p) => h('span', p.row.isTop === 1 ? '是' : '否') }, { title: '置顶', width: 70, render: (h, p) => h('span', p.row.isTop === 1 ? '是' : '否') },
{ title: '展示', width: 70, render: (h, p) => h('span', p.row.enabled === 1 ? '是' : '否') }, { title: '展示', width: 70, render: (h, p) => h('span', p.row.enabled === 1 ? '是' : '否') },
{ title: '时间', key: 'createTime', minWidth: 160 }, { title: '时间', key: 'createTime', minWidth: 160 },
@ -613,32 +613,32 @@
return [ return [
{ title: '用户id', key: 'userId', minWidth: 120 }, { title: '用户id', key: 'userId', minWidth: 120 },
{ title: '昵称', key: 'nickname', minWidth: 120 }, { title: '昵称', key: 'nickname', minWidth: 120 },
{ title: '商圈', key: 'regionId', width: 100 }, { title: '商圈', key: 'regionId', minWidth: 100 },
{ title: '当前券', key: 'ticketCount', width: 90 }, { title: '当前券', key: 'ticketCount', width: 90 },
{ title: '累计券', key: 'totalTicket', width: 90 }, { title: '累计券', key: 'totalTicket', width: 90 },
{ title: '连续签到', key: 'consecutiveSignDays', width: 90 }, { title: '连续签到', key: 'consecutiveSignDays', minWidth: 90 },
{ title: '霸榜天数', key: 'rankKeepDays', width: 90 } { title: '霸榜天数', key: 'rankKeepDays', minWidth: 90 }
] ]
}, },
huntColumns() { huntColumns() {
return [ return [
{ title: '发起人', key: 'fromUserName', minWidth: 110 }, { title: '发起人', key: 'fromUserName', minWidth: 110 },
{ title: '目标', key: 'toUserName', minWidth: 110 }, { title: '目标', key: 'toUserName', minWidth: 110 },
{ title: '结果', width: 90, render: (h, p) => h('span', this.huntResultText(p.row.result)) }, { title: '结果', minWidth: 90, render: (h, p) => h('span', this.huntResultText(p.row.result)) },
{ title: '缴获', key: 'gainTickets', width: 70 }, { title: '缴获', key: 'gainTickets', minWidth: 70 },
{ title: '悬赏', key: 'bountyTickets', width: 70 }, { title: '悬赏', key: 'bountyTickets', minWidth: 70 },
{ title: '日期', key: 'huntDate', width: 120 }, { title: '日期', key: 'huntDate', minWidth: 120 },
{ title: '时间', key: 'createTime', minWidth: 160 } { title: '时间', key: 'createTime', minWidth: 160 }
] ]
}, },
drawColumns() { drawColumns() {
return [ return [
{ title: '期号', key: 'periodNo', minWidth: 130 }, { title: '期号', key: 'periodNo', minWidth: 130 },
{ title: '商圈', key: 'regionId', width: 100 }, { title: '商圈', key: 'regionId', minWidth: 100 },
{ title: '奖池金额', key: 'poolAmount', width: 100 }, { title: '奖池金额', key: 'poolAmount', minWidth: 100 },
{ title: '参与人数', key: 'joinCount', width: 90 }, { title: '参与人数', key: 'joinCount', minWidth: 90 },
{ title: '券总数', key: 'ticketTotal', width: 90 }, { title: '券总数', key: 'ticketTotal', minWidth: 90 },
{ title: '中奖人数', key: 'winnerCount', width: 90 }, { title: '中奖人数', key: 'winnerCount', minWidth: 90 },
{ title: '开奖时间', key: 'drawTime', minWidth: 160 } { title: '开奖时间', key: 'drawTime', minWidth: 160 }
] ]
}, },
@ -648,7 +648,7 @@
{ title: '中奖人', key: 'userName', minWidth: 110 }, { title: '中奖人', key: 'userName', minWidth: 110 },
{ title: '奖项', key: 'levelName', width: 100 }, { title: '奖项', key: 'levelName', width: 100 },
{ title: '金额', key: 'amount', width: 90 }, { title: '金额', key: 'amount', width: 90 },
{ title: '已领取', width: 80, render: (h, p) => h('Tag', { props: { color: p.row.isReceived === 1 ? 'green' : 'orange' } }, p.row.isReceived === 1 ? '已领' : '未领') }, { title: '已领取', minWidth: 80, render: (h, p) => h('Tag', { props: { color: p.row.isReceived === 1 ? 'green' : 'orange' } }, p.row.isReceived === 1 ? '已领' : '未领') },
{ title: '时间', key: 'createTime', minWidth: 160 } { title: '时间', key: 'createTime', minWidth: 160 }
] ]
}, },
@ -659,27 +659,27 @@
{ title: '投入范围', minWidth: 140, render: (h, p) => h('span', `${p.row.minInvest || 0} - ${p.row.maxInvest || '不限'}`) }, { title: '投入范围', minWidth: 140, render: (h, p) => h('span', `${p.row.minInvest || 0} - ${p.row.maxInvest || '不限'}`) },
{ title: '单次收益上限', key: 'maxProfit', width: 120 }, { title: '单次收益上限', key: 'maxProfit', width: 120 },
{ title: '日收益上限', key: 'dailyProfitLimit', width: 110 }, { title: '日收益上限', key: 'dailyProfitLimit', width: 110 },
{ title: '启用', width: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) }, { title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('tree') this.operateActionColumn('tree')
] ]
}, },
warehouseColumns() { warehouseColumns() {
return [ return [
{ title: '等级', key: 'level', width: 90 }, { title: '等级', key: 'level', minWidth: 90 },
{ title: '容量', key: 'capacity', width: 100 }, { title: '容量', key: 'capacity', minWidth: 100 },
{ title: '升级消耗券', key: 'upgradeCost', width: 120 }, { title: '升级消耗券', key: 'upgradeCost', minWidth: 120 },
{ title: '启用', width: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) }, { title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('warehouse') this.operateActionColumn('warehouse')
] ]
}, },
towerColumns() { towerColumns() {
return [ return [
{ title: '等级', key: 'level', width: 80 }, { title: '等级', key: 'level', minWidth: 80 },
{ title: '拦截率(%)', key: 'interceptRate', width: 110 }, { title: '拦截率(%)', key: 'interceptRate', minWidth: 110 },
{ title: '伤害', key: 'damage', width: 90 }, { title: '伤害', key: 'damage', minWidth: 90 },
{ title: '反击率(%)', key: 'counterRate', width: 110 }, { title: '反击率(%)', key: 'counterRate', minWidth: 110 },
{ title: '升级消耗券', key: 'upgradeCost', width: 120 }, { title: '升级消耗券', key: 'upgradeCost', minWidth: 120 },
{ title: '启用', width: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) }, { title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('tower') this.operateActionColumn('tower')
] ]
}, },
@ -690,53 +690,53 @@
{ title: '获得范围', minWidth: 120, render: (h, p) => h('span', `${p.row.minGain || 0} - ${p.row.maxGain || 0}`) }, { title: '获得范围', minWidth: 120, render: (h, p) => h('span', `${p.row.minGain || 0} - ${p.row.maxGain || 0}`) },
{ title: '目标比例', key: 'targetBalanceRate', width: 90 }, { title: '目标比例', key: 'targetBalanceRate', width: 90 },
{ title: '日获得上限', key: 'dailyGainLimit', width: 110 }, { title: '日获得上限', key: 'dailyGainLimit', width: 110 },
{ title: '启用', width: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) }, { title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('search') this.operateActionColumn('search')
] ]
}, },
staminaColumns() { staminaColumns() {
return [ return [
{ title: '名称', key: 'name', minWidth: 120 }, { title: '名称', key: 'name', minWidth: 120 },
{ title: '恢复体力', key: 'recoverStamina', width: 90 }, { title: '恢复体力', key: 'recoverStamina', minWidth: 90 },
{ title: '消耗券', key: 'costTickets', width: 90 }, { title: '消耗券', key: 'costTickets', minWidth: 90 },
{ title: '日购买上限', key: 'dailyBuyLimit', width: 110 }, { title: '日购买上限', key: 'dailyBuyLimit', minWidth: 110 },
{ title: '启用', width: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) }, { title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('stamina') this.operateActionColumn('stamina')
] ]
}, },
landmarkColumns() { landmarkColumns() {
return [ return [
{ title: '名称', key: 'name', minWidth: 120 }, { title: '名称', key: 'name', minWidth: 120 },
{ title: '图标', key: 'icon', width: 80 }, { title: '图标', key: 'icon', minWidth: 80 },
{ title: '收益类型', key: 'benefitType', width: 120 }, { title: '收益类型', key: 'benefitType', minWidth: 120 },
{ title: '收益值', key: 'benefitValue', width: 90 }, { title: '收益值', key: 'benefitValue', minWidth: 90 },
{ title: '开放时间', minWidth: 150, render: (h, p) => h('span', `${p.row.openStartTime || '--'} - ${p.row.openEndTime || '--'}`) }, { title: '开放时间', minWidth: 150, render: (h, p) => h('span', `${p.row.openStartTime || '--'} - ${p.row.openEndTime || '--'}`) },
{ title: '启用', width: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) }, { title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('landmark') this.operateActionColumn('landmark')
] ]
}, },
collegeColumns() { collegeColumns() {
return [ return [
{ title: '学院名称', key: 'collegeName', minWidth: 150 }, { title: '学院名称', key: 'collegeName', minWidth: 150 },
{ title: '简称', key: 'shortName', width: 100 }, { title: '简称', key: 'shortName', minWidth: 100 },
{ title: '图标', key: 'icon', width: 90 }, { title: '图标', key: 'icon', minWidth: 90 },
{ title: '主题色', key: 'themeColor', width: 100 }, { title: '主题色', key: 'themeColor', minWidth: 100 },
{ title: '排序', key: 'sort', width: 80 }, { title: '排序', key: 'sort', minWidth: 80 },
{ title: '启用', width: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) }, { title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('college') this.operateActionColumn('college')
] ]
}, },
economyColumns() { economyColumns() {
return [ return [
{ title: '日期', key: 'auditDate', width: 120 }, { title: '日期', key: 'auditDate', minWidth: 120 },
{ title: '产出券', key: 'newTickets', width: 90 }, { title: '产出券', key: 'newTickets', minWidth: 90 },
{ title: '回收券', key: 'burnTickets', width: 90 }, { title: '回收券', key: 'burnTickets', minWidth: 90 },
{ title: '净增', key: 'netTickets', width: 90 }, { title: '净增', key: 'netTickets', minWidth: 90 },
{ title: '种植产出', key: 'plantOutput', width: 100 }, { title: '种植产出', key: 'plantOutput', minWidth: 100 },
{ title: '地标回收', key: 'landmarkBurn', width: 100 }, { title: '地标回收', key: 'landmarkBurn', minWidth: 100 },
{ title: '升级回收', key: 'upgradeBurn', width: 100 }, { title: '升级回收', key: 'upgradeBurn', minWidth: 100 },
{ title: '活跃持券用户', key: 'activeUserCount', width: 120 }, { title: '活跃持券用户', key: 'activeUserCount', minWidth: 120 },
{ title: '预警', width: 80, render: (h, p) => h('Tag', { props: { color: p.row.warning === 1 ? 'red' : 'green' } }, p.row.warning === 1 ? '净增' : '平衡') } { title: '预警', minWidth: 80, render: (h, p) => h('Tag', { props: { color: p.row.warning === 1 ? 'red' : 'green' } }, p.row.warning === 1 ? '净增' : '平衡') }
] ]
}, },
adventureEventColumns() { adventureEventColumns() {
@ -755,15 +755,15 @@
}, },
adventureRankColumns() { adventureRankColumns() {
return [ return [
{ title: '日期', key: 'rankDate', width: 120 }, { title: '日期', key: 'rankDate', minWidth: 120 },
{ title: '名次', key: 'rankNo', width: 80 }, { title: '名次', key: 'rankNo', minWidth: 80 },
{ title: '昵称', key: 'nickname', minWidth: 120 }, { title: '昵称', key: 'nickname', minWidth: 120 },
{ title: '学院', key: 'college', minWidth: 120 }, { title: '学院', key: 'college', minWidth: 120 },
{ title: '分数', key: 'score', width: 90 }, { title: '分数', key: 'score', minWidth: 90 },
{ title: '次数', key: 'playCount', width: 80 }, { title: '次数', key: 'playCount', minWidth: 80 },
{ title: '奖励券', key: 'rewardTickets', width: 90 }, { title: '奖励券', key: 'rewardTickets', minWidth: 90 },
{ title: '称号', key: 'titleName', width: 120 }, { title: '称号', key: 'titleName', minWidth: 120 },
{ title: '结算', width: 80, render: (h, p) => h('Tag', { props: { color: p.row.settled === 1 ? 'green' : 'orange' } }, p.row.settled === 1 ? '已结算' : '未结算') } { title: '结算', minWidth: 80, render: (h, p) => h('Tag', { props: { color: p.row.settled === 1 ? 'green' : 'orange' } }, p.row.settled === 1 ? '已结算' : '未结算') }
] ]
}, },
adventureSessionColumns() { adventureSessionColumns() {
@ -774,7 +774,7 @@
{ title: '耗时', key: 'durationSeconds', width: 80 }, { title: '耗时', key: 'durationSeconds', width: 80 },
{ title: '免费局', width: 80, render: (h, p) => h('span', p.row.freeUsed === 1 ? '是' : '否') }, { title: '免费局', width: 80, render: (h, p) => h('span', p.row.freeUsed === 1 ? '是' : '否') },
{ title: '扣券', key: 'costTickets', width: 80 }, { title: '扣券', key: 'costTickets', width: 80 },
{ title: '异常', width: 80, render: (h, p) => h('Tag', { props: { color: p.row.cheatFlag === 'Y' ? 'red' : 'green' } }, p.row.cheatFlag === 'Y' ? '异常' : '正常') }, { title: '异常', minWidth: 80, render: (h, p) => h('Tag', { props: { color: p.row.cheatFlag === 'Y' ? 'red' : 'green' } }, p.row.cheatFlag === 'Y' ? '异常' : '正常') },
{ title: '原因', key: 'cheatReason', minWidth: 160 }, { title: '原因', key: 'cheatReason', minWidth: 160 },
{ title: '时间', key: 'createTime', minWidth: 160 } { title: '时间', key: 'createTime', minWidth: 160 }
] ]

1
src/views/sys/order-manage/orderManage.vue

@ -16,6 +16,7 @@
<TabPane label="待成团" name="1"></TabPane> <TabPane label="待成团" name="1"></TabPane>
<TabPane label="待消费" name="2"></TabPane> <TabPane label="待消费" name="2"></TabPane>
<TabPane label="待接单" name="3"></TabPane> <TabPane label="待接单" name="3"></TabPane>
<TabPane label="待出餐" name="13"></TabPane>
<TabPane label="待取货" name="4"></TabPane> <TabPane label="待取货" name="4"></TabPane>
<TabPane label="待送达" name="5"></TabPane> <TabPane label="待送达" name="5"></TabPane>
<TabPane label="已完成" name="6"></TabPane> <TabPane label="已完成" name="6"></TabPane>

Loading…
Cancel
Save