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

src/views/consume/gold/coinConsumeDetail.vue

@@ -660,6 +660,13 @@ const getMarket = async function () {
         </el-table-column>
 
         <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
+        <el-table-column prop="isRefund" label="订单状态" width="200px" show-overflow-tooltip>
+          <template #default="scope">
+            <span v-if="scope.row.isRefund == 0">正常</span>
+            <span v-else-if="scope.row.isRefund == 1">已退回</span>
+            <span v-else>未知状态</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="adminName" label="提交人" width="110px" />
         <el-table-column prop="createTime" label="消耗时间" sortable="custom" width="180px" />
       </el-table>

src/views/workspace/index.vue

@@ -129,7 +129,7 @@
           <span>任务金币：</span> {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}&nbsp;&nbsp;
           <div v-if="activeTab === 'consume'">合计 {{ sumConsume / 100 }}</div>
         </div>
-        <div @change="handleDatePickerChange" style="margin-left:auto;margin-right: 0.5%;">
+        <div  style="margin-left:auto;margin-right: 0.5%;">
           <el-button @click="getYes()" :type="activeTimeRange === 'yes' ? 'primary' : ''">昨天
           </el-button>
           <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今天
@@ -144,7 +144,7 @@
         <div>
           <el-date-picker v-model="dateRange" type="datetimerange" range-separator="→" start-placeholder="开始时间"
             end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" style="width:20vw" value-format="YYYY-MM-DD HH:mm:ss"
-            :default-time="defaultTime" :disabled-date="disabledDate" />
+            :default-time="defaultTime" :disabled-date="disabledDate" @change="handleDatePickerChange"/>
           <el-button type="primary" style="margin-left: 5px" @click="getChartData">查询</el-button>
         </div>
       </div>