钻石流水显示时分秒+转赠类型新增web-api金币

This commit is contained in:
dragon
2024-10-30 17:46:48 +08:00
parent 31d6efd60e
commit ae0a3507a6
2 changed files with 7 additions and 3 deletions

View File

@@ -38,6 +38,7 @@
v-model="inquire.time[0]" v-model="inquire.time[0]"
type="date" type="date"
placeholder="开始时间" placeholder="开始时间"
format="YYYY-MM-DD 00:00:00"
> >
</el-date-picker> </el-date-picker>
</div> </div>
@@ -49,6 +50,7 @@
v-model="inquire.time[1]" v-model="inquire.time[1]"
type="date" type="date"
placeholder="结束时间" placeholder="结束时间"
format="YYYY-MM-DD 23:59:59"
> >
</el-date-picker> </el-date-picker>
</div> </div>
@@ -144,7 +146,6 @@ export default {
let time = this.inquire.time; let time = this.inquire.time;
let startTime = null; let startTime = null;
let endTime = null; let endTime = null;
console.log(this.inquire.time, 111111);
if (time.length > 0) { if (time.length > 0) {
startTime = this.inquire.time[0] startTime = this.inquire.time[0]
? dateFormat(this.inquire.time[0], "yyyy-MM-dd") ? dateFormat(this.inquire.time[0], "yyyy-MM-dd")
@@ -180,8 +181,8 @@ export default {
let startTime = ""; let startTime = "";
let endTime = ""; let endTime = "";
if (time && time.length > 0) { if (time && time.length > 0) {
startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss"); startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss"); endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
} }
diamondStatisticsExport({ diamondStatisticsExport({
guildId: this.inquire.guildId, guildId: this.inquire.guildId,

View File

@@ -24,6 +24,7 @@
<option value="">请选择...</option> <option value="">请选择...</option>
<option value="0">金币</option> <option value="0">金币</option>
<option value="1">背包礼物</option> <option value="1">背包礼物</option>
<option value="2">web-api金币</option>
</select> </select>
</div> </div>
@@ -163,6 +164,8 @@ export default {
formatter: function (val, row, index) { formatter: function (val, row, index) {
if (row.type == 0) { if (row.type == 0) {
return '金币' return '金币'
}else if(row.type == 2){
return 'web-api金币';
} else { } else {
return '背包礼物'; return '背包礼物';
} }