免费金币充值

src/components/locales/lang/en.js

@@ -801,7 +801,7 @@ export default {
     refunded: "Refunded",
     unknown: "Unknown",
     // 金币新增充值
-    addCoinRecharge: "New Recharge",
+    addCoinRecharge: "Free Coin Recharge",
     waitAudit: "Pending",
     refunded: "Refunded",
     passed: "Passed",

src/components/locales/lang/zh-CN.js

@@ -801,7 +801,7 @@ export default {
     refunded: "已退款",
     unknown: "未知状态",
     // 金币新增充值 ---------------------------------
-    addCoinRecharge: "新增充值",
+    addCoinRecharge: "免费金币充值",
     waitAudit: "待审核",
     refunded: "已退款",
     passed: "已通过",

src/views/recharge/gold/addCoinRecharge.vue

@@ -65,14 +65,13 @@ const recharge = ref({
   voucher: '',
   rechargeWay: '客服充值',
   freeGold: "",
-  money: null,
-  permanentGold: "",
-  rateName: null,
-  rateId: null,
-  payModel: '', // payModel 字段
+  money: 0,
+  permanentGold: "0",
+  rateName: "美元(USD)",
+  rateId: 1,
+  payModel: '银行转账', // payModel 字段
   payTime: null, // payTime 字段
   remark: '', // remark 字段
-  rechargeRatio: ''
 })
 // 用来写的 cookie 的 key
 const WriteCookies = ref(null)
@@ -100,12 +99,7 @@ const add = async function () {
     if (formattedRecharge.money) {
       formattedRecharge.money = new Decimal(formattedRecharge.money).mul(100).toNumber();
     }
-
-    if (formattedRecharge.payTime) {
-      // 使用 moment.js 格式化 payTime
-      formattedRecharge.payTime = moment(formattedRecharge.payTime).format('YYYY-MM-DD HH:mm:ss')
-    }
-
+    formattedRecharge.payTime = moment(Date.now()).format('YYYY-MM-DD HH:mm:ss')
     console.log('开始添加充值信息', recharge.value)
     //存一下 用户的jwcode
 
@@ -234,7 +228,7 @@ const addBefore = () => {
     }
 
     // 验证金币不能同时为0
-    if (Number(recharge.value.permanentGold) === 0 && Number(recharge.value.freeGold) === 0) {
+    if (Number(recharge.value.freeGold) === 0) {
       ElMessage({
         type: 'error',
         message: t('elmessage.permanentAndFreeNoZero')
@@ -242,24 +236,6 @@ const addBefore = () => {
       return;
     }
 
-    // 验证币种选择
-    if (!recharge.value.rateName) {
-      ElMessage({
-        type: 'error',
-        message: t('elmessage.checkRate')
-      });
-      return;
-    }
-
-    // 验证充值金额
-    if (!recharge.value.money) {
-      ElMessage({
-        type: 'error',
-        message: t('elmessage.checkMoney')
-      });
-      return;
-    }
-
     // 设置对应的rateId，传负载用的
     const selectedRate = rateName.value.find(item => item.value === recharge.value.rateName);
     if (selectedRate) {
@@ -332,47 +308,6 @@ const rules = reactive({
     }, trigger: 'blur'
   }],
   activity: [{ required: true, message: t('elmessage.checkActivity'), trigger: 'blur' }],
-  permanentGold: [
-    {required: true, message: t('elmessage.checkPermanentGold'), trigger: 'change'},
-    {
-      validator: (rule, value, callback) => {
-        if (!value) {
-          value = '0'
-        }
-        // 检查是否包含特殊符号
-        if (/[^0-9.]/.test(value)) {
-          callback(new Error(t('elmessage.limitNoSpecialChar')));
-          return;
-        }
-
-        // 检查整数位数
-        const integerPart = value.split('.')[0];
-        if (integerPart.length > 6) {
-          callback(new Error(t('elmessage.limitSix')));
-          return;
-        }
-
-        // 检查小数位数
-        if (value.includes('.')) {
-          const decimalPart = value.split('.')[1];
-          if (decimalPart.length > 2) {
-            callback(new Error(t('elmessage.limitTwoDecimal')));
-            return;
-          }
-        }
-
-        const numValue = Number(value);
-        if (isNaN(numValue)) {
-          callback(new Error(t('elmessage.checkNumber')));
-        } else if (numValue < 0) {
-          callback(new Error(t('elmessage.limitZero')));
-        } else {
-          callback();
-        }
-      },
-      trigger: 'blur'
-    }
-  ],
   freeGold: [
     { required: true, message: t('elmessage.checkFreeGold'), trigger: 'change' },
     {
@@ -414,52 +349,6 @@ const rules = reactive({
       trigger: 'blur'
     }
   ],
-  rateName: [{
-    required: true,
-    message: t('elmessage.checkRate'),
-    trigger: 'blur'
-  }],
-
-  money: [
-    {required: true, message: t('elmessage.checkMoney'), trigger: 'blur'},
-    {
-      validator: (rule, value, callback) => {
-        // 检查是否包含特殊符号
-        if (/[^0-9.]/.test(value)) {
-          callback(new Error(t('elmessage.limitNoSpecialChar')));
-          return;
-        }
-
-        // 检查整数位数
-        const integerPart = value.split('.')[0];
-        if (integerPart.length > 6) {
-          callback(new Error(t('elmessage.limitSix')));
-          return;
-        }
-
-        // 检查小数位数
-        if (value.includes('.')) {
-          const decimalPart = value.split('.')[1];
-          if (decimalPart.length > 2) {
-            callback(new Error(t('elmessage.limitTwoDecimal')));
-            return;
-          }
-        }
-
-        const numValue = Number(value);
-        if (isNaN(numValue)) {
-          callback(new Error(t('elmessage.checkNumber')));
-        } else if (numValue < 0) {
-          callback(new Error(t('elmessage.limitZero')));
-        } else {
-          callback();
-        }
-      },
-      trigger: 'blur'
-    }
-  ],
-  payModel: [{required: true, message: t('elmessage.checkPayModel'), trigger: 'blur'}],
-  payTime: [{required: true, message: t('elmessage.checkPayTime'), trigger: 'blur'}]
 });
 
 // 查找客户信息的方法
@@ -515,28 +404,6 @@ const getUser = async function (jwcode) {
 
 // 这是查询活动的接口，一期没有调用这个接口
 const activity = ref([])
-// const getActivity = async function () {
-//   try {
-//     // 发送POST请求
-//     const result = await API({
-//       url: '/general/activity',
-//       data: {
-
-//       }
-//     })
-
-//     // 将响应结果存储到响应式数据中
-//     console.log('请求成功', result)
-//     // 存储表格数据
-//     activity.value = result.data
-//     console.log('活动信息', activity.value)
-//   } catch (error) {
-//     console.log('activity请求失败', error)
-//     // 在这里可以处理错误逻辑，比如显示错误提示等
-//   }
-// }
-
-
 //货币条目
 const rateName = ref([])
 
@@ -674,12 +541,13 @@ const deleteRecharge = function () {
     voucher: '',
     rechargeWay: '客服充值',
     freeGold: '',
-    money: null,
-    permanentGold: '',
-    rateId: null
+    money: 0,
+    permanentGold: '0',
+    rateId: 1,
+    payModel: '银行转账', // payModel 字段
   }
   imageUrl.value = ''
-  recharge.value.rateName = ''
+  recharge.value.rateName = '美元(USD)'
 }
 
 
@@ -699,24 +567,26 @@ onMounted(() => {
   <div>
     <div class="userAndForm">
       <div class="left">
-        <el-form :model="recharge" ref="Ref" :rules="rules" label-width="auto" label-position="right"
+        <el-form :model="recharge" ref="Ref" :rules="rules" label-width="auto" label-position="left"
           style="min-width: 500px" class="add-form">
           <el-form-item prop="jwcode" :label="$t('common_add.jwcode')">
             <el-input v-model="recharge.jwcode" style="width: 220px" @keyup.enter="getUser(recharge.jwcode)" />
-            <el-button type="primary" @click="getUser(recharge.jwcode)" style="margin-left: 20px">{{ $t('common.search') }}</el-button>
+            <el-button type="primary" @click="getUser(recharge.jwcode)" style="margin-left: 20px">{{ $t('common.search')
+              }}</el-button>
           </el-form-item>
           <el-form-item prop="activity" :label="$t('common_add.activity')">
-            <el-input v-model="recharge.activity" :placeholder="$t('common_add.activityPlaceholder')" style="width: 300px"/>
+            <el-input v-model="recharge.activity" :placeholder="$t('common_add.activityPlaceholder')"
+              style="width: 300px" />
           </el-form-item>
-          <el-form-item prop="permanentGold" :label="$t('common_add.permanentGold')">
+          <!-- <el-form-item prop="permanentGold" :label="$t('common_add.permanentGold')">
             <el-input v-model="recharge.permanentGold" placeholder="0" style="width: 100px"/>
             <p>&nbsp;个</p>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item prop="freeGold" :label="$t('common_add.freeGold')">
             <el-input v-model="recharge.freeGold" placeholder="0" style="width: 100px" />
             <p>&nbsp;个</p>
           </el-form-item>
-          <el-form-item :label="$t('common_add.rechargeAmount')" required style="margin-bottom: 25px;">
+          <!-- <el-form-item :label="$t('common_add.rechargeAmount')" required style="margin-bottom: 25px;">
             <el-form-item prop="rateName" style="display: inline-block; margin-left:0;">
               <el-select v-model="recharge.rateName" :placeholder="$t('common_add.currencyName')" style="width: 100px">
                 <el-option v-for="item in rateName" :key="item.value" :label="item.label" :value="item.value"/>
@@ -725,15 +595,14 @@ onMounted(() => {
             <el-form-item prop="money" style="display: inline-block; margin-left:10px; vertical-align: top;">
               <el-input v-model="recharge.money" style="width: 190px"/>
             </el-form-item>
-          </el-form-item>
+          </el-form-item> -->
 
-          <el-form-item prop="payModel" :label="$t('common_add.payModel')">
+          <!-- <el-form-item prop="payModel" :label="$t('common_add.payModel')">
             <el-select v-model="recharge.payModel" :placeholder="$t('common_add.payModelPlaceholder')" style="width: 300px">
               <el-option v-for="item in payModel" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
-          </el-form-item>
-          <el-form-item prop="payTime" :label="$t('common_add.paymentTime')">
-            <!-- 修改 type 属性为 datetime 以支持时分秒选择 -->
+          </el-form-item> -->
+          <!-- <el-form-item prop="payTime" :label="$t('common_add.paymentTime')">
             <el-date-picker v-model="recharge.payTime" type="datetime" style="width: 300px"/>
           </el-form-item>
           <el-form-item prop="voucher" :label="$t('common_add.paymentVoucher')" style="margin-bottom: 5px">
@@ -747,14 +616,16 @@ onMounted(() => {
             <p style="margin-left: 10px; color: rgb(177, 176, 176)">
               {{ $t('common_add.paymentVoucherPlaceholder') }}
             </p>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item prop="remark" :label="$t('common_add.remark')">
             <el-input v-model="recharge.remark" style="width: 300px" :rows="4" maxlength="100" show-word-limit
               type="textarea" />
           </el-form-item>
 
-          <el-button @click="deleteRecharge" style="margin-left: 220px;margin-top:20px" type="success">{{ $t('common.reset') }}</el-button>
-          <el-button type="primary" style="margin-top:20px" :disabled="addDisabled" @click="addBefore"> {{ $t('common.confirm') }}</el-button>
+          <el-button @click="deleteRecharge" style="margin-left: 220px;margin-top:20px" type="success">{{
+            $t('common.reset') }}</el-button>
+          <el-button type="primary" style="margin-top:20px" :disabled="addDisabled" @click="addBefore"> {{
+            $t('common.confirm') }}</el-button>
         </el-form>
       </div>
 
@@ -779,7 +650,8 @@ onMounted(() => {
                 </el-form-item>
                 <!-- 金币详情独立显示 -->
                 <el-form-item style="margin-top: -23px"> <!-- 负边距减少间距 -->
-              <span style="color: #b1b1b1; margin-left: 0px" v-if="user.nowPermanentGold !== undefined">({{ $t('common_add_user.permanentGold') }}:{{
+                  <span style="color: #b1b1b1; margin-left: 0px" v-if="user.nowPermanentGold !== undefined">({{
+                    $t('common_add_user.permanentGold') }}:{{
                       user.nowPermanentGold
                     }};
                     {{ $t('common_add_user.freeGold') }}:{{ user.nowFreeGold }};
@@ -800,7 +672,8 @@ onMounted(() => {
                   <p style="color: #2fa1ff">{{ user.consumeNum }} </p>
                 </el-form-item>
                 <el-form-item style="margin-top: -23px"> <!-- 负边距减少间距 -->
-              <p style="font-size: small; color: #b1b1b1">({{ $t('common_add_user.onlyStatisticsDataAfter20250101') }})</p>
+                  <p style="font-size: small; color: #b1b1b1">({{ $t('common_add_user.onlyStatisticsDataAfter20250101')
+                    }})</p>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -832,8 +705,7 @@ onMounted(() => {
     </div>
 
     <el-dialog v-model="FirstRechargeDialogVisible" :title="$t('common_add.operationConfirm')"
-               :before-close="FirstRechargeDialogVisiblehandleClose"
-               :close-on-click-modal="false" width="400px">
+      :before-close="FirstRechargeDialogVisiblehandleClose" :close-on-click-modal="false" width="400px">
       <!-- 内容整体居中且收窄 -->
       <div class="confirm-body">
         <!-- 用户信息 -->
@@ -874,13 +746,14 @@ onMounted(() => {
       <template #footer>
         <div class="dialog-footer-center">
           <el-button @click="FirstRechargeDialogVisibleCancel">{{ $t('common.cancel') }}</el-button>
-          <el-button type="primary" @click="FistRechargeDialogVisibleContinue">{{ $t('common.confirmRecharge') }}</el-button>
+          <el-button type="primary" @click="FistRechargeDialogVisibleContinue">{{ $t('common.confirmRecharge')
+            }}</el-button>
         </div>
       </template>
     </el-dialog>
 
-    <el-dialog v-model="RechargeDialogVisible" :title="$t('common_add.operationConfirm')" :before-close="RechargeDialogVisiblehandleClose"
-               :close-on-click-modal="false" width="480px">
+    <el-dialog v-model="RechargeDialogVisible" :title="$t('common_add.operationConfirm')"
+      :before-close="RechargeDialogVisiblehandleClose" :close-on-click-modal="false" width="480px">
       <!-- 内容整体居中且收窄 -->
       <div class="confirm-body">
         <!-- 用户信息 -->
@@ -919,8 +792,12 @@ onMounted(() => {
         <div>
           <el-divider border-style="dashed" />
           <p>{{ $t('common_add.similarRechargeRecords') }}</p>
-          · {{ moment(ReadCookiesValue.payTime).format('YYYY-MM-DD HH:mm:ss') }} {{ $t('common_add.rechargePermanentGold') }}: {{ recharge.permanentGold }}
-          {{ $t('common_add.freeGold') }}: {{ recharge.freeGold }} {{ $t('common_add.orderStatus')}}: {{ orderStatus }}({{ $t('common_add.operator') }}：{{ adminData.adminName }})
+          · {{ moment(ReadCookiesValue.payTime).format('YYYY-MM-DD HH:mm:ss') }} {{
+            $t('common_add.rechargePermanentGold')
+          }}: {{ recharge.permanentGold }}
+          {{ $t('common_add.freeGold') }}: {{ recharge.freeGold }} {{ $t('common_add.orderStatus') }}: {{ orderStatus
+          }}({{
+            $t('common_add.operator') }}：{{ adminData.adminName }})
         </div>
         <div style="margin-top: 10px">
           <p>{{ $t('common_add.continueOperation') }}</p>
@@ -932,7 +809,8 @@ onMounted(() => {
       <template #footer>
         <div class="dialog-footer-center">
           <el-button @click="RechargeDialogVisibleCancel">{{ $t('common.cancel') }}</el-button>
-          <el-button type="primary" @click="RechargeDialogVisibleContinue">{{ $t('common.confirmRecharge') }}</el-button>
+          <el-button type="primary" @click="RechargeDialogVisibleContinue">{{ $t('common.confirmRecharge')
+            }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -941,7 +819,6 @@ onMounted(() => {
 </template>
 
 <style scoped lang="scss">
-
 .userAndForm {
   width: 1150px;
   height: 100%;