Merge branch 'master' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_admin

src/components/GxUpload/index.vue

@@ -136,6 +136,7 @@ const handleChange = ({ file, fileList: updatedList }) => {
 
 // 修复自定义上传方法
 const handleCustomRequest = async (options) => {
+    console.log("==options",options)
     const { file, onProgress, onSuccess, onError } = options;
 
     try {

src/utils/request.js

@@ -10,6 +10,7 @@ const MSG_ERROR_KEY = Symbol('GLOBAL_ERROR')
 const options = {
     enableAbortController: true,
     interceptorRequest: (request) => {
+        console.log('interceptorRequest', request)
         const userStore = useUserStore()
         const isLogin = userStore.isLogin
         const token = userStore.token

src/views/pages/activity/components/EditDialog.vue

@@ -21,7 +21,7 @@
                                 <a-date-picker v-model:value="formData.endSignupAt" placeholder="请输入报名截止时间"
                                     style="width: 100%;" />
                             </a-form-item>
-                        </a-col> 
+                        </a-col>
                         <a-col :span="24">
 
                             <a-form-item label="活动开始时间" name="startAt">
@@ -36,6 +36,12 @@
                                     style="width: 100%;" />
                             </a-form-item>
                         </a-col>
+                        <a-form-item :label="'活动报名人数'" name="maxSignupNum">
+                            <a-input-number :min="0" :placeholder="'请输入报名人数'" v-model:value="formData.maxSignupNum"
+                                style="width: 100%" />
+                        </a-form-item>
+
+
                         <a-col :span="24">
                             <a-form-item :label="'状态'" name="status">
                                 <a-radio-group v-model:value="formData.status" :options="activatyStatus.getAll()"
@@ -104,6 +110,7 @@ function handleCreate() {
     })
     // initData()
     formData.value.status = 1
+    formData.value.maxSignupNum = 0
 }
 
 /**
@@ -151,6 +158,7 @@ function handleOk() {
             showLoading()
             const params = {
                 ...values,
+                maxSignupNum: parseInt(values.maxSignupNum) || 0,
                 cover: formData.value.cover ? spliceUrl(formData.value.cover[0]) : '',
                 images: formData.value.images ? formData.value.images.map(item => spliceUrl(item)) : [],
                 status: 1