@@ -453,6 +457,9 @@
}
},
computed: {
+ canCreatePool() {
+ return !this.pool.loading && Number(this.pool.total || 0) === 0 && this.pool.data.length === 0
+ },
operateTitle() {
const map = { tree: '券树周期', warehouse: '仓库等级', tower: '防御塔等级', search: '搜查规则', stamina: '体力道具', landmark: '校园地标', college: '学院配置' }
return (this.operateForm.id ? '编辑' : '新增') + (map[this.operateType] || '经营配置')
@@ -934,18 +941,21 @@
},
// ---- 奖池 ----
openPool(row) {
- this.poolForm = row ? Object.assign({}, row) : {
+ this.poolForm = row ? Object.assign({}, row, {
+ poolDate: this.poolDateFromRow(row)
+ }) : {
regionId: this.regionId || '',
poolAmount: 0,
drawTime: this.defaultDrawTime(),
status: 0
}
- if (this.poolForm.status !== 1) this.poolForm.drawTime = this.defaultDrawTime(this.poolForm.drawTime)
+ this.syncPoolPeriodNo(this.poolForm)
this.poolModal = true
},
savePool() {
const form = Object.assign({}, this.poolForm)
- if (form.status !== 1) form.drawTime = this.defaultDrawTime(form.drawTime)
+ this.syncPoolPeriodNo(form)
+ delete form.poolDate
planetPoolSave(form).then(r => {
if (r && r.success) {
this.$Message.success('保存成功')
@@ -1114,6 +1124,32 @@
const p = n => (n < 10 ? '0' + n : n)
return `${value.getFullYear()}-${p(value.getMonth() + 1)}-${p(value.getDate())}`
},
+ parseDate(value) {
+ if (!value) return null
+ if (value instanceof Date) return value
+ if (typeof value === 'string' && value.length >= 10) {
+ return new Date(value.slice(0, 10).replace(/-/g, '/'))
+ }
+ return null
+ },
+ poolDateFromRow(row) {
+ if (row.drawTime) return this.formatDateParam(this.parseDate(row.drawTime))
+ if (row.periodNo && row.periodNo.length >= 8) {
+ const periodNo = row.periodNo.replace(/^P/, '').slice(0, 8)
+ return `${periodNo.slice(0, 4)}-${periodNo.slice(4, 6)}-${periodNo.slice(6, 8)}`
+ }
+ return this.formatDateParam(this.parseDate(this.defaultDrawTime()))
+ },
+ onPoolDateChange(value) {
+ this.poolForm.poolDate = value
+ this.syncPoolPeriodNo(this.poolForm)
+ },
+ syncPoolPeriodNo(form) {
+ const poolDate = this.formatDateParam(this.parseDate(form.poolDate || form.drawTime) || new Date())
+ form.poolDate = poolDate
+ form.periodNo = poolDate.replace(/-/g, '')
+ form.drawTime = `${poolDate} 22:00:00`
+ },
defaultDrawTime(value) {
let d = value instanceof Date ? value : new Date()
if (!(value instanceof Date) && typeof value === 'string' && value.length >= 10) {
diff --git a/src/views/app/data-statistics/data-statistics.vue b/src/views/app/data-statistics/data-statistics.vue
index bee3157..445e2b0 100644
--- a/src/views/app/data-statistics/data-statistics.vue
+++ b/src/views/app/data-statistics/data-statistics.vue
@@ -54,7 +54,7 @@
- 统计口径：订单按支付时间，退款/售后按成功时间，抽奖按开奖时间；流水和配送费已扣微信0.6%手续费，内容审核按每100次0.05元向上取整。
+ 统计口径：订单按支付时间，退款/售后按成功时间，抽奖按开奖时间；流水总金额=商品价格+打包费+配送费，有效流水总金额=订单商品价格+打包费后扣微信0.6%手续费。
订单数据
@@ -67,7 +67,15 @@
{{ statistics.orderCount }}
-
订单数量（单）
+
+ 订单数量（单）
+
+
+
+ 订单记录数（待支付、已取消不计入）
+
+
+