Merge branch 'lihuilin/feature-20251104102812-现金二期' into milestone-20251104-现金二期

src/views/activityManage/activity.vue

@@ -9,7 +9,7 @@
                 <el-text size="large">业绩归属：</el-text>
                 <!-- <el-cascader v-model="searchForm.businessBelong" :options="marketOptions" placeholder="请选择所属地区" clearable
                 style="width: 10vw" /> -->
-                <el-select v-model="searchForm.businessBelong" placeholder="请选择业绩归属" style="width: 10vw">
+                <el-select v-model="searchForm.businessBelong" placeholder="请选择业绩归属" style="width: 10vw" clearable>
                     <el-option label="客户归属地" value="客户归属地" />
                     <el-option label="活动归属地" value="活动归属地" />
                 </el-select>

src/views/moneyManage/executor/executor.vue

@@ -491,13 +491,13 @@ const handleImageChange = (file) => {
 const beforeUpload = (file) => {
   const isJPG = file.type === 'image/jpeg'
   const isPNG = file.type === 'image/png'
-  const isLt1 = file.size / 1024 < 1024
+  const isLt1 = file.size / 1024 < 2048
   if (!isJPG && !isPNG) {
     ElMessage.error('上传图片只能是 JPG 或 PNG 格式')
     return false
   }
   if (!isLt1) {
-    ElMessage.error('上传图片大小不能超过1MB')
+    ElMessage.error('上传图片大小不能超过2MB')
     return false
   }
   return true