From a3ddb3531ce490c434413833fba2e5325fabdff6 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Wed, 20 Aug 2025 18:33:44 +0800
Subject: [PATCH] fix consume's style and flag(@click->@change)

---
 .env.development                               |  2 +-
 package-lock.json                              |  3 +--
 src/views/consume/gold/addCoinConsume.vue      | 24 +++++++++---------------
 src/views/consume/gold/coinConsumeDetail.vue   |  8 ++++----
 src/views/recharge/gold/addCoinRecharge.vue    | 15 ---------------
 src/views/recharge/gold/coinRechargeDetail.vue | 14 ++++++++------
 src/views/refund/gold/coinRefundDetail.vue     |  6 +++---
 src/views/usergold/gold/clientCountBalance.vue |  6 +++---
 src/views/usergold/gold/clientCountDetail.vue  |  6 +++---
 9 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/.env.development b/.env.development
index b59f17b..43c51e6 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
- VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://54.255.212.181:10704/'
 # 正式环境
diff --git a/package-lock.json b/package-lock.json
index e0fc244..57394a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4007,9 +4007,8 @@
     },
     "node_modules/js-cookie": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.5.tgz",
       "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
-      "license": "MIT",
       "engines": {
         "node": ">=14"
       }
diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 3550f79..058bd4e 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -386,7 +386,7 @@ const addBefore = () => {
       });
       return;
     }
-    ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}}`
+    ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
     // 获取cookie
     const cookie = Cookies.get(ReadCookies.value)
     console.log("time", WriteCookiesTime.value)
@@ -529,54 +529,48 @@ onMounted(async function () {
 <template>
   <div>
     <el-form :model="addConsume" ref="Ref" :rules="rules" style="max-width: 600px;" class="add-form">
-      <div style="width:25vw">
       <el-form-item prop="jwcode" label="精网号" style="margin-top: 50px">
         <el-input v-model="addConsume.jwcode" style="width: 10vw;margin-left:45px" />
         <el-button type="primary" @click="getUser(addConsume.jwcode)" style="margin-left: 10px">查询
         </el-button>
       </el-form-item>
-    </div>
-      <div  style="width:25vw">
+
         <el-form-item prop="goodsName" label="商品名称" style="flex: 1; margin-right: 0px">
           <el-select v-model="addConsume.goodsName" placeholder="请选择商品"  style="width: 10vw;margin-left:30px">
             <el-option v-for="item in goods" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-      </div>
-      <div  style="width:25vw"> 
+
         <el-form-item prop="sumGold" label="消耗金币总数">
           <el-input v-model="addConsume.sumGold" style="width: 10vw;margin-left:2px" @input="validateInput()"
             @change="calculateCoins(addConsume.sumGold)" />
         </el-form-item>
-      </div>
+
 
       <!-- 三类金币自动计算（禁用状态，不可编辑） -->
-      <div style="width:25vw">
+
         <el-form-item prop="permanentGold" label="永久金币">
           <el-input v-model="addConsume.permanentGold" disabled  style="width: 10vw;margin-left:40px">
             <template #default="scope">{{ scope.row.permanentGold }}</template>
           </el-input>
           <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
         </el-form-item>
-      </div>
-      <div style="width:25vw">
+
         <el-form-item prop="freeCoin" label="免费金币">
           <el-input disabled v-model="addConsume.freeGold" style="width: 10vw;margin-left:40px" />
           <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
         </el-form-item>
-      </div>
-      <div style="width:25vw">
+
         <el-form-item prop="taskGold" label="任务金币">
           <el-input disabled v-model="addConsume.taskGold" style="width: 10vw;margin-left:40px" />
           <p style="margin-right: 20px">&nbsp;&nbsp;个</p>
         </el-form-item>
-      </div>
-      <div style="width:25vw">
+
         <el-form-item prop="remark" label="备注">
           <el-input v-model="addConsume.remark" style="width: 13.5vw;margin-left:70px" :rows="4" maxlength="100" show-word-limit
             type="textarea" />
         </el-form-item>
-      </div>
+
       <el-button type="success" @click="resetForm()" style="margin-left: 200px;margin-top:10px">重置</el-button>
       <el-button type="primary" :disabled="addDisabled" @click="addBefore" style="margin-top:10px"> 提交</el-button>
     </el-form>
diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue
index 0eddd07..58cc5b5 100644
--- a/src/views/consume/gold/coinConsumeDetail.vue
+++ b/src/views/consume/gold/coinConsumeDetail.vue
@@ -37,8 +37,8 @@ const defaultTime = [
 ====================数据=================================
 */
 
-// 新增复选框状态，默认不勾选
-const showEmployeeData = ref(false)
+// 新增复选框状态，默认勾选
+const showEmployeeData = ref(true)
 
 //这是获取用户信息的接口
 const adminData = ref({})
@@ -231,7 +231,7 @@ const ConsumeSelectBy = async function (val) {
     totalGoldSearch.value.market = consumeUser.value.market
     totalGoldSearch.value.goodsName = consumeUser.value.goodsName
     totalGoldSearch.value.jwcode = consumeUser.value.jwcode
-    totalGoldSearch.value.flag = showEmployeeData.value ? 1 : 0 // 新增 flag 参数
+    totalGoldSearch.value.flag = showEmployeeData.value ? 0 : 1 // 新增 flag 参数
     //
     const resultTotalGold = await request({
       // url: '/consume/statsGold',
@@ -613,7 +613,7 @@ const getMarket = async function () {
           </el-col>
           <el-col :span="3">
             <div class="head-card-element">
-              <el-checkbox v-model="showEmployeeData" @click="search()">员工数据</el-checkbox>
+              <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
             </div>
           </el-col>
         </el-row>
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index 2bd27d6..c7b0541 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -622,21 +622,6 @@ onMounted(() => {
         <el-input v-model="recharge.jwcode" style="width: 220px"/>
         <el-button type="primary" @click="getUser(recharge.jwcode)" style="margin-left: 20px">查询</el-button>
       </el-form-item>
-      <!-- <el-form-item prop="activity" label="活动名称">
-      <el-select
-        v-model="recharge.activity"
-        placeholder="请选择"
-        style="width: 300px"
-        @change="handleActivityChange"
-      >
-        <el-option
-          v-for="(item, index) in activity"
-          :key="index"
-          :label="item"
-          :value="item"
-        />
-      </el-select>
-    </el-form-item> -->
       <el-form-item prop="activity" label="活动名称">
         <el-input v-model="recharge.activity" placeholder="请输入活动名称" style="width: 300px"/>
       </el-form-item>
diff --git a/src/views/recharge/gold/coinRechargeDetail.vue b/src/views/recharge/gold/coinRechargeDetail.vue
index 4b52e20..eb8f7e5 100644
--- a/src/views/recharge/gold/coinRechargeDetail.vue
+++ b/src/views/recharge/gold/coinRechargeDetail.vue
@@ -6,8 +6,8 @@ import API from '@/util/http.js'
 import { reverseMarketMapping } from '@/utils/marketMap.js';
 import dayjs from "dayjs";
 
-//新增员工数数据复选框，默认不勾选
-const showEmployeeData = ref(false)
+//新增员工数数据复选框，默认勾选
+const showEmployeeData = ref(true)
 
 const trimJwCode = () => {
   if (rechargeUser.value.jwcode) {
@@ -332,11 +332,13 @@ const get = async function (val) {
         return
       }
     }
+    console.log("showEmployeeData.value",showEmployeeData.value)
+
     const result = await API({
       url: '/recharge/selectBy',
       data: {
         ...getObj.value,
-        rechargeUser: { ...rechargeUser.value, flag: showEmployeeData.value ? 0 : 1 }//新增flag参数
+        rechargeUser: { ...rechargeUser.value, flag: showEmployeeData.value ? '0' : '1'}//新增flag参数
       }
     })
     // 复制一份 rechargeUser.value 并移除排序字段和排序方式
@@ -344,7 +346,7 @@ const get = async function (val) {
       ...rechargeUser.value,
       sortField: undefined,
       sortOrder: undefined,
-      flag: showEmployeeData.value ? 1 : 0 // 新增 flag 参数
+      flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数
     })
     const resultTotalGold = await API({
       url: '/recharge/statsGold',
@@ -621,7 +623,7 @@ const getTagText = (state) => {
           </el-col>
           <el-col :span="3">
             <div class="head-card-element">
-              <el-checkbox v-model="showEmployeeData" @click="search()">员工数据</el-checkbox>
+              <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
             </div>
           </el-col>
         </el-row>
@@ -751,4 +753,4 @@ const getTagText = (state) => {
 .head-card-btn {
   margin-left: auto;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index 0760d98..bd90d05 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/src/views/refund/gold/coinRefundDetail.vue
@@ -8,7 +8,7 @@ import request from '@/util/http.js'
 import { reverseMarketMapping } from "@/utils/marketMap.js";
 import dayjs from "dayjs";
 
-const showEmployeeData = ref(false)
+const showEmployeeData = ref(true)
 
 
 const defaultTime = [
@@ -165,7 +165,7 @@ const getSelectBy = async function (val) {
     })
     // 复制一份 refundUser.value 并移除排序字段和排序方式
     const detailWithoutSort = { ...refundUser.value, 
-     flag: showEmployeeData.value ? 1 : 0 
+     flag: showEmployeeData.value ? 0 : 1 
     }
     delete detailWithoutSort.sortField
     delete detailWithoutSort.sortOrder
@@ -550,7 +550,7 @@ const getMarket = async function () {
           </el-col>
           <el-col :span="3">
             <div class="head-card-element">
-              <el-checkbox v-model="showEmployeeData" @click="search()">员工数据</el-checkbox>
+              <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
             </div>
           </el-col>
         </el-row>
diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue
index 51b3dbd..1287483 100644
--- a/src/views/usergold/gold/clientCountBalance.vue
+++ b/src/views/usergold/gold/clientCountBalance.vue
@@ -7,7 +7,7 @@ import API from '@/util/http.js'
 import {reverseMarketMapping} from "@/utils/marketMap.js";
 
 //新增员工数据复选框
-const showEmployeeData = ref(false)
+const showEmployeeData = ref(true)
 
 
 // 变量
@@ -121,7 +121,7 @@ const get = async function (val) {
       data: {
         jwcode: user.value.jwcode,
         markets: user.value.markets,
-      flag: showEmployeeData.value? 1 : 0
+      flag: showEmployeeData.value? 0 : 1
       }
     })
     // 判断精网号是否存在，假设精网号不存在时 result.data.list 为空数组
@@ -410,7 +410,7 @@ const format3 = (num) => {
             />
           </div>
             <div class="head-card-element">
-              <el-checkbox v-model="showEmployeeData" @click="search()">员工数据</el-checkbox>
+              <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
             </div>
           <el-button type="primary" @click="search()">查询</el-button>
           <el-button @click="reset" type="success">重置</el-button>
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue
index 157a961..809f00c 100644
--- a/src/views/usergold/gold/clientCountDetail.vue
+++ b/src/views/usergold/gold/clientCountDetail.vue
@@ -8,7 +8,7 @@ import {reverseMarketMapping} from "../../../utils/marketMap.js";
 import dayjs from "dayjs";
 
 //新增复选框员工数据
-const showEmployeeData = ref(false)
+const showEmployeeData = ref(true)
 
 
 // 标记当前激活的时间范围按钮
@@ -191,7 +191,7 @@ const get = async function (val) {
       url: '/goldDetail/getTotal',
       method: 'post',
       data: {
-        goldDetail: {...goldDetail.value, flag: showEmployeeData.value? 1 : 0},
+        goldDetail: {...goldDetail.value, flag: showEmployeeData.value? 0 : 1},
         /* jwcode: goldDetail.value.jwcode || '',
          payPlatform: goldDetail.value.payPlatform || '',
          type: goldDetail.value.type || '',
@@ -537,7 +537,7 @@ const format3 = (num) => {
             </el-col>
             <el-col :span="3">
             <div class="head-card-element">
-              <el-checkbox v-model="showEmployeeData" @click="search()">员工数据</el-checkbox>
+              <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
             </div>
           </el-col>
           </el-row>