Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化

src/views/consume/gold/coinConsumeDetail.vue

@@ -562,9 +562,9 @@ const getMarket = async function () {
           <el-col :span="5">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">商品名称：</el-text>
-              <el-select v-model="consumeUser.goodsName" placeholder="请选择商品名称" style="width: 180px" clearable>
+              <el-select v-model="consumeUser.goodsName" placeholder="请选择商品名称" style="width: 180px" clearable filterable >
                 <!-- 修改 v-for 绑定逻辑 -->
-                <el-option v-for="(item, index) in goods" :key="index" :label="item " :value="item" />
+                <el-option v-for="(item, index) in goods" :key="index" :label="item.label " :value="item" />
               </el-select>
             </div>
           </el-col>
@@ -614,6 +614,7 @@ const getMarket = async function () {
       <el-card>
         <div>
           消耗新币：{{ format3(Math.abs(permanentGolds)) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
+          消耗总金币：{{ format3(Math.abs(permanentGolds+freeGolds+taskGolds)) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
           永久金币：{{ format3(Math.abs(permanentGolds)) }}&nbsp;&nbsp;&nbsp;&nbsp;
           免费金币：{{ format3(Math.abs(freeGolds)) }}&nbsp;&nbsp;&nbsp;&nbsp;
           任务金币：{{ format3(Math.abs(taskGolds)) }}
@@ -633,7 +634,7 @@ const getMarket = async function () {
             <el-table-column prop="market" label="所属地区" width="110px" />
             <el-table-column prop="orderCode" label="订单号" width="260px" show-overflow-tooltip />
 
-            <el-table-column prop="goodsName" label="商品" width="160px" show-overflow-tooltip />
+            <el-table-column prop="goodsName" label="商品名称" width="160px" show-overflow-tooltip />
             <el-table-column prop="payPlatform" label="消耗平台" width="120px">
               <template #default="scope">
                 {{ scope.row.payPlatform }}