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

.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/'
 # 正式环境
@@ -12,5 +12,5 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 #  VITE_API_BASE='http://192.168.3.83:8081/'
 # 本地
     # VITE_API_BASE='http://localhost:8081/'
-# lijianlin
- VITE_API_BASE='http://192.168.0.113:8081/'
+# sunjiabei
+#  VITE_API_BASE='http://192.168.0.113:8081/'

src/views/audit/beanAudit.vue

@@ -347,7 +347,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   dateRange.value = [startTime, endTime]
   console.log('dateRange', dateRange.value)
   activeTimeRange.value = '7days'

src/views/audit/gold/rechargeAudit.vue

@@ -446,7 +446,7 @@ const get7Days = function () {
 
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/audit/gold/refundAudit.vue

@@ -510,7 +510,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   dateRange.value = [startTime, endTime]
   console.log('dateRange', dateRange.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/consume/bean/addBeanConsume.vue

@@ -142,6 +142,19 @@ const handleConsumeForm = async () => {
     });
     console.log('adminData', adminData.value);
 
+    // 新增验证逻辑，判断输入数量是否超过用户拥有数量
+    const inputPermanentBean = Number(consumeForm.value.permanentBean);
+    const inputFreeBean = Number(consumeForm.value.freeBean);
+    const userPermanentBean = Number(user.value.permanentBean) || 0;
+    const userFreeBean = Number(user.value.freeBean) || 0;
+
+    if (inputPermanentBean > userPermanentBean) {
+      throw new Error('付费金豆数量超过用户当前所拥有');
+    }
+    if (inputFreeBean > userFreeBean) {
+      throw new Error('免费金豆数量超过用户当前所拥有');
+    }
+    
     await ElMessageBox.confirm(
       '确认消耗吗？',
       '提示',
@@ -252,8 +265,8 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item label="消费次数">
-              <p style="color: #2fa1ff; margin-right: 5px" v-if="user.consumeNum!=null">{{ user.consumeNum }}</p>
+            <el-form-item label="消耗金豆总数">
+              <p style="color: #2fa1ff; margin-right: 5px" v-if="user.consumeSum!=null">{{ user.consumeSum }}</p>
               <p style="color: #2fa1ff; margin-right: 5px" v-else>{{ 0 }}</p>
             </el-form-item>
           </el-col>

src/views/consume/bean/articleVideo.vue

@@ -308,7 +308,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/consume/bean/dieHardFan.vue

@@ -292,7 +292,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/consume/bean/liveStream.vue

@@ -324,7 +324,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/consume/gold/coinConsumeDetail.vue

@@ -332,7 +332,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/recharge/gold/coinRechargeDetail.vue

@@ -437,7 +437,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/refund/gold/coinRefundDetail.vue

@@ -237,7 +237,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/usergold/gold/clientCountDetail.vue

@@ -266,7 +266,7 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = dayjs()
   const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   activeTimeRange.value = '7days' // 标记当前激活状态