Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250623-金币前端

src/views/consume/addCoinConsume.vue

@@ -383,9 +383,20 @@ const getUser = async function (jwcode) {
       };
 
       ElMessage.success("查询成功");
-      // 检查，sumGold
+      // 检查sumGold是否有值，如果有则重新计算金币分配
+      if (addConsume.value.sumGold) {
+        const parsedSumGold = parseFloat(addConsume.value.sumGold);
+        if (!isNaN(parsedSumGold) && parsedSumGold > 0) {
+          const {free, permanent, task} = calculateCoins(parsedSumGold);
+          addConsume.value.freeGold = free;
+          addConsume.value.permanentGold = permanent;
+          addConsume.value.taskGold = task;
+        }
+      }
+      // 验证输入
       validateInput()
 
+
     } else if (!result.data) {
       ElMessage.warning("用户不存在");
       user.value.jwcode = null
@@ -477,7 +488,6 @@ onMounted(async function () {
         <el-input
             v-model="addConsume.jwcode"
             style="width: 220px"
-            @blur="getUser(addConsume.jwcode)"
         />
         <el-button
             type="primary"

src/views/consume/coinConsumeDetail.vue

@@ -95,6 +95,7 @@ const taskGolds = ref(0)
 const goods = ref([])
 
 const totalGoldSearch = ref({
+  jwcode: null,
   payPlatform: "",
   market: "",
   startTime: "",
@@ -177,6 +178,7 @@ const ConsumeSelectBy = async function (val) {
     totalGoldSearch.value.payPlatform = consumeUser.value.payPlatform
     totalGoldSearch.value.market = consumeUser.value.market
     totalGoldSearch.value.goodsName = consumeUser.value.goodsName
+    totalGoldSearch.value.jwcode = consumeUser.value.jwcode
     //
     const resultTotalGold = await request({
       // url: '/consume/statsGold',
@@ -254,6 +256,7 @@ const reset = function () {
   consumeUser.value.startTime = ''
 
   consumeUser.value.endTime = ''
+  consumeUser.value.jwcode = null
 
 
   sortField.value = ''
@@ -430,6 +433,14 @@ onMounted(async function () {
         <el-row style="margin-bottom: 10px">
           <el-col :span="6">
             <div class="head-card-element">
+              <el-text size="large">精网号：</el-text>
+              <el-input v-model="consumeUser.jwcode" placeholder="请输入精网号" size="large" style="width: 240px"
+                         clearable>
+              </el-input>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="head-card-element">
               <el-text class="mx-1" size="large">商品名称：</el-text>
               <el-select v-model="consumeUser.goodsName" placeholder="请选择商品名称" size="large" style="width: 180px"
                 clearable>

src/views/recharge/coinRechargeDetail.vue

@@ -433,7 +433,7 @@ const handleSortChange = (column) => {
               </template>
             </el-table-column>
             <el-table-column fixed="left" prop="name" label="姓名" width="80px" />
-            <el-table-column fixed="left" prop="jwcode" label="精网号" width="80px" />
+            <el-table-column fixed="left" prop="jwcode" label="精网号" width="110px" />
             <el-table-column prop="market" label="所属地区" width="100px" />
             <el-table-column prop="activity" label="活动名称" width="100px" />
             <el-table-column prop="rateName" label="货币名称" width="110px" />