Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

vue/gold-system/src/views/audit/rechargeAudit.vue

@@ -22,7 +22,7 @@ const rechargeVo = ref({});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 50,
 });
 //分页总条目
 const total = ref(100);

vue/gold-system/src/views/audit/refundAudit.vue

@@ -22,7 +22,7 @@ const consumeDetail = ref({});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 50,
 });
 //分页总条目
 const total = ref(100);

vue/gold-system/src/views/consume/allConsume.vue

@@ -14,7 +14,7 @@ const detailVo = ref({});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 50,
 });
 //分页总条目
 const total = ref(100);

vue/gold-system/src/views/recharge/addRecharge.vue

@@ -35,7 +35,7 @@ const addRecharge = ref({
   rechargeWay: "客服充值",
   freeGold: 0,
   rechargeGold: 0,
-  paidGold: "",
+  paidGold: 0,
 });
 // 这是添加充值信息的接口
 const add = async function () {
@@ -411,8 +411,13 @@ const calculatedFreeGold = computed(() => {
   if (!addRecharge.value.rechargeRatio == 0) {
     const paidGold = Number(addRecharge.value.paidGold) || 0;
     const activityId = Number(addRecharge.value.rechargeRatio) || 1; // 避免除以0
-    console.log("看看有没拿到", addRecharge.value);
-    return Math.ceil(paidGold / activityId);
+    const number = Number(paidGold / activityId); //计算总数
+    console.log("看看", number);
+    if (number < 1) {
+      return 0;
+    } else {
+      return Number(Math.ceil(number));
+    }
   }
   if (addRecharge.value.rechargeRatio == 0) {
     const paidGold = Number(addRecharge.value.paidGold) || 0;
@@ -423,7 +428,7 @@ const calculatedRechargeGold = computed(() => {
   if (!Rate.value == 0) {
     const paidGold = Number(addRecharge.value.paidGold) || 0;
     const rate = Number(Rate.value) || 1; // 避免乘以0
-    return Math.ceil(paidGold * rate);
+    return Number(Math.ceil(paidGold * rate));
   }
 });
 
@@ -444,9 +449,10 @@ const deleteRecharge = function () {
     rechargeWay: "客服充值",
     freeGold: Number(0),
     rechargeGold: 0,
-    paidGold: "",
+    paidGold: Number(0),
   };
   imageUrl.value = "";
+  Rate.value = "";
 };
 
 // 批量充值
@@ -589,7 +595,7 @@ const calculatedRowRechargeGold = computed(() => {
   if (!Rate.value == 0) {
     const paidGold = Number(addRecharge.value.paidGold) || 0;
     const rate = Number(Rate.value) || 1; // 避免乘以0
-    return Math.ceil(paidGold * rate);
+    return Number(Math.ceil(paidGold * rate));
   }
 });
 

vue/gold-system/src/views/recharge/adminRecharge.vue

@@ -33,7 +33,7 @@ const rechargeVo = ref({
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 50,
 });
 //分页总条目
 const total = ref(100);

vue/gold-system/src/views/recharge/allRecharge.vue

@@ -15,7 +15,7 @@ const rechargeVo = ref({});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 50,
 });
 //分页总条目
 const total = ref(100);

vue/gold-system/src/views/refund/allRefund.vue

@@ -15,7 +15,7 @@ const detail = ref({});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 50,
 });
 //分页总条目
 const total = ref(100);

vue/gold-system/src/views/usergold/index.vue

@@ -27,7 +27,7 @@ const getAllObj = ref({});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 50,
 });
 
 // 支付方式选项
@@ -256,9 +256,11 @@ onMounted(async function () {
             <el-table-column prop="gold" label="更新数量" width="160">
               <template #default="scope">
                 <span>{{
-                  Math.abs(scope.row.rechargeCoin +
-                    scope.row.freeCoin +
-                    scope.row.taskCoin)
+                  Math.abs(
+                    scope.row.rechargeCoin +
+                      scope.row.freeCoin +
+                      scope.row.taskCoin
+                  )
                 }}</span>
               </template>
             </el-table-column>
@@ -278,23 +280,17 @@ onMounted(async function () {
             </el-table-column>
             <el-table-column prop="freeCoin" label="免费金币" width="130">
               <template #default="scope">
-                <span>{{
-                  Math.abs(scope.row.freeCoin)
-                }}</span>
+                <span>{{ Math.abs(scope.row.freeCoin) }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="rechargeCoin" label="充值金币" width="150">
               <template #default="scope">
-                <span>{{
-                  Math.abs(scope.row.rechargeCoin)
-                }}</span>
+                <span>{{ Math.abs(scope.row.rechargeCoin) }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="taskCoin" label="任务金币" width="130">
               <template #default="scope">
-                <span>{{
-                  Math.abs(scope.row.taskCoin)
-                }}</span>
+                <span>{{ Math.abs(scope.row.taskCoin) }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="name" label="提交人" width="150" />