Merge branch 'refs/heads/milestone-20251104-现金二期' into lihui/hotfix-20251127131322-修复金币管理模块的铁粉和直播没数据

src/views/activityManage/activity.vue

@@ -193,6 +193,10 @@ const editForm = ref({
 })
 const marketOptions = ref([])
 const getActivity = async function () {
+    if (!hasMenuPermission(permissionMapping.view_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const rechargeActivity = {
         activityName: searchForm.value.activityName,
         businessBelong: searchForm.value.businessBelong,
@@ -219,6 +223,10 @@ const getActivity = async function () {
     }
 }
 const handleAdd = async function () {
+    if (!hasMenuPermission(permissionMapping.add_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const activityName = addForm.value.activityName
     if (!validateActivityName(activityName)) return
 
@@ -274,6 +282,10 @@ const handleAdd = async function () {
 // 新增节流
 const throttleGetActivity = _.throttle(handleAdd, 5000, { trailing: false });
 const handleEdit = async function () {
+    if (!hasMenuPermission(permissionMapping.edit_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const activityName = editForm.value.activityName
     if (!validateActivityName(activityName)) return
 
@@ -323,6 +335,10 @@ const handleEdit = async function () {
     }
 }
 const handleDel = async function (row) {
+    if (!hasMenuPermission(permissionMapping.delete_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     if (!currentDelRow.value) {
         ElMessage.error('当前选择无数据')
         return

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -117,11 +117,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -116,11 +116,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -117,11 +117,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>

src/views/moneyManage/refundDetail/refundService.vue

@@ -369,6 +369,27 @@ const submitEdit = async function () {
     }
     try {
         console.log(editRow.value)
+        if(!editForm.value.refundModel) {
+            ElMessage.error('请选择退款方式')
+            return
+        }else if(!editForm.value.refundReason) {
+            ElMessage.error('请输入退款理由')
+            return
+        }else if(editForm.value.refundModel == 1 && (!editForm.value.partRefundGold || !editForm.value.partRefundFree)) {
+            ElMessage.error('请输入退款金币数和免费金币数')
+            return
+        }else if (editForm.value.refundModel == 1 && (editForm.value.partRefundGold || editForm.value.partRefundFree)) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(editForm.value.partRefundGold)
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的永久金币数')
+                return
+            }
+            const isPositiveInteger1 = /^[1-9]\d*$/.test(editForm.value.partRefundFree)
+            if (!isPositiveInteger1) {
+                ElMessage.error('请输入正确的免费金币数')
+                return
+            }
+        }
         let params = {
             id: editRow.value.id,
             status: editRow.value.status,