Browse Source

Merge branch 'zhangyong/feature-20250815160302-金币优化' into milestone-20250815-金币优化

youhua/chongzhi
ZhangYong 2 months ago
parent
commit
308b64ebca
  1. 10
      src/views/workspace/index.vue

10
src/views/workspace/index.vue

@ -43,7 +43,7 @@
<div> <div>
<div class="margin-bottom">永久金币{{ currentPermanent / 100 }}</div> <div class="margin-bottom">永久金币{{ currentPermanent / 100 }}</div>
<div class="margin-bottom">免费金币{{ currentFree / 100 }}</div> <div class="margin-bottom">免费金币{{ currentFree / 100 }}</div>
<div class="margin-bottom">[六月到期|{{ currentFreeJune / 100 }}]&nbsp;&nbsp;&nbsp;&nbsp;
<div class="margin-bottom">[六月到期|{{ currentFreeJune / 100 }}]&nbsp;&nbsp;
[十二月到期|{{ currentFreeDecember / 100 }}] [十二月到期|{{ currentFreeDecember / 100 }}]
</div> </div>
<div>任务金币{{ currentTask / 100 }}</div> <div>任务金币{{ currentTask / 100 }}</div>
@ -156,7 +156,7 @@
<el-date-picker v-model="dateRange" type="datetimerange" range-separator="" start-placeholder="开始时间" <el-date-picker v-model="dateRange" type="datetimerange" range-separator="" start-placeholder="开始时间"
end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" style="width:20vw" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" style="width:20vw"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
:default-time="defaultTime"
:default-time="defaultTime" :disabled-date="disabledDate"
/> />
<el-button type="primary" style="margin-left: 5px" @click="getChartData">查询</el-button> <el-button type="primary" style="margin-left: 5px" @click="getChartData">查询</el-button>
</div> </div>
@ -431,6 +431,12 @@ const processData = (data) => {
firstRecharge.value = summary.firstRecharge firstRecharge.value = summary.firstRecharge
} }
//
const disabledDate = (time) => {
const limitDate = new Date(2025, 0, 1);
return time.getTime() < limitDate.getTime();
}
// //
const getMarkets = async () => { const getMarkets = async () => {
console.log("adminData", adminData.value.account) console.log("adminData", adminData.value.account)

Loading…
Cancel
Save