diff --git a/dist.zip b/dist.zip
index 5f65097..9d536a0 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/package-lock.json b/package-lock.json
index 0a87b86..ae1c998 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "smartadmin",
+  "name": "yun-admin",
   "version": "3.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "smartadmin",
+      "name": "yun-admin",
       "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
diff --git a/src/api/business/service-applications/service-applications-api.js b/src/api/business/service-applications/service-applications-api.js
index 4f90adc..e3b3b27 100644
--- a/src/api/business/service-applications/service-applications-api.js
+++ b/src/api/business/service-applications/service-applications-api.js
@@ -32,8 +32,8 @@ export const serviceApplicationsApi = {
   /**
    * 编辑提交  @author  wzh
    */
-  submit: (id) => {
-      return getRequest(`/serviceApplications/submit/${id}`);
+  submit: (param) => {
+      return postRequest('/serviceApplications/submit', param);
   },
 /**
    * 审核  @author  wzh
diff --git a/src/components/business/category-tree-select/index.vue b/src/components/business/category-tree-select/index.vue
index 4a9c77a..706ef6e 100644
--- a/src/components/business/category-tree-select/index.vue
+++ b/src/components/business/category-tree-select/index.vue
@@ -7,7 +7,7 @@
     <a-tree-select
       v-model:value="selectValue"
       :style="`width:${width}`"
-      :dropdown-style="{ maxHeight: '400px', overflowX: 'auto', maxWidth: '350px' }"
+      :dropdown-style="{ maxWidth: '350px' }"
       :tree-data="categoryTreeData"
       :placeholder="placeholder"
       :allowClear="true"
diff --git a/src/views/business/erp/cost/firm-reports-list.vue b/src/views/business/erp/cost/firm-reports-list.vue
index 5d2949d..cf26094 100644
--- a/src/views/business/erp/cost/firm-reports-list.vue
+++ b/src/views/business/erp/cost/firm-reports-list.vue
@@ -10,7 +10,7 @@
     <a-form class="smart-query-form">
         <a-row class="smart-query-form-row">
             <a-form-item label="律师事务所" class="smart-query-form-item">
-                <DepartmentTreeSelect style="width: 150px" v-model:value="queryForm.firmId" placeholder="请选择律师事务所" />
+                <DepartmentTreeSelect style="width: 250px" v-model:value="queryForm.firmId" placeholder="请选择律师事务所" />
             </a-form-item>
             <a-form-item label="报表年份" class="smart-query-form-item">
                 <a-input style="width: 150px" v-model:value="queryForm.declareYear" placeholder="请输入报表年份" />
diff --git a/src/views/business/erp/goods/components/goods-form-modal.vue b/src/views/business/erp/goods/components/goods-form-modal.vue
index 1684cac..423c197 100644
--- a/src/views/business/erp/goods/components/goods-form-modal.vue
+++ b/src/views/business/erp/goods/components/goods-form-modal.vue
@@ -17,7 +17,15 @@
         </a-radio-group>
       </a-form-item>
       <a-form-item label="小时（次）" name="price">
-        <a-input-number style="width: 100%" placeholder="请输入小时（次）" v-model:value="form.price" :min="0" />
+        <a-input style="width: 100%" placeholder="请输入小时（次）" v-model:value="form.price" :min="0" />
+      </a-form-item>
+      <a-form-item label="计算类型" name="timeType" >
+        <DictSelect 
+          v-model:value="form.timeType" 
+          placeholder="请选择计算类型" 
+          dictCode="COMPUTATIONTYPE"
+          style="width: 100%"
+        />
       </a-form-item>
       <a-form-item label="备注" name="remark">
         <a-input style="width: 100%" placeholder="请输入备注" v-model:value="form.remark" />
@@ -42,7 +50,7 @@
   </a-drawer>
 </template>
 <script setup>
-  import { ref, nextTick, reactive } from 'vue';
+  import { ref, nextTick, reactive, onMounted } from 'vue';
   import CategoryTree from '/@/components/business/category-tree-select/index.vue';
   import { CATEGORY_TYPE_ENUM } from '/@/constants/business/erp/category-const';
   import { message } from 'ant-design-vue';
@@ -54,6 +62,7 @@
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
   import DictSelect from '/@/components/support/dict-select/index.vue';
   import { DICT_CODE_ENUM } from '/@/constants/support/dict-const';
+  import { useDictStore } from '/@/store/modules/system/dict.js';
 
   // emit
   const emit = defineEmits(['reloadList']);
@@ -70,6 +79,8 @@
     price: undefined,
     //上架状态
     shelvesFlag: true,
+    //计算类型
+    timeType: undefined,
     //备注
     remark: '',
     //活动id
@@ -79,7 +90,6 @@
   const rules = {
     categoryId: [{ required: true, message: '请选择活动分类' }],
     goodsName: [{ required: true, message: '活动名称不能为空' }],
-    price: [{ required: true, message: '活动小时（1次）不能为空' }],
   };
   // 是否展示抽屉
   const visible = ref(false);
@@ -103,6 +113,8 @@
     visible.value = false;
   }
 
+
+
   function onSubmit() {
     formRef.value
       .validate()
diff --git a/src/views/business/erp/goods/goods-list.vue b/src/views/business/erp/goods/goods-list.vue
index addf499..663db32 100644
--- a/src/views/business/erp/goods/goods-list.vue
+++ b/src/views/business/erp/goods/goods-list.vue
@@ -7,7 +7,7 @@
     <a-row class="smart-query-form-row" v-privilege="'goods:query'">
       <a-form-item label="活动分类"  class="smart-query-form-item">
         <category-tree
-          width="250px"
+          width="300px"
           v-model:value="queryForm.categoryId"
           placeholder="请选择活动分类"
           :categoryType="CATEGORY_TYPE_ENUM.GOODS.value"
@@ -15,7 +15,7 @@
         />
       </a-form-item>
 
-      <a-form-item style="margin-left:100px;width: 300px" label="活动名称" class="smart-query-form-item">
+      <a-form-item style="margin-left:150px;width: 300px" label="活动名称" class="smart-query-form-item">
         <a-input  v-model:value="queryForm.searchWord" placeholder="活动名称" />
       </a-form-item>
 
@@ -202,7 +202,7 @@
 </style>
 <script setup>
   import GoodsFormModal from './components/goods-form-modal.vue';
-  import { onMounted, reactive, ref } from 'vue';
+  import { onMounted, reactive, ref, h } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { goodsApi } from '/@/api/business/goods/goods-api';
@@ -267,6 +267,14 @@
       resizable: true,
       width: 150,
     },
+    {
+      title: '计算类型',
+      dataIndex: 'timeType',
+      ellipsis: true,
+      resizable: true,
+      width: 100,
+      customRender: ({ text }) => h(DictLabel, { dictCode: 'COMPUTATIONTYPE', dataValue: text }),
+    },
     {
       title: '创建时间',
       dataIndex: 'createTime',
diff --git a/src/views/business/erp/service/service-applications-form.vue b/src/views/business/erp/service/service-applications-form.vue
index ced53cb..bddc90a 100644
--- a/src/views/business/erp/service/service-applications-form.vue
+++ b/src/views/business/erp/service/service-applications-form.vue
@@ -56,30 +56,7 @@
             </div>
           </a-col>
         </a-row>
-        
-        <!-- 服务时间信息 -->
-        <a-row :gutter="24">
-           <a-col :span="8">
-            <a-form-item label="服务开始时间"  name="serviceStart" label-align="left">
-              <a-date-picker show-time format="YYYY-MM-DD HH:00:00" valueFormat="YYYY-MM-DD HH:00:00" v-model:value="form.serviceStart" style="width: 100%" placeholder="服务开始时间" :disabled="readonlyMode" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="服务结束时间"  name="serviceEnd" label-align="left">
-              <a-date-picker show-time format="YYYY-MM-DD HH:00:00" valueFormat="YYYY-MM-DD HH:00:00" v-model:value="form.serviceEnd" style="width: 100%" placeholder="服务结束时间" :disabled="readonlyMode" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item name="serviceDuration">
-              <template #label>
-                <span>服务时长（小时）</span>
-                <span style="color: #999; font-size: 12px; margin-left: 4px;">可通过时间选择也可手动填写</span>
-              </template>
-              <a-input-number style="width: 100%" v-model:value="form.serviceDuration" placeholder="服务时长（小时）" :disabled="readonlyMode" />
-            </a-form-item>
-            <div style="font-size: 12px; color: #f00d0dff; margin-top: -12px; margin-bottom: 12px;">注:不足30分钟（不含本数）的，不计入时长，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
-          </a-col>
-        </a-row>
+
 
         <!-- 活动信息 -->
         <a-row :gutter="16">
@@ -110,6 +87,79 @@
           </a-col>
         </a-row>
 
+        <!-- 根据活动类型显示不同字段 -->
+        <template v-if="currentActivityType === 'DICT' || !currentActivityType">
+          <!-- dict类型：显示服务时长、服务开始时间和服务结束时间 -->
+          <a-row :gutter="24">
+             <a-col :span="8">
+              <a-form-item label="服务开始时间"  name="serviceStart" label-align="left">
+                <a-date-picker show-time format="YYYY-MM-DD HH:00:00" valueFormat="YYYY-MM-DD HH:00:00" v-model:value="form.serviceStart" style="width: 100%" placeholder="服务开始时间" :disabled="readonlyMode" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item label="服务结束时间"  name="serviceEnd" label-align="left">
+                <a-date-picker show-time format="YYYY-MM-DD HH:00:00" valueFormat="YYYY-MM-DD HH:00:00" v-model:value="form.serviceEnd" style="width: 100%" placeholder="服务结束时间" :disabled="readonlyMode" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item name="serviceDuration">
+                <template #label>
+                  <span>服务时长（小时）</span>
+                  <span style="color: #999; font-size: 12px; margin-left: 4px;">可通过时间选择也可手动填写</span>
+                </template>
+                <a-input-number style="width: 100%" v-model:value="form.serviceDuration" placeholder="服务时长（小时）" :disabled="readonlyMode" />
+              </a-form-item>
+              <div style="font-size: 12px; color: #f00d0dff; margin-top: -12px; margin-bottom: 12px;">注:不足30分钟（不含本数）的，不计入时长，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
+            </a-col>
+          </a-row>
+        </template>
+
+        <template v-else-if="currentActivityType === 'TIME'">
+          <!-- time类型：显示案件编号和服务时长在一行 -->
+          <a-row :gutter="16">
+            <a-col :span="8">
+              <a-form-item label="案件编号"  name="recordNo">
+                <a-input style="width: 100%" v-model:value="form.recordNo" placeholder="请输入案件编号" :disabled="readonlyMode" />
+              </a-form-item>
+            </a-col>
+            
+            <!-- 时间类型活动显示服务时长（如果需要用户填写） -->
+            <a-col :span="8" v-if="currentActivity.price && currentActivity.price.includes('-')">
+              <a-form-item name="serviceDuration">
+                <template #label>
+                  <span>服务时长（小时）</span>
+                  <span style="color: #999; font-size: 12px; margin-left: 4px;">请在{{ currentActivity.price }}范围内填写</span>
+                </template>
+                <a-input-number style="width: 100%" v-model:value="form.serviceDuration" placeholder="服务时长（小时）" :disabled="readonlyMode" />
+              </a-form-item>
+            </a-col>
+            
+            <!-- 时间类型活动显示固定服务时长 -->
+            <a-col :span="8" v-else-if="currentActivity.price && !currentActivity.price.includes('-')">
+              <a-form-item label="服务时长（小时）">
+                <a-input-number style="width: 100%" v-model:value="form.serviceDuration" :disabled="true" />
+              </a-form-item>
+            </a-col>
+            
+            <!-- 时间类型活动显示默认服务时长（当活动没有price字段时） -->
+            <a-col :span="8" v-else>
+              <a-form-item label="服务时长（小时）">
+                <a-input-number style="width: 100%" v-model:value="form.serviceDuration" :disabled="true" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </template>
+
+        <template v-else-if="currentActivityType === 'AMOUT'">
+          <!-- amount类型：显示金额输入框 -->
+          <a-row :gutter="16">
+            <a-col :span="8">
+              <a-form-item label="金额"  name="workloadScore">
+                <a-input-number style="width: 100%" v-model:value="form.workloadScore" placeholder="请输入金额" :disabled="readonlyMode" :min="0" :precision="2" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </template>
         <!-- 服务统计信息 -->
         <a-row :gutter="16">
           <a-col :span="8">
@@ -162,7 +212,7 @@
                         readonly
                       />
             </div>
-            <div v-else>无证明材料 (defaultFileList长度: {{ defaultFileList.length }})</div>
+            <div v-else>无证明材料</div>
           </template>
 
 
@@ -242,11 +292,18 @@
 
   // 活动列表数据
   const activityList = ref([]);
+  
+  // 当前选中的活动和活动类型
+  const currentActivity = ref({});
+  const currentActivityType = ref('');
+
 
   // 活动类型变化处理
   async function onActivityCategoryChange(categoryId) {
-    // 清空活动名称
-    form.activityNameId = undefined;
+    // 只有在非只读模式下才清空活动名称
+    //if (!readonlyMode.value) {
+      //form.activityNameId = undefined;
+    //}
     
     if (!categoryId) {
       activityList.value = [];
@@ -265,11 +322,13 @@
       const result = await goodsApi.queryGoodsList(queryParams);
       
       if (result.data && result.data.list) {
-        // 将活动列表转换为下拉选项格式
+        // 将活动列表转换为下拉选项格式，保存完整的活动信息
         activityList.value = result.data.list.map(item => ({
           label: item.goodsName,
           value: item.goodsId, // 传递活动ID而不是名称
           goodsId: item.goodsId,
+          timeType: item.timeType,
+          ...item
         }));
       } else {
         activityList.value = [];
@@ -327,6 +386,22 @@
       form.attachmentIds = '';
     }
     
+    // 编辑模式或详情模式下，如果有活动类型ID，加载活动列表
+    if (form.activityCategoryId) {
+      await onActivityCategoryChange(form.activityCategoryId);
+      
+      // 加载活动列表后，根据活动名称ID更新currentActivity和currentActivityType
+      if (form.activityNameId && activityList.value.length > 0) {
+        const selectedActivity = activityList.value.find(activity => activity.goodsId === form.activityNameId);
+        if (selectedActivity) {
+          currentActivity.value = selectedActivity;
+          currentActivityType.value = selectedActivity.timeType || '';
+          // 将timeType放入serviceType字段中传递给后端
+          form.serviceType = selectedActivity.timeType || '';
+        }
+      }
+    }
+    
     // 使用字典时把下面这注释修改成自己的字典字段 有多个字典字段就复制多份同理修改 不然打开表单时不显示字典初始值
     // if (form.status && form.status.length > 0) {
     //   form.status = form.status.map((e) => e.valueCode);
@@ -450,6 +525,9 @@
       serviceDuration: undefined, //服务时长（小时）
       activityCategoryId: undefined, //活动类型
       activityNameId: undefined, //活动名称
+      recordNo: undefined, //案件编号
+      workloadScore: undefined, //金额
+      serviceType: undefined, //申报服务类型（使用timeType）
       beneficiaryCount: undefined, //参加人数（受益人数）
       organizerName: undefined, //组织单位名称
       organizerContact: undefined, //负责人姓名
@@ -469,7 +547,8 @@
   watch(
     () => [form.serviceStart, form.serviceEnd],
     ([startTime, endTime]) => {
-      if (startTime && endTime) {
+      // 只有在非编辑模式下或当前活动类型为DICT时才自动计算服务时长
+      if ((!form.applicationId || currentActivityType.value === 'DICT') && (startTime && endTime)) {
         const start = dayjs(startTime);
         const end = dayjs(endTime);
         if (end.isAfter(start)) {
@@ -480,20 +559,141 @@
           form.serviceDuration = undefined;
           message.warning('服务结束时间必须晚于开始时间');
         }
-      } else {
+      } else if (!form.applicationId && (!startTime || !endTime)) {
+        // 只有在非编辑模式下才清空服务时长
         form.serviceDuration = undefined;
       }
     },
     { immediate: true }
   );
+  
+  // 监听活动名称变化，更新活动类型和设置默认服务时长
+  watch(
+    () => form.activityNameId,
+    (activityNameId) => {
+      if (activityNameId) {
+        const selectedActivity = activityList.value.find(activity => activity.goodsId === activityNameId);
+        if (selectedActivity) {
+          currentActivity.value = selectedActivity;
+          currentActivityType.value = selectedActivity.timeType || '';
+          // 将timeType放入serviceType字段中传递给后端
+          form.serviceType = selectedActivity.timeType || '';
+          
+          // 根据活动类型设置默认服务时长
+          // 只有在非编辑模式下（即新建模式）才设置默认服务时长
+          if (!form.applicationId) {
+            if (selectedActivity.timeType === 'TIME') {
+              // 检查活动是否有固定小时数（使用price字段）
+              if (selectedActivity.price) {
+                // 如果价格包含范围（有-），让用户自己填写
+                if (selectedActivity.price.includes('-')) {
+                  form.serviceDuration = undefined;
+                } else {
+                  // 固定使用活动中的小时数
+                  form.serviceDuration = parseFloat(selectedActivity.price);
+                }
+              } else {
+                // 默认值
+                form.serviceDuration = 25;
+              }
+            } else if (selectedActivity.timeType === 'AMOUT') {
+              form.serviceDuration = undefined;
+            } else if (selectedActivity.timeType === 'DICT') {
+              // DICT类型：清空服务时长，让用户通过选择时间或手动填写
+              form.serviceDuration = undefined;
+            }
+          }
+        }
+      } else {
+        currentActivity.value = {};
+        currentActivityType.value = '';
+      }
+    },
+    { immediate: true }
+  );
+
 
   const rules = {
       actualName: [{ required: true, message: '姓名 必填' }],
       certificateNumber: [{ required: true, message: '执业证号 必填' }],
       firmId: [{ required: true, message: '执业机构 必填' }],
-      serviceStart: [{ required: true, message: '服务开始时间 必填' }],
-      serviceEnd: [{ required: true, message: '服务结束时间 必填' }],
-      serviceDuration: [{ required: true, message: '服务时长（小时） 必填' }],
+      serviceStart: [
+        {
+          validator: async (rule, value) => {
+            // 只有dict类型需要验证服务开始时间
+            if (currentActivityType.value === 'DICT' && !value) {
+              return Promise.reject('服务开始时间 必填');
+            }
+            return Promise.resolve();
+          }
+        }
+      ],
+      serviceEnd: [
+        {
+          validator: async (rule, value) => {
+            // 只有dict类型需要验证服务结束时间
+            if (currentActivityType.value === 'DICT' && !value) {
+              return Promise.reject('服务结束时间 必填');
+            }
+            return Promise.resolve();
+          }
+        }
+      ],
+      serviceDuration: [
+        {
+          validator: async (rule, value) => {
+            // dict类型需要验证服务时长
+            if (currentActivityType.value === 'DICT' && !value) {
+              return Promise.reject('服务时长（小时） 必填');
+            }
+            // time类型需要验证服务时长
+            if (currentActivityType.value === 'TIME') {
+              if (!value) {
+                return Promise.reject('服务时长（小时） 必填');
+              }
+              // 如果活动有小时范围，验证用户填写的时长是否在范围内
+            if (currentActivity.value.price && currentActivity.value.price.includes('-')) {
+              const [min, max] = currentActivity.value.price.split('-').map(Number);
+              if (value < min || value > max) {
+                return Promise.reject(`你填写的此类公益活动时长超出该活动要求的${currentActivity.value.price}小时，请按规范要求填报具体时长`);
+              }
+            }
+            }
+            // amount类型需要验证服务时长范围
+            if (currentActivityType.value === 'AMOUT') {
+              if (!value) {
+                return Promise.reject('服务时长（小时） 必填');
+              }
+              if (value < 100 || value > 200) {
+                return Promise.reject('你填写的此类公益活动时长超出该活动要求的100-200小时，请按规范要求填报具体时长');
+              }
+            }
+            return Promise.resolve();
+          }
+        }
+      ],
+      recordNo: [
+        {
+          validator: async (rule, value) => {
+            // time类型需要验证案件编号
+            if (currentActivityType.value === 'TIME' && !value) {
+              return Promise.reject('案件编号 必填');
+            }
+            return Promise.resolve();
+          }
+        }
+      ],
+      workloadScore: [
+        {
+          validator: async (rule, value) => {
+            // amount类型需要验证金额
+            if (currentActivityType.value === 'AMOUT' && !value) {
+              return Promise.reject('金额 必填');
+            }
+            return Promise.resolve();
+          }
+        }
+      ],
       activityCategoryId: [{ required: true, message: '活动类型 必填' }],
       activityNameId: [{ required: true, message: '活动名称 必填' }],
       beneficiaryCount: [{ required: true, message: '参加人数（受益人数） 必填' }],
@@ -560,6 +760,19 @@
   async function save() {
     SmartLoading.show();
     try {
+      // 案号重复检查
+      if (form.recordNo) {
+        try {
+          const checkResult = await serviceApplicationsApi.checkCaseNumber(form.recordNo, form.applicationId);
+          if (!checkResult.ok) {
+            message.error(`本案仅限一人申报，已由${checkResult.data.lawyerName}律师申报`);
+            return;
+          }
+        } catch (error) {
+          console.error('案号校验失败:', error);
+        }
+      }
+      
       // 准备提交数据
       const submitData = { ...form };
       
@@ -589,6 +802,19 @@
   async function submit() {
     SmartLoading.show();
     try {
+      // 案号重复检查
+      if (form.recordNo) {
+        try {
+          const checkResult = await serviceApplicationsApi.checkCaseNumber(form.recordNo, form.applicationId);
+          if (!checkResult.ok) {
+            message.error(`本案仅限一人申报，已由${checkResult.data.lawyerName}律师申报`);
+            return;
+          }
+        } catch (error) {
+          console.error('案号校验失败:', error);
+        }
+      }
+      
       // 准备提交数据
       const submitData = { ...form };
       
@@ -597,13 +823,8 @@
         submitData.attachmentIds = '';
       }
       
-      if (form.applicationId) {
-        // 编辑提交：调用submit接口，传递applicationId
-        await serviceApplicationsApi.submit(form.applicationId);
-      } else {
-        // 新增提交：调用addSubmit接口，传递完整数据
-        await serviceApplicationsApi.addSubmit(submitData);
-      }
+      // 调用submit接口，传递完整数据
+      await serviceApplicationsApi.submit(submitData);
       message.success('提交成功');
       emits('reloadList');
       onClose();
diff --git a/src/views/business/erp/service/service-applications-list.vue b/src/views/business/erp/service/service-applications-list.vue
index a51fef3..acd6a5b 100644
--- a/src/views/business/erp/service/service-applications-list.vue
+++ b/src/views/business/erp/service/service-applications-list.vue
@@ -155,7 +155,7 @@
             :pagination="false"
             :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
         >
-            <template #bodyCell="{ text, record, column }">
+            <template #bodyCell="{ record, column }">
                 <template v-if="column.dataIndex === 'action'">
                     <div class="smart-table-operate">
                         <a-button @click="showDetail(record)" type="link">详情</a-button>
@@ -350,6 +350,16 @@ import AgreementModal from '/@/views/system/home/components/agreement-modal.vue'
             dataIndex: 'serviceDuration',
             ellipsis: true,
         },
+        {
+            title: '金额',
+            dataIndex: 'workloadScore',
+            ellipsis: true,
+        },
+        {
+            title: '案号',
+            dataIndex: 'recordNo',
+            ellipsis: true,
+        },
         {
             title: '参加人数（受益人数）',
             dataIndex: 'beneficiaryCount',
@@ -871,7 +881,8 @@ onMounted(async () => {
     async function requestSubmit(data){
         try {
             SmartLoading.show();
-            await serviceApplicationsApi.submit(data.applicationId);
+            // 传递完整的表单数据进行提交
+            await serviceApplicationsApi.submit(data);
             message.success('提交成功');
             queryData();
         } catch (e) {
diff --git a/src/views/mobile/components/agreement-modal.vue b/src/views/mobile/components/agreement-modal.vue
new file mode 100644
index 0000000..adeea56
--- /dev/null
+++ b/src/views/mobile/components/agreement-modal.vue
@@ -0,0 +1,361 @@
+<template>
+  <div v-if="visible" class="agreement-modal-overlay" @click="handleCancel">
+    <div class="agreement-modal" @click.stop>
+      <!-- 头部 -->
+      <div class="modal-header">
+        <h3 class="modal-title">{{ noticeDetail.title || '平台协议' }}</h3>
+      </div>
+      
+      <!-- 内容 -->
+      <div class="modal-content">
+        <div class="agreement-content" @scroll="handleScroll">
+          <div v-if="noticeDetail.title" class="agreement-text">
+            <div class="content-header">
+              <h4>{{ noticeDetail.title }}</h4>
+              <div class="content-header-info">
+                <span v-if="noticeDetail.author">作者：{{ noticeDetail.author }}</span>
+                <span v-if="noticeDetail.source">来源：{{ noticeDetail.source }}</span>
+                <span v-if="noticeDetail.publishTime">发布时间：{{ noticeDetail.publishTime }}</span>
+              </div>
+            </div>
+            <div class="content-html" v-html="noticeDetail.contentHtml"></div>
+            <div v-if="!noticeDetail.contentHtml" class="default-content">
+              <p>请仔细阅读本承诺书...</p>
+            </div>
+            <p class="important">请仔细阅读以上协议内容，点击"同意并继续"表示您已阅读并同意本协议。</p>
+          </div>
+          <div v-else class="agreement-text">
+            <h4>用户协议与承诺书</h4>
+            <div class="default-content">
+              <p>请仔细阅读本承诺书...</p>
+            </div>
+            <p class="important">请仔细阅读以上协议内容，点击"同意并继续"表示您已阅读并同意本协议。</p>
+          </div>
+        </div>
+      </div>
+      
+      <!-- 底部按钮 -->
+      <div class="modal-footer">
+        <button class="btn btn-secondary" @click="handleCancel">不同意</button>
+        <button 
+          class="btn btn-primary" 
+          @click="handleConfirm" 
+          :disabled="!hasScrolledToBottom"
+        >
+          同意并继续 
+          <span v-if="!hasScrolledToBottom">(请阅读完全文后点击)</span>
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import { message } from 'ant-design-vue'
+import { letterApi } from '/@/api/business/letter/letter-api'
+import { noticeApi } from '/@/api/business/oa/notice-api'
+
+const router = useRouter()
+const emit = defineEmits(['confirm', 'cancel'])
+
+// 组件属性
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false
+  }
+})
+
+// 组件状态
+const loading = ref(false)
+const hasScrolledToBottom = ref(false)
+
+// 公告详情数据
+const noticeDetail = reactive({
+  title: '',
+  contentHtml: '',
+  author: '',
+  source: '',
+  publishTime: ''
+})
+
+// 监听visible变化
+watch(() => props.visible, (newVisible) => {
+  if (newVisible) {
+    getNoticeDetail()
+  }
+}, { immediate: true })
+
+onMounted(() => {
+  if (props.visible) {
+    getNoticeDetail()
+  }
+})
+
+// 获取承诺书详情
+async function getNoticeDetail() {
+  try {
+    loading.value = true
+    
+    // 调用获取承诺书详情接口
+    const result = await noticeApi.getOne({})
+    console.log('获取承诺书详情结果:', result)
+    
+    if (result.code === 0 && result.data) {
+      Object.assign(noticeDetail, result.data)
+    } else {
+      // 如果接口调用失败，显示默认内容
+      Object.assign(noticeDetail, {
+        title: '用户协议与承诺书',
+        contentHtml: '',
+        author: '系统管理员',
+        source: '平台管理',
+        publishTime: new Date().toLocaleDateString()
+      })
+    }
+  } catch (error) {
+    console.error('获取承诺书详情失败:', error)
+    // 接口调用失败，显示默认内容
+    Object.assign(noticeDetail, {
+      title: '用户协议与承诺书',
+      contentHtml: '',
+      author: '系统管理员',
+      source: '平台管理',
+      publishTime: new Date().toLocaleDateString()
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+// 滚动事件处理
+function handleScroll(event) {
+  const element = event.target
+  // 检查是否滚动到底部
+  if (element.scrollTop + element.clientHeight >= element.scrollHeight - 10) {
+    hasScrolledToBottom.value = true
+  }
+}
+
+// 同意按钮点击处理
+async function handleConfirm() {
+  try {
+    // 调用签署承诺书接口
+    const signRes = await letterApi.add()
+    
+    if (signRes.code === 0) {
+      message.success('承诺书签署成功')
+      emit('confirm')
+    } else {
+      message.error(signRes.msg || '承诺书签署失败')
+    }
+  } catch (error) {
+    console.error('签署承诺书失败:', error)
+    message.error('承诺书签署失败，请稍后重试')
+  }
+}
+
+// 不同意按钮点击处理
+function handleCancel() {
+  emit('cancel')
+  // 跳转到登录页面
+  router.push('/login')
+}
+</script>
+
+<style scoped>
+/* 遮罩层 */
+.agreement-modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+}
+
+/* 弹框容器 */
+.agreement-modal {
+  width: 90%;
+  max-width: 500px;
+  background-color: white;
+  border-radius: 12px;
+  box-shadow: 0 4px 24px rgba(0, 0, 0, 0.15);
+  display: flex;
+  flex-direction: column;
+  max-height: 80vh;
+}
+
+/* 头部 */
+.modal-header {
+  padding: 16px;
+  border-bottom: 1px solid #e8e8e8;
+}
+
+.modal-title {
+  font-size: 18px;
+  font-weight: 600;
+  margin: 0;
+  text-align: center;
+  color: #333;
+}
+
+/* 内容区域 */
+.modal-content {
+  flex: 1;
+  overflow: hidden;
+  padding: 0 16px;
+}
+
+.agreement-content {
+  height: 50vh;
+  overflow-y: auto;
+  padding: 16px 0;
+}
+
+/* 滚动条样式 */
+.agreement-content::-webkit-scrollbar {
+  width: 6px;
+}
+
+.agreement-content::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 3px;
+}
+
+.agreement-content::-webkit-scrollbar-thumb {
+  background: #888;
+  border-radius: 3px;
+}
+
+.agreement-content::-webkit-scrollbar-thumb:hover {
+  background: #555;
+}
+
+/* 内容样式 */
+.agreement-text {
+  line-height: 1.6;
+  color: #555;
+}
+
+.content-header {
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.content-header h4 {
+  margin: 0 0 8px 0;
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.content-header-info {
+  font-size: 12px;
+  color: #999;
+  display: flex;
+  gap: 12px;
+  flex-wrap: wrap;
+}
+
+.content-html {
+  margin-bottom: 16px;
+}
+
+/* 默认内容 */
+.default-content {
+  margin-bottom: 16px;
+  padding: 16px;
+  background-color: #fafafa;
+  border-radius: 6px;
+  font-size: 14px;
+  line-height: 1.6;
+}
+
+/* 重要提示 */
+.important {
+  font-size: 14px;
+  color: #ff4d4f;
+  font-weight: 500;
+  text-align: center;
+  margin-top: 24px;
+}
+
+/* 底部按钮 */
+.modal-footer {
+  padding: 16px;
+  border-top: 1px solid #e8e8e8;
+  display: flex;
+  gap: 12px;
+  justify-content: space-between;
+}
+
+.btn {
+  flex: 1;
+  padding: 12px;
+  font-size: 16px;
+  font-weight: 500;
+  border: none;
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.3s;
+}
+
+.btn-primary {
+  background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
+  color: white;
+}
+
+.btn-primary:hover {
+  opacity: 0.9;
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
+}
+
+.btn-primary:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+  transform: none;
+  box-shadow: none;
+}
+
+.btn-secondary {
+  background-color: #f0f0f0;
+  color: #666;
+  border: 1px solid #d9d9d9;
+}
+
+.btn-secondary:hover {
+  background-color: #e8e8e8;
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+/* 响应式设计 */
+@media (max-width: 375px) {
+  .agreement-modal {
+    width: 95%;
+    max-width: none;
+  }
+  
+  .modal-title {
+    font-size: 16px;
+  }
+  
+  .modal-footer {
+    flex-direction: column;
+  }
+  
+  .btn {
+    font-size: 14px;
+    padding: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/mobile/index.vue b/src/views/mobile/index.vue
index 0876ed9..e0e4b90 100644
--- a/src/views/mobile/index.vue
+++ b/src/views/mobile/index.vue
@@ -80,7 +80,8 @@ async function getUserInfo() {
 // 检查用户角色（与PC端相同逻辑）
 function checkUserRole() {
   if (userInfo.value) {
-    const userRole = userInfo.value.roleCode || userInfo.value.roleName || ''
+    // 使用roleCode字段进行角色判断
+    const userRole = userInfo.value.roleCode || ''
     const roleLower = userRole.toLowerCase()
     
     // CEO角色判断（CEO不显示新建申报按钮）
@@ -90,7 +91,8 @@ function checkUserRole() {
     isAssociationRole.value = roleLower.includes('协会') || 
                              roleLower.includes('association') || 
                              roleLower.includes('律协') || 
-                             roleLower.includes('律师协会')
+                             roleLower.includes('律师协会') ||
+                             roleLower.includes('admin_employee')
     
     console.log('用户角色:', userRole, '是CEO:', isCeo.value, '是协会角色:', isAssociationRole.value)
   }
diff --git a/src/views/mobile/login.vue b/src/views/mobile/login.vue
index f90b721..aa12a43 100644
--- a/src/views/mobile/login.vue
+++ b/src/views/mobile/login.vue
@@ -37,10 +37,6 @@
         </div>
       </div>
       
-      <div class="form-group">
-        <a-checkbox v-model:checked="rememberPwd">记住密码</a-checkbox>
-      </div>
-      
       <button 
         type="button" 
         @click="onLogin" 
@@ -235,7 +231,7 @@ onMounted(() => {
   margin-bottom: 20px;
 }
 
-.form-group label {
+.form-group bel {
   display: block;
   margin-bottom: 8px;
   font-weight: 500;
diff --git a/src/views/mobile/service/create.vue b/src/views/mobile/service/create.vue
index f245170..ead45c0 100644
--- a/src/views/mobile/service/create.vue
+++ b/src/views/mobile/service/create.vue
@@ -49,7 +49,7 @@
           <input 
             v-model="form.firmName" 
             class="form-input" 
-            placeholder="执业机构名称" 
+            placeholder="执业机构" 
             disabled
           />
         </div>
@@ -57,10 +57,7 @@
         <!-- 职务 -->
         <div class="form-item">
           <label class="form-label required">职务</label>
-          <select 
-            v-model="form.positionId" 
-            class="form-select"
-          >
+          <select v-model="form.positionId" class="form-select">
             <option value="">请选择职务</option>
             <option 
               v-for="position in positionList" 
@@ -77,52 +74,6 @@
       <div class="form-section">
         <div class="section-title">二、服务信息</div>
         
-        <!-- 服务开始时间 -->
-        <div class="form-item">
-          <label class="form-label required">服务开始时间</label>
-          <DatePicker 
-            v-model:value="form.serviceStart"
-            :show-time="{ format: 'HH:00' }"
-            format="YYYY-MM-DD HH:00"
-            value-format="YYYY-MM-DD HH:00:00"
-            placeholder="请选择服务开始时间"
-            class="form-date-picker"
-          />
-        </div>
-
-        <!-- 服务结束时间 -->
-        <div class="form-item">
-          <label class="form-label required">服务结束时间</label>
-          <DatePicker 
-            v-model:value="form.serviceEnd"
-            :show-time="{ format: 'HH:00' }"
-            format="YYYY-MM-DD HH:00"
-            value-format="YYYY-MM-DD HH:00:00"
-            placeholder="请选择服务结束时间"
-            class="form-date-picker"
-          />
-        </div>
-
-        <!-- 服务时长 -->
-        <div class="form-item">
-          <label class="form-label required">
-            服务时长（小时）
-            <span class="label-tip">可通过时间选择也可手动填写</span>
-          </label>
-          <input 
-            type="number"
-            v-model="form.serviceDuration" 
-            class="form-input" 
-            placeholder="服务时长（小时）"
-          />
-          <div class="form-tip">注:不足30分钟（不含本数）的，不计入时长，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
-        </div>
-      </div>
-
-      <!-- 活动信息 -->
-      <div class="form-section">
-        <div class="section-title">三、活动信息</div>
-        
         <!-- 活动类型 -->
         <div class="form-item">
           <label class="form-label required">活动类型</label>
@@ -159,6 +110,116 @@
             </option>
           </select>
         </div>
+        
+        <!-- dict类型：显示服务时长、服务开始时间和服务结束时间 -->
+        <template v-if="currentActivityType === 'DICT'" key="dict-template">
+          <!-- 服务开始时间 -->
+          <div class="form-item">
+            <label class="form-label required">服务开始时间</label>
+            <a-date-picker 
+              show-time 
+              format="YYYY-MM-DD HH:00:00" 
+              valueFormat="YYYY-MM-DD HH:00:00" 
+              v-model:value="form.serviceStart" 
+              class="form-input" 
+              placeholder="服务开始时间"
+            />
+          </div>
+
+          <!-- 服务结束时间 -->
+          <div class="form-item">
+            <label class="form-label required">服务结束时间</label>
+            <a-date-picker 
+              show-time 
+              format="YYYY-MM-DD HH:00:00" 
+              valueFormat="YYYY-MM-DD HH:00:00" 
+              v-model:value="form.serviceEnd" 
+              class="form-input" 
+              placeholder="服务结束时间"
+            />
+          </div>
+
+          <!-- 服务时长 -->
+          <div class="form-item">
+            <label class="form-label required">
+              服务时长（小时）
+              <span style="color: #999; font-size: 12px; margin-left: 4px;">可通过时间选择也可手动填写</span>
+            </label>
+            <input 
+              v-model="form.serviceDuration" 
+              class="form-input" 
+              placeholder="服务时长（小时）"
+            />
+            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:不足30分钟（不含本数）的，不计入时长，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
+          </div>
+        </template>
+        
+        <!-- time类型：显示案件编号输入框，没有服务开始时间和服务结束时间 -->
+        <template v-else-if="currentActivityType === 'TIME'" key="time-template">
+          <!-- 案件编号 -->
+          <div class="form-item">
+            <label class="form-label required">案件编号</label>
+            <input 
+              v-model="form.recordNo" 
+              class="form-input" 
+              placeholder="请输入案件编号"
+            />
+          </div>
+          
+          <!-- 服务时长 -->
+          <div class="form-item">
+            <label class="form-label required">
+              服务时长（小时）
+              <span v-if="currentActivity.value?.price && currentActivity.value.price.includes('-')" style="color: #999; font-size: 12px; margin-left: 4px;">请在{{ currentActivity.value.price }}范围内填写</span>
+            </label>
+            <input 
+              v-model="form.serviceDuration" 
+              class="form-input" 
+              placeholder="服务时长（小时）"
+              :disabled="currentActivity.value?.price && !currentActivity.value.price.includes('-')"
+            />
+          </div>
+        </template>
+        
+        <!-- amount类型：显示金额输入框 -->
+        <template v-else-if="currentActivityType === 'AMOUT'" key="amount-template">
+          <!-- 金额 -->
+          <div class="form-item">
+            <label class="form-label required">金额</label>
+            <input 
+              type="number"
+              step="0.01"
+              v-model="form.workloadScore" 
+              class="form-input" 
+              placeholder="请输入金额"
+            />
+          </div>
+          
+          <!-- 服务时长 -->
+          <div class="form-item">
+            <label class="form-label required">服务时长（小时）</label>
+            <input 
+              v-model="form.serviceDuration" 
+              class="form-input" 
+              placeholder="服务时长（小时）"
+            />
+            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:服务时长必须在100-200小时范围内</div>
+          </div>
+        </template>
+        
+        <!-- 加载中状态 -->
+        <template v-else key="loading-template">
+          <div class="form-item">
+            <div style="text-align: center; padding: 20px; color: #999;">
+              加载中...
+            </div>
+          </div>
+        </template>
+      </div>
+
+      <!-- 活动信息 -->
+      <div class="form-section">
+        <div class="section-title">三、活动信息</div>
 
         <!-- 参加人数（受益人数） -->
         <div class="form-item">
@@ -214,11 +275,14 @@
       </div>
 
       <!-- 证明材料 -->
-        <div class="form-section">
+      <div class="form-section">
         <div class="section-title">四、证明材料</div>
         
         <div class="form-item">
-          <label class="form-label required">上传证明材料（最多5个文件）</label>
+          <label class="form-label required">
+            证明材料
+            <span style="font-size: 12px; color: #f00d0d; margin-left: 4px;"> 注:（请上传活动方案、活动记录、照片、新闻报道等材料）支持图片(JPG/PNG)、文档(PDF/Word/PPT)格式，单文件最大10MB，最多上传5个文件</span>
+          </label>
 
           <input 
             type="file"
@@ -228,9 +292,6 @@
             @change="handleFileUpload"
             :disabled="uploadedFiles.length >= 5"
           />
-          <div class="form-tip">
-            注:（请上传活动方案、活动记录、照片、新闻报道等材料）支持图片(JPG/PNG)、文档(PDF/Word/PPT)格式，单文件最大10MB，最多上传5个文件
-          </div>
           <!-- 文件列表 -->
           <div class="file-list" v-if="uploadedFiles.length > 0">
             <div 
@@ -242,7 +303,6 @@
               <button 
                 class="remove-btn" 
                 @click="removeFile(file.id)"
-                v-if="!readonlyMode"
               >
                 删除
               </button>
@@ -268,100 +328,99 @@
           @click="handleSubmit"
           :disabled="loading"
         >
-          提交申报
+          提交
         </button>
       </div>
     </div>
-
-    <!-- 加载状态 -->
-    <div v-if="loading" class="loading-overlay">
-      <div class="loading-spinner">处理中...</div>
-    </div>
   </div>
+
+  <!-- 承诺书弹框 -->
+  <AgreementModal 
+    v-if="showAgreementModal" 
+    :visible="showAgreementModal"
+    @confirm="handleAgreementConfirm"
+    @cancel="handleAgreementCancel"
+  />
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch, nextTick } from 'vue'
+import { ref, onMounted, reactive, watch, nextTick } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import { serviceApplicationsApi } from '/@/api/business/service-applications/service-applications-api'
-import { loginApi } from '/@/api/system/login-api'
-import { positionApi } from '/@/api/system/position-api' // 引入职务API
-import { categoryApi } from '/@/api/business/category/category-api' // 引入分类API
-import { goodsApi } from '/@/api/business/goods/goods-api' // 引入活动API
-import { fileApi } from '/@/api/support/file-api' // 引入文件上传API
-import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const' // 引入文件文件夹类型常量
-import { message, DatePicker } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
 import dayjs from 'dayjs'
-
+import { loginApi } from '/@/api/system/login-api'
+import { serviceApplicationsApi } from '/@/api/business/service-applications/service-applications-api'
+import { positionApi } from '/@/api/system/position-api'
+import { categoryApi } from '/@/api/business/category/category-api'
+import { goodsApi } from '/@/api/business/goods/goods-api'
+import { fileApi } from '/@/api/support/file-api'
+import { letterApi } from '/@/api/business/letter/letter-api'
+import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const'
+import AgreementModal from '../components/agreement-modal.vue'
+
+// 路由和加载状态
 const router = useRouter()
 const route = useRoute()
 const loading = ref(false)
 
-// 表单验证规则（与PC端相同）
-const rules = {
-  positionId: [{ required: true, message: '职务 必填' }],
-  serviceStart: [{ required: true, message: '服务开始时间 必填' }],
-  serviceEnd: [{ required: true, message: '服务结束时间 必填' }],
-  serviceDuration: [{ required: true, message: '服务时长（小时） 必填' }],
-  activityCategoryId: [{ required: true, message: '活动类型 必填' }],
-  activityNameId: [{ required: true, message: '活动名称 必填' }],
-  beneficiaryCount: [{ required: true, message: '参加人数（受益人数） 必填' }],
-  organizerName: [{ required: true, message: '组织单位名称 必填' }],
-  organizerContact: [{ required: true, message: '负责人姓名 必填' }],
-  organizerPhone: [
-    { required: true, message: '联系方式 必填' },
-    { 
-      pattern: /^(1[3-9]\d{9}|[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$/, 
-      message: '请输入正确的手机号或邮箱格式' 
-    }
-  ],
-  serviceContent: [{ required: true, message: '服务内容描述 必填' }]
-}
+// 承诺书弹框状态
+const showAgreementModal = ref(false)
+const agreementSigned = ref(true)
+
+// 标记是否为编辑模式（加载已有数据）
+const isEditMode = ref(false)
+
+// 表单数据
+const form = reactive({
+  applicationId: undefined, //申报ID
+  userId: undefined, //姓名ID
+  actualName: undefined, //员工姓名
+  certificateNumber: undefined,
+  firmId: undefined, //执业机构ID
+  departmentName: undefined, //部门名称
+  serviceStart: undefined, //服务开始时间
+  serviceEnd: undefined, //服务结束时间
+  serviceDuration: undefined, //服务时长（小时）
+  positionId: undefined, //职务ID
+  activityCategoryId: undefined, //活动类型
+  activityNameId: undefined, //活动名称
+  recordNo: undefined, //案件编号
+  workloadScore: undefined, //金额
+  serviceType: undefined, //申报服务类型（使用timeType）
+  beneficiaryCount: undefined, //参加人数（受益人数）
+  organizerName: undefined, //组织单位名称
+  organizerContact: undefined, //服务对象负责人/联系人姓名
+  organizerPhone: undefined, //联系方式
+  serviceContent: undefined, //服务内容
+  firmAuditStatus: undefined, //执业机构审核状态
+  firmAuditOpinion: undefined, //执业机构审核意见
+  firmAuditUser: undefined, //执业机构审核人ID
+  firmAuditUserName: undefined, //执业机构审核人姓名
+  firmAuditTime: undefined, //执业机构审核时间
+  associationAuditStatus: undefined, //协会审核状态
+  associationAuditOpinion: undefined, //协会审核意见
+  associationAuditUser: undefined, //协会审核人ID
+  associationAuditUserName: undefined, //协会审核人姓名
+  associationAuditTime: undefined, //协会审核时间
+  recordStatus: undefined, //备案状态：0-未备案，1-已备案
+  recordTime: undefined, //备案时间
+  status: 0, //申报状态：0-草稿，1-待执业机构审核，2-待协会审核，3-审核通过，4-审核不通过
+  updateTime: undefined, //更新时间
+  attachmentIds: undefined, //附件ID列表，逗号分隔
+  firmName: undefined, //执业机构名称
+  activityName: undefined //活动名称
+})
 
-// 日期时间选择器配置（与PC端相同）
-const datePickerProps = {
-  showTime: true,
-  format: 'YYYY-MM-DD HH:00:00',
-  valueFormat: 'YYYY-MM-DD HH:00:00',
-  placeholder: '请选择时间',
-  style: { width: '100%' },
-}
+// 当前选中的活动和活动类型
+const currentActivity = ref({});
+const currentActivityType = ref('');
 
-// 表单数据（与PC端完全一致）
-  const formDefault = {
-      applicationId: undefined, //申报ID
-      userId: undefined, //姓名ID
-      actualName: undefined, //员工姓名
-      certificateNumber: undefined,
-      firmId: undefined, //执业机构ID
-      departmentName: undefined, //部门名称
-      serviceStart: undefined, //服务开始时间
-      serviceEnd: undefined, //服务结束时间
-      serviceDuration: undefined, //服务时长（小时）
-      activityCategoryId: undefined, //活动类型
-      activityNameId: undefined, //活动名称
-      beneficiaryCount: undefined, //参加人数（受益人数）
-      organizerName: undefined, //组织单位名称
-      organizerContact: undefined, //负责人姓名
-      organizerPhone: undefined, //联系方式
-      serviceContent: undefined, //服务内容描述
-      proofMaterials: undefined, //证明材料
-      attachmentIds: undefined, //附件ID列表（逗号隔开）
-      firmAuditStatus: undefined, //执业机构审核状态：0-待审核，1-通过，2-退回
-      recordStatus: undefined, //备案状态：0-未备案，1-已备案
-      updateTime: undefined, //更新时间
-      createTime: undefined, //创建时间
-  };
-
-
-
-const form = reactive({ ...formDefault })
-
-// 监听服务开始时间和结束时间变化，自动计算服务时长（与PC端相同逻辑）
+// 监听服务开始时间和结束时间变化，自动计算服务时长
 watch(
   () => [form.serviceStart, form.serviceEnd],
   ([startTime, endTime]) => {
-    if (startTime && endTime) {
+    // 只有在非编辑模式下或当前活动类型为DICT时才自动计算服务时长
+    if ((!isEditMode.value || currentActivityType.value === 'DICT') && (startTime && endTime)) {
       const start = dayjs(startTime);
       const end = dayjs(endTime);
       if (end.isAfter(start)) {
@@ -372,12 +431,13 @@ watch(
         form.serviceDuration = undefined;
         message.warning('服务结束时间必须晚于开始时间');
       }
-    } else {
+    } else if (!isEditMode.value && (!startTime || !endTime)) {
+      // 只有在非编辑模式下才清空服务时长
       form.serviceDuration = undefined;
     }
   },
   { immediate: true }
-);
+)
 
 // 下拉选项数据
 const positionList = ref([])
@@ -397,11 +457,51 @@ async function getUserInfo() {
     form.certificateNumber = userInfo.licenseNumber || ''
     form.firmId = userInfo.departmentId // 执业机构ID
     form.firmName = userInfo.departmentName || ''
+    
+    // 检查用户签约状态（与PC端逻辑一致）
+    console.log('用户签约状态 agreementSignFlag:', userInfo.agreementSignFlag)
+    agreementSigned.value = userInfo.agreementSignFlag === true
+    showAgreementModal.value = !agreementSigned.value
+    return userInfo.agreementSignFlag
   } catch (error) {
     console.error('获取用户信息失败:', error)
+    return false
   }
 }
 
+// 协议确认 - 签署承诺书
+async function handleAgreementConfirm() {
+  try {
+    await letterApi.add()
+    message.success('承诺书签署成功')
+    showAgreementModal.value = false
+    agreementSigned.value = true
+  } catch (error) {
+    message.error('承诺书签署失败，请重新登录')
+    console.error('承诺书签署失败:', error)
+    // 签署失败，退出登录
+    localStorage.removeItem('token')
+    localStorage.removeItem('userInfo')
+    // 延迟跳转到登录页
+    setTimeout(() => {
+      router.push('/mobile/login')
+    }, 1500)
+  }
+}
+
+// 协议取消
+function handleAgreementCancel() {
+  message.warning('您需要同意平台协议才能使用系统')
+  showAgreementModal.value = false
+  // 退出登录
+  localStorage.removeItem('token')
+  localStorage.removeItem('userInfo')
+  // 延迟跳转到登录页
+  setTimeout(() => {
+    router.push('/mobile/login')
+  }, 1500)
+}
+
 // 获取下拉选项数据
 async function getSelectOptions() {
   try {
@@ -416,7 +516,6 @@ async function getSelectOptions() {
     activityCategoryList.value = categoryRes.data || []
   } catch (error) {
     console.error('获取选项数据失败:', error)
-
   }
 }
 
@@ -424,6 +523,7 @@ async function getSelectOptions() {
 async function onActivityCategoryChange() {
   if (form.activityCategoryId) {
     try {
+      console.log('开始获取活动列表，活动类型ID:', form.activityCategoryId)
       // 根据活动类型获取活动名称列表 - 使用现有的接口
       const activityRes = await goodsApi.queryGoodsList({
         categoryId: form.activityCategoryId,
@@ -431,15 +531,109 @@ async function onActivityCategoryChange() {
         pageNum: 1,
         pageSize: 100 // 获取足够多的数据
       })
-      activityList.value = activityRes.data?.list || []
+      
+      console.log('获取活动列表成功:', activityRes.data?.list?.length || 0, '条记录')
+      // 将活动列表转换为下拉选项格式，保存完整的活动信息
+      activityList.value = activityRes.data?.list?.map(item => ({
+        label: item.goodsName,
+        value: item.goodsId,
+        goodsId: item.goodsId,
+        timeType: item.timeType,
+        ...item
+      })) || []
+      
+      // 保留现有的活动名称ID和活动名称，不要清空
+      if (form.activityNameId) {
+        const activityExists = activityList.value.some(item => item.goodsId === form.activityNameId)
+        console.log('检查活动是否存在:', form.activityNameId, '=>', activityExists)
+        
+        if (!activityExists) {
+          // 如果当前活动不在新列表中，才清空
+          form.activityNameId = ''
+          form.activityName = ''
+          console.log('活动不在新列表中，清空选择')
+        }
+      }
     } catch (error) {
       console.error('获取活动列表失败:', error)
       activityList.value = []
     }
   } else {
     activityList.value = []
+    form.activityNameId = ''
+    form.activityName = ''
   }
-  form.activityNameId = ''
+}
+
+// 监听活动名称变化，更新活动类型和设置默认服务时长
+watch(
+  () => form.activityNameId,
+  (activityNameId, oldActivityNameId) => {
+    console.log('activityNameId变化:', { new: activityNameId, old: oldActivityNameId })
+    console.log('isEditMode:', isEditMode.value)
+    console.log('activityList长度:', activityList.value.length)
+    
+    if (activityNameId) {
+      // 尝试使用严格相等和宽松相等来查找活动
+      const selectedActivity = activityList.value.find(activity => activity.goodsId === activityNameId || activity.goodsId == activityNameId);
+      console.log('找到的活动:', selectedActivity)
+      
+      if (selectedActivity) {
+        currentActivity.value = selectedActivity;
+        currentActivityType.value = selectedActivity.timeType || '';
+        // 将timeType放入serviceType字段中传递给后端
+        form.serviceType = selectedActivity.timeType || '';
+        form.activityName = selectedActivity.goodsName;
+        
+        console.log('更新后的currentActivityType:', currentActivityType.value)
+        console.log('当前form.serviceDuration:', form.serviceDuration)
+        
+        // 根据活动类型设置默认服务时长
+        // 只有在非编辑模式下（即新建模式）才设置默认服务时长
+        if (!isEditMode.value) {
+          if (selectedActivity.timeType === 'TIME') {
+            // 检查活动是否有固定小时数（使用price字段）
+            if (selectedActivity.price) {
+              // 如果价格包含范围（有-），让用户自己填写
+              if (selectedActivity.price.includes('-')) {
+                form.serviceDuration = undefined;
+              } else {
+                // 固定使用活动中的小时数
+                form.serviceDuration = parseFloat(selectedActivity.price);
+              }
+            } else {
+              // 默认值
+              form.serviceDuration = 25;
+            }
+          } else if (selectedActivity.timeType === 'AMOUT') {
+            form.serviceDuration = undefined;
+          } else if (selectedActivity.timeType === 'DICT') {
+            // DICT类型：清空服务时长，让用户通过选择时间或手动填写
+            form.serviceDuration = undefined;
+          }
+          console.log('设置后的form.serviceDuration:', form.serviceDuration)
+        } else {
+          console.log('编辑模式下，保留原有的form.serviceDuration:', form.serviceDuration)
+        }
+        
+        console.log('活动名称变化，更新后的活动类型:', currentActivityType.value);
+      } else {
+        console.log('未找到对应的活动，activityList:', activityList.value)
+      }
+    } else {
+      currentActivity.value = {};
+      currentActivityType.value = '';
+      form.serviceType = '';
+      form.activityName = '';
+      console.log('activityNameId为空，重置所有值')
+    }
+  },
+  { immediate: true }
+);
+
+// 活动名称改变事件
+function onActivityNameChange() {
+  // 由watch监听器处理
 }
 
 // 文件上传处理
@@ -494,6 +688,107 @@ function removeFile(fileId) {
 
 // 保存草稿
 async function handleSave() {
+  // 表单验证
+  if (!form.positionId) {
+    message.error('请选择职务')
+    return
+  }
+  
+  if (!form.activityCategoryId) {
+    message.error('请选择活动类型')
+    return
+  }
+  
+  if (!form.activityNameId) {
+    message.error('请选择活动名称')
+    return
+  }
+  
+  // 根据活动类型验证不同字段
+  if (currentActivityType.value === 'DICT' || !currentActivityType.value) {
+    // DICT类型：验证服务开始时间、服务结束时间和服务时长
+    if (!form.serviceStart) {
+      message.error('请选择服务开始时间')
+      return
+    }
+    
+    if (!form.serviceEnd) {
+      message.error('请选择服务结束时间')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+  } else if (currentActivityType.value === 'TIME') {
+    // TIME类型：验证案件编号和服务时长
+    if (!form.recordNo) {
+      message.error('请填写案件编号')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+    
+    // 如果活动有小时范围，验证用户填写的时长是否在范围内
+    if (currentActivity.value.price && currentActivity.value.price.includes('-')) {
+      const [min, max] = currentActivity.value.price.split('-').map(Number);
+      if (form.serviceDuration < min || form.serviceDuration > max) {
+        message.error(`你填写的此类公益活动时长超出该活动要求的${currentActivity.value.price}小时，请按规范要求填报具体时长`)
+        return
+      }
+    }
+  } else if (currentActivityType.value === 'AMOUT') {
+    // AMOUT类型：验证金额和服务时长
+    if (!form.workloadScore) {
+      message.error('请填写金额')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+    
+    if (form.serviceDuration < 100 || form.serviceDuration > 200) {
+      message.error('你填写的此类公益活动时长超出该活动要求的100-200小时，请按规范要求填报具体时长')
+      return
+    }
+  }
+  
+  if (!form.beneficiaryCount) {
+    message.error('请填写参加人数（受益人数）')
+    return
+  }
+  
+  if (!form.organizerName) {
+    message.error('请填写组织单位名称')
+    return
+  }
+  
+  if (!form.organizerContact) {
+    message.error('请填写服务对象负责人/联系人姓名')
+    return
+  }
+  
+  if (!form.organizerPhone) {
+    message.error('请填写联系方式')
+    return
+  }
+  
+  if (!form.serviceContent) {
+    message.error('请填写服务内容描述')
+    return
+  }
+  
+  if (uploadedFiles.value.length === 0) {
+    message.error('请上传证明材料')
+    return
+  }
+  
   loading.value = true
   try {
     // 1. 获取已上传文件的ID列表
@@ -516,43 +811,108 @@ async function handleSave() {
       message.error(res.msg || '保存失败')
     }
   } catch (error) {
-    console.error('保存失败:', error)
-    message.error('保存失败，请稍后重试')
+    console.error('保存草稿失败:', error)
+    message.error('网络错误，请稍后重试')
   } finally {
     loading.value = false
   }
 }
 
-// 提交申报
+// 提交
 async function handleSubmit() {
-  // 表单验证（与PC端相同的验证逻辑）
+  // 表单验证
   if (!form.positionId) {
     message.error('请选择职务')
     return
   }
   
-  if (!form.serviceStart) {
-    message.error('请选择服务开始时间')
+  if (!form.activityCategoryId) {
+    message.error('请选择活动类型')
     return
   }
   
-  if (!form.serviceEnd) {
-    message.error('请选择服务结束时间')
+  if (!form.activityNameId) {
+    message.error('请选择活动名称')
     return
   }
   
-  if (!form.activityCategoryId) {
-    message.error('请选择活动类型')
+  // 根据活动类型验证不同字段
+  if (currentActivityType.value === 'DICT' || !currentActivityType.value) {
+    // DICT类型：验证服务开始时间、服务结束时间和服务时长
+    if (!form.serviceStart) {
+      message.error('请选择服务开始时间')
+      return
+    }
+    
+    if (!form.serviceEnd) {
+      message.error('请选择服务结束时间')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+  } else if (currentActivityType.value === 'TIME') {
+    // TIME类型：验证案件编号和服务时长
+    if (!form.recordNo) {
+      message.error('请填写案件编号')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+    
+    // 如果活动有小时范围，验证用户填写的时长是否在范围内
+    if (currentActivity.value.price && currentActivity.value.price.includes('-')) {
+      const [min, max] = currentActivity.value.price.split('-').map(Number);
+      if (form.serviceDuration < min || form.serviceDuration > max) {
+        message.error(`你填写的此类公益活动时长超出该活动要求的${currentActivity.value.price}小时，请按规范要求填报具体时长`)
+        return
+      }
+    }
+  } else if (currentActivityType.value === 'AMOUT') {
+    // AMOUT类型：验证金额和服务时长
+    if (!form.workloadScore) {
+      message.error('请填写金额')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+    
+    if (form.serviceDuration < 100 || form.serviceDuration > 200) {
+      message.error('你填写的此类公益活动时长超出该活动要求的100-200小时，请按规范要求填报具体时长')
+      return
+    }
+  }
+  
+  if (!form.beneficiaryCount) {
+    message.error('请填写参加人数（受益人数）')
     return
   }
   
-  if (!form.activityNameId) {
-    message.error('请选择活动名称')
+  if (!form.organizerName) {
+    message.error('请填写组织单位名称')
+    return
+  }
+  
+  if (!form.organizerContact) {
+    message.error('请填写服务对象负责人/联系人姓名')
+    return
+  }
+  
+  if (!form.organizerPhone) {
+    message.error('请填写联系方式')
     return
   }
   
   if (!form.serviceContent) {
-    message.error('请输入服务内容描述')
+    message.error('请填写服务内容描述')
     return
   }
   
@@ -562,43 +922,27 @@ async function handleSubmit() {
   }
   
   loading.value = true
-  
   try {
-    // 1. 直接使用已上传文件的ID集合（文件上传时已经调用过接口）
+    // 1. 获取已上传文件的ID列表
     const fileIds = uploadedFiles.value.map(file => file.id).filter(id => id)
-    console.log('提交申报，文件ID集合:', fileIds)
-    
-    // 2. 将文件ID作为附件ID传递给申报接口
-    const submitData = {
-      ...form,
-      attachmentIds: fileIds.join(','), // 将文件ID列表转换为逗号分隔的字符串
-      status: 1 // 提交状态
-    }
-    
-    // 确保必要的ID字段存在（与PC端逻辑一致）
-    if (!submitData.userId) {
-      submitData.userId = form.userId
-    }
-    if (!submitData.firmId) {
-      submitData.firmId = form.firmId
-    }
     
-    console.log('提交数据:', submitData)
+    console.log('提交申报，文件ID列表:', fileIds)
     
-    // 3. 调用提交接口（使用正确的API变量）
-    const res = await serviceApplicationsApi.addSubmit(submitData)
+    // 2. 调用提交接口 - 使用现有的接口
+    const res = await serviceApplicationsApi.submit({
+      ...form,
+      attachmentIds: fileIds.join(',') // 将文件ID列表转换为逗号分隔的字符串
+    })
     
     if (res.code === 0) {
-      message.success('申报提交成功')
-      setTimeout(() => {
-        router.push('/mobile/service')
-      }, 1000)
+      message.success('提交成功')
+      router.push('/mobile/service')
     } else {
       message.error(res.msg || '提交失败')
     }
   } catch (error) {
     console.error('提交失败:', error)
-    message.error(error.message || '提交失败，请稍后重试')
+    message.error('网络错误，请稍后重试')
   } finally {
     loading.value = false
   }
@@ -609,27 +953,88 @@ function handleBack() {
   router.back()
 }
 
-onMounted(() => {
-  getUserInfo()
-  getSelectOptions()
-  
-  // 检查是否有applicationId参数（编辑草稿模式）
-  const applicationId = route.query.applicationId
-  if (applicationId) {
-    console.log('编辑草稿模式，applicationId:', applicationId)
-    loadDraftData(applicationId)
+// 根据attachmentIds获取文件列表
+async function getFileListByAttachmentIds(attachmentIds) {
+  try {
+    if (!attachmentIds || !attachmentIds.trim()) {
+      uploadedFiles.value = []
+      return
+    }
+    
+    console.log('开始获取文件列表，attachmentIds:', attachmentIds)
+    
+    // 直接传递attachmentIds字符串，后端接口接收字符串参数
+    const result = await fileApi.getFileList(attachmentIds)
+    console.log('文件列表API返回结果:', result)
+    
+    if (result.code === 0 && result.data && result.data.length > 0) {
+      // 将返回的文件列表转换为前端需要的格式
+      uploadedFiles.value = result.data.map(file => ({
+        id: file.fileId,
+        name: file.fileName,
+        fileId: file.fileId,
+        status: 'success'
+      }))
+      console.log('文件列表加载成功，文件数量:', uploadedFiles.value.length)
+      console.log('文件详情:', uploadedFiles.value)
+    } else {
+      uploadedFiles.value = []
+      console.log('文件列表为空或返回错误')
+    }
+  } catch (error) {
+    console.error('获取文件列表失败:', error)
+    uploadedFiles.value = []
+    message.error('获取文件列表失败')
   }
-})
+}
 
 // 加载草稿数据
 async function loadDraftData(applicationId) {
   loading.value = true
+  isEditMode.value = true // 标记为编辑模式
   try {
     const res = await serviceApplicationsApi.queryDetail(applicationId)
     if (res.code === 0) {
       // 将草稿数据合并到表单中
       Object.assign(form, res.data)
       console.log('草稿数据加载成功:', res.data)
+      console.log('草稿数据 - 活动类型ID:', form.activityCategoryId)
+      console.log('草稿数据 - 活动名称ID:', form.activityNameId)
+      console.log('草稿数据 - 活动名称:', form.activityName)
+      
+      // 确保活动类型列表已加载
+      await getSelectOptions()
+      
+      // 如果有活动类型ID，获取对应的活动列表
+      if (form.activityCategoryId) {
+        console.log('草稿数据有活动类型ID，开始获取活动列表:', form.activityCategoryId)
+        await onActivityCategoryChange()
+        
+        // 获取活动列表后，根据活动名称ID更新currentActivity和currentActivityType
+        if (form.activityNameId && activityList.value.length > 0) {
+          // 尝试使用严格相等和宽松相等来查找活动
+          const selectedActivity = activityList.value.find(activity => activity.goodsId === form.activityNameId || activity.goodsId == form.activityNameId)
+          if (selectedActivity) {
+            currentActivity.value = selectedActivity
+            currentActivityType.value = selectedActivity.timeType || ''
+            form.serviceType = selectedActivity.timeType || ''
+            console.log('更新后的活动类型:', currentActivityType.value)
+            console.log('更新后的活动信息:', currentActivity.value)
+            console.log('表单中的服务时长:', form.serviceDuration)
+            console.log('表单中的案件编号:', form.recordNo)
+          } else {
+            console.log('未找到对应的活动，活动名称ID:', form.activityNameId)
+            console.log('活动列表:', activityList.value)
+          }
+        } else {
+          console.log('活动名称ID或活动列表为空:', form.activityNameId, activityList.value.length)
+        }
+        
+        // 强制更新一次表单，确保模板能够正确渲染
+        // 等待Vue的响应式系统更新完成
+        await nextTick()
+        console.log('模板渲染后的currentActivityType:', currentActivityType.value)
+      }
       
       // 如果有附件ID，则加载文件列表
       if (res.data.attachmentIds) {
@@ -647,43 +1052,18 @@ async function loadDraftData(applicationId) {
   }
 }
 
-  // 根据attachmentIds获取文件列表
-  async function getFileListByAttachmentIds(attachmentIds) {
-    try {
-      if (!attachmentIds || !attachmentIds.trim()) {
-        uploadedFiles.value = []
-        return
-      }
-      
-      console.log('开始获取文件列表，attachmentIds:', attachmentIds)
-      
-      // 直接传递attachmentIds字符串，后端接口接收字符串参数
-      const result = await fileApi.getFileList(attachmentIds)
-      console.log('文件列表API返回结果:', result)
-      
-      if (result.code === 0 && result.data && result.data.length > 0) {
-        // 将文件信息转换为移动端需要的格式
-        uploadedFiles.value = result.data.map(file => ({
-          id: file.id,
-          name: file.fileName || file.name || '未命名文件',
-          fileName: file.fileName || file.name || '未命名文件',
-          fileUrl: file.fileUrl,
-          fileSize: file.fileSize,
-          uploadTime: file.uploadTime
-        }))
-        
-        console.log('文件列表加载成功，文件数量:', uploadedFiles.value.length)
-        console.log('文件详情:', uploadedFiles.value)
-      } else {
-        uploadedFiles.value = []
-        console.log('文件列表为空或获取失败')
-      }
-    } catch (error) {
-      console.error('获取文件列表失败:', error)
-      uploadedFiles.value = []
-      message.error('获取文件列表失败')
-    }
+onMounted(() => {
+  isEditMode.value = false // 重置为新建模式
+  getUserInfo()
+  getSelectOptions()
+  
+  // 检查是否有applicationId参数（编辑草稿模式）
+  const applicationId = route.query.applicationId
+  if (applicationId) {
+    console.log('编辑草稿模式，applicationId:', applicationId)
+    loadDraftData(applicationId)
   }
+})
 </script>
 
 <style scoped>
@@ -693,13 +1073,6 @@ async function loadDraftData(applicationId) {
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
 }
 
-/* 必填字段红星样式 */
-.form-label.required::after {
-  content: '*';
-  color: #ff4d4f;
-  margin-left: 4px;
-}
-
 /* 头部导航 */
 .page-header {
   display: flex;
@@ -735,47 +1108,7 @@ async function loadDraftData(applicationId) {
   flex: 1;
   text-align: center;
 }
-/* 表单日期选择器样式 */
-.form-date-picker {
-  width: 100% !important;
-}
-
-.form-date-picker .ant-picker {
-  width: 100% !important;
-  border: 1px solid #d9d9d9 !important;
-  border-radius: 8px !important;
-  padding: 12px !important;
-  font-size: 14px !important;
-  background: white !important;
-  transition: all 0.3s !important;
-  box-sizing: border-box !important;
-}
-
-.form-date-picker .ant-picker:hover {
-  border-color: #40a9ff !important;
-}
-
-.form-date-picker .ant-picker:focus,
-.form-date-picker .ant-picker-focused {
-  border-color: #1890ff !important;
-  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2) !important;
-}
-
-.form-date-picker .ant-picker-input > input {
-  font-size: 14px !important;
-  height: auto !important;
-}
-
-.form-date-picker .ant-picker-input > input::placeholder {
-  color: #bfbfbf !important;
-}
 
-/* 禁用状态样式 */
-.form-date-picker .ant-picker-disabled {
-  background-color: #f5f5f5 !important;
-  color: #999 !important;
-  cursor: not-allowed !important;
-}
 /* 表单内容 */
 .form-content {
   padding: 16px;
@@ -792,98 +1125,78 @@ async function loadDraftData(applicationId) {
 }
 
 .section-title {
-  font-size: 16px;
+  font-size: 14px;
   font-weight: 600;
-  color: #1890ff;
+  color: #333;
   margin-bottom: 16px;
   padding-bottom: 8px;
-  border-bottom: 2px solid #e8f4ff;
-  position: relative;
-}
-
-.section-title::before {
-  content: '';
-  position: absolute;
-  left: 0;
-  bottom: -2px;
-  width: 60px;
-  height: 2px;
-  background: #1890ff;
-  border-radius: 1px;
+  border-bottom: 1px solid #f0f0f0;
 }
 
 .form-item {
-  margin-bottom: 20px;
+  margin-bottom: 16px;
 }
 
 .form-label {
   display: block;
   font-size: 14px;
+  color: #555;
+  margin-bottom: 8px;
   font-weight: 500;
-  color: #333;
-  margin-bottom: 6px;
-  line-height: 1.4;
 }
 
-.label-tip {
-  color: #999;
-  font-size: 12px;
-  font-weight: normal;
+.form-label.required::after {
+  content: '*';
+  color: #ff4d4f;
   margin-left: 4px;
 }
 
-.form-input, .form-select, .form-textarea {
+.form-input,
+.form-select,
+.form-textarea {
   width: 100%;
-  padding: 12px;
-  border: 1px solid #d9d9d9;
-  border-radius: 8px;
+  padding: 10px 12px;
   font-size: 14px;
-  background: white;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
   transition: all 0.3s;
   box-sizing: border-box;
 }
 
-.form-input:focus, .form-select:focus, .form-textarea:focus {
+.form-input:focus,
+.form-select:focus,
+.form-textarea:focus {
   outline: none;
   border-color: #1890ff;
   box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
 }
 
-.form-input:disabled, .form-select:disabled, .form-textarea:disabled {
-  background-color: #f5f5f5;
-  color: #999;
-  cursor: not-allowed;
-}
-
 .form-textarea {
   resize: vertical;
   min-height: 80px;
-  line-height: 1.5;
 }
 
 .form-tip {
   font-size: 12px;
-  color: #ff4d4f;
-  margin-top: 4px;
-  line-height: 1.4;
+  color: #999;
+  margin-top: 8px;
 }
 
-/* 文件上传 */
 .file-input {
+  display: block;
   width: 100%;
-  padding: 12px;
-  border: 2px dashed #d9d9d9;
-  border-radius: 8px;
-  background: #fafafa;
-  text-align: center;
+  padding: 10px;
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
   cursor: pointer;
+  background-color: #fafafa;
   transition: all 0.3s;
   margin-bottom: 12px;
 }
 
 .file-input:hover {
   border-color: #1890ff;
-  background: #f0f8ff;
+  background-color: #e6f7ff;
 }
 
 .file-input:disabled {
@@ -892,7 +1205,7 @@ async function loadDraftData(applicationId) {
 }
 
 .file-list {
-  margin-top: 8px;
+  margin-top: 12px;
 }
 
 .file-item {
@@ -900,65 +1213,61 @@ async function loadDraftData(applicationId) {
   align-items: center;
   justify-content: space-between;
   padding: 8px 12px;
-  background: #f8f9fa;
+  background-color: #fafafa;
+  border: 1px solid #e8e8e8;
   border-radius: 6px;
-  margin-bottom: 6px;
-  border-left: 3px solid #1890ff;
+  margin-bottom: 8px;
 }
 
 .file-name {
-  font-size: 13px;
-  color: #333;
+  font-size: 14px;
+  color: #555;
   flex: 1;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  margin-right: 12px;
 }
 
 .remove-btn {
-  background: #ff4d4f;
+  background-color: #ff4d4f;
   color: white;
   border: none;
-  padding: 4px 8px;
+  padding: 4px 12px;
   border-radius: 4px;
   font-size: 12px;
   cursor: pointer;
   transition: background-color 0.3s;
 }
 
-.remove-btn:hover:not(:disabled) {
-  background: #ff7875;
-}
-
-.remove-btn:disabled {
-  background: #ccc;
-  cursor: not-allowed;
+.remove-btn:hover {
+  background-color: #ff7875;
 }
 
 /* 操作按钮 */
 .action-buttons {
+  display: flex;
+  gap: 12px;
+  padding: 16px;
+  background-color: white;
   position: fixed;
   bottom: 0;
   left: 0;
   right: 0;
-  background: white;
-  padding: 12px 16px;
-  display: flex;
-  gap: 12px;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.08);
   border-top: 1px solid #e8e8e8;
-  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.1);
+  z-index: 100;
 }
 
 .btn {
   flex: 1;
-  padding: 12px 16px;
-  border: none;
-  border-radius: 8px;
+  padding: 12px;
   font-size: 16px;
   font-weight: 500;
+  border: none;
+  border-radius: 6px;
   cursor: pointer;
   transition: all 0.3s;
-  text-align: center;
 }
 
 .btn-primary {
@@ -966,100 +1275,63 @@ async function loadDraftData(applicationId) {
   color: white;
 }
 
-.btn-primary:hover:not(:disabled) {
+.btn-primary:hover {
+  opacity: 0.9;
   transform: translateY(-1px);
-  box-shadow: 0 4px 12px rgba(24, 144, 255, 0.4);
+  box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
+}
+
+.btn-primary:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+  transform: none;
+  box-shadow: none;
 }
 
 .btn-secondary {
-  background: white;
-  color: #1890ff;
-  border: 1px solid #1890ff;
+  background-color: #f0f0f0;
+  color: #666;
+  border: 1px solid #d9d9d9;
 }
 
-.btn-secondary:hover:not(:disabled) {
-  background: #f0f8ff;
+.btn-secondary:hover {
+  background-color: #e8e8e8;
   transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
 }
 
-.btn:disabled {
+.btn-secondary:disabled {
   opacity: 0.6;
   cursor: not-allowed;
-  transform: none !important;
-  box-shadow: none !important;
+  transform: none;
+  box-shadow: none;
 }
 
-/* 加载状态 */
-.loading-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 1000;
-}
-
-.loading-spinner {
-  background: white;
-  padding: 20px 24px;
-  border-radius: 8px;
-  font-size: 14px;
-  color: #333;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-}
-
-/* 响应式调整 */
+/* 响应式设计 */
 @media (max-width: 375px) {
   .form-content {
     padding: 12px;
-    padding-bottom: 80px;
+    padding-bottom: 70px;
   }
   
-  .form-section {
-    padding: 12px;
+  .section-title {
+    font-size: 13px;
   }
   
-  .action-buttons {
-    padding: 10px 12px;
+  .form-label {
+    font-size: 13px;
   }
-}
-
-/* 输入框动画效果 */
-.form-input, .form-select, .form-textarea {
-  animation: fadeInUp 0.3s ease-out;
-}
-
-@keyframes fadeInUp {
-  from {
-    opacity: 0;
-    transform: translateY(10px);
+  
+  .form-input,
+  .form-select,
+  .form-textarea {
+    padding: 8px 10px;
+    font-size: 13px;
   }
-  to {
-    opacity: 1;
-    transform: translateY(0);
+  
+  .btn {
+    padding: 10px;
+    font-size: 14px;
   }
 }
-
-/* 滚动条样式 */
-::-webkit-scrollbar {
-  width: 4px;
-}
-
-::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  border-radius: 2px;
-}
-
-::-webkit-scrollbar-thumb {
-  background: #c1c1c1;
-  border-radius: 2px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: #a8a8a8;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/mobile/service/detail.vue b/src/views/mobile/service/detail.vue
index e596f02..9570970 100644
--- a/src/views/mobile/service/detail.vue
+++ b/src/views/mobile/service/detail.vue
@@ -88,50 +88,12 @@
       <div class="form-section">
         <div class="section-title">二、服务信息</div>
         
-        <!-- 服务开始时间 -->
-        <div class="form-item">
-          <label class="form-label">服务开始时间</label>
-          <input 
-            v-model="form.serviceStart" 
-            class="form-input" 
-            placeholder="服务开始时间"
-            :readonly="readonlyMode"
-          />
-        </div>
-
-        <!-- 服务结束时间 -->
-        <div class="form-item">
-          <label class="form-label">服务结束时间</label>
-          <input 
-            v-model="form.serviceEnd" 
-            class="form-input" 
-            placeholder="服务结束时间"
-            :readonly="readonlyMode"
-          />
-        </div>
-
-        <!-- 服务时长 -->
-        <div class="form-item">
-          <label class="form-label">服务时长（小时）</label>
-          <input 
-            v-model="form.serviceDuration" 
-            class="form-input" 
-            placeholder="服务时长（小时）"
-            :readonly="readonlyMode"
-          />
-        </div>
-      </div>
-
-      <!-- 活动信息 -->
-      <div class="form-section">
-        <div class="section-title">三、活动信息</div>
-        
         <!-- 活动类型 -->
         <div class="form-item">
           <label class="form-label">活动类型</label>
           <template v-if="readonlyMode">
             <input 
-              v-model="form.activityCategoryName" 
+              v-model="form.activityCategory"
               class="form-input" 
               placeholder="活动类型"
               readonly
@@ -152,6 +114,10 @@
                 {{ category.categoryName }}
               </option>
             </select>
+            <!-- 编辑模式下显示当前活动类型名称 -->
+            <div v-if="form.activityCategoryId && form.activityCategory" class="form-tip">
+              当前活动类型：{{ form.activityCategory }}
+            </div>
           </template>
         </div>
 
@@ -159,14 +125,16 @@
         <div class="form-item">
           <label class="form-label">活动名称</label>
           <template v-if="readonlyMode">
+            <!-- 只读模式：直接显示后端返回的活动名称 -->
             <input 
-              v-model="form.activityName" 
+              v-model="form.activityName"
               class="form-input" 
               placeholder="活动名称"
               readonly
             />
           </template>
           <template v-else>
+            <!-- 编辑模式：使用下拉选择框 -->
             <select 
               v-model="form.activityNameId" 
               class="form-select"
@@ -183,6 +151,122 @@
             </select>
           </template>
         </div>
+        
+        <!-- dict类型：显示服务时长、服务开始时间和服务结束时间 -->
+        <template v-if="activityType === 'DICT'">
+          <!-- 服务开始时间 -->
+          <div class="form-item">
+            <label class="form-label">服务开始时间</label>
+            <a-date-picker 
+              show-time 
+              format="YYYY-MM-DD HH:00:00" 
+              valueFormat="YYYY-MM-DD HH:00:00" 
+              v-model:value="form.serviceStart" 
+              class="form-input" 
+              placeholder="服务开始时间"
+              :disabled="readonlyMode"
+            />
+          </div>
+
+          <!-- 服务结束时间 -->
+          <div class="form-item">
+            <label class="form-label">服务结束时间</label>
+            <a-date-picker 
+              show-time 
+              format="YYYY-MM-DD HH:00:00" 
+              valueFormat="YYYY-MM-DD HH:00:00" 
+              v-model:value="form.serviceEnd" 
+              class="form-input" 
+              placeholder="服务结束时间"
+              :disabled="readonlyMode"
+            />
+          </div>
+
+          <!-- 服务时长 -->
+          <div class="form-item">
+            <label class="form-label">
+              服务时长（小时）
+              <span style="color: #999; font-size: 12px; margin-left: 4px;">可通过时间选择也可手动填写</span>
+            </label>
+            <input 
+              v-model="form.serviceDuration" 
+              class="form-input" 
+              placeholder="服务时长（小时）"
+              :readonly="readonlyMode"
+            />
+            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:不足30分钟（不含本数）的，不计入时长，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
+          </div>
+        </template>
+        
+        <!-- time类型：显示案件编号输入框，没有服务开始时间和服务结束时间 -->
+        <template v-else-if="activityType === 'TIME'">
+          <!-- 案件编号 -->
+          <div class="form-item">
+            <label class="form-label">案件编号</label>
+            <input 
+              v-model="form.recordNo" 
+              class="form-input" 
+              placeholder="请输入案件编号"
+              :readonly="readonlyMode"
+            />
+          </div>
+          
+          <!-- 服务时长 -->
+          <div class="form-item">
+            <label class="form-label">
+              服务时长（小时）
+              <span v-if="selectedActivity.price && selectedActivity.price.includes('-')" style="color: #999; font-size: 12px; margin-left: 4px;">请在{{ selectedActivity.price }}范围内填写</span>
+            </label>
+            <input 
+              v-model="form.serviceDuration" 
+              class="form-input" 
+              placeholder="服务时长（小时）"
+              :readonly="readonlyMode || (selectedActivity.price && !selectedActivity.price.includes('-'))"
+            />
+          </div>
+        </template>
+        
+        <!-- amount类型：显示金额输入框 -->
+        <template v-else-if="activityType === 'AMOUT'">
+          <!-- 金额 -->
+          <div class="form-item">
+            <label class="form-label">金额</label>
+            <input 
+              type="number"
+              step="0.01"
+              v-model="form.workloadScore" 
+              class="form-input" 
+              placeholder="请输入金额"
+              :readonly="readonlyMode"
+            />
+          </div>
+          
+          <!-- 服务时长 -->
+          <div class="form-item">
+            <label class="form-label">服务时长（小时）</label>
+            <input 
+              v-model="form.serviceDuration" 
+              class="form-input" 
+              placeholder="服务时长（小时）"
+              :readonly="readonlyMode"
+            />
+            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:服务时长必须在100-200小时范围内</div>
+          </div>
+        </template>
+        
+        <!-- 加载中状态 -->
+        <template v-else>
+          <div class="form-item">
+            <div style="text-align: center; padding: 20px; color: #999;">
+              加载中...
+            </div>
+          </div>
+        </template>
+      </div>
+
+      <!-- 活动信息 -->
+      <div class="form-section">
+        <div class="section-title">三、活动信息</div>
 
         <!-- 参加人数（受益人数） -->
         <div class="form-item">
@@ -253,7 +337,10 @@
         
         <!-- 文件列表 -->
         <div class="form-item">
-          <label class="form-label">证明材料</label>
+          <label class="form-label">
+            证明材料
+            <span style="font-size: 12px; color: #f00d0d; margin-left: 4px;"> 注:（请上传活动方案、活动记录、照片、新闻报道等材料）支持图片(JPG/PNG)、文档(PDF/Word/PPT)格式，单文件最大10MB，最多上传5个文件</span>
+          </label>
           <div class="file-list" v-if="uploadedFiles.length > 0">
             <div 
               v-for="file in uploadedFiles" 
@@ -312,25 +399,40 @@
       </div>
     </div>
   </div>
+
+  <!-- 承诺书弹框 -->
+  <AgreementModal 
+    v-if="showAgreementModal" 
+    :visible="showAgreementModal"
+    @confirm="handleAgreementConfirm"
+    @cancel="handleAgreementCancel"
+  />
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, watch, computed } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { serviceApplicationsApi } from '/@/api/business/service-applications/service-applications-api'
 import { message } from 'ant-design-vue'
+import dayjs from 'dayjs'
 import { loginApi } from '/@/api/system/login-api'
 import { positionApi } from '/@/api/system/position-api'
 import { categoryApi } from '/@/api/business/category/category-api'
 import { goodsApi } from '/@/api/business/goods/goods-api'
 import { fileApi } from '/@/api/support/file-api'
+import { letterApi } from '/@/api/business/letter/letter-api'
 import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const'
+import AgreementModal from '../components/agreement-modal.vue'
 
 const router = useRouter()
 const route = useRoute()
 const loading = ref(false)
 const readonlyMode = ref(true) // 默认只读模式
 
+// 承诺书弹框状态
+const showAgreementModal = ref(false)
+const agreementSigned = ref(true)
+
 // 表单数据
 const form = reactive({
   applicationId: undefined, //申报ID
@@ -347,6 +449,11 @@ const form = reactive({
   activityCategoryId: '', //活动类型ID
   activityNameId: '', //活动名称ID
   activityName: '', //活动名称
+  activityCategory: '', //活动类型名称（后端返回）
+  activityCategoryName: '', //活动类型名称（兼容字段）
+  recordNo: '', //案件编号
+  workloadScore: null, //金额
+  serviceType: '', //申报服务类型（使用timeType）
   beneficiaryCount: null, //参加人数（受益人数）
   organizerName: '', //组织单位名称
   organizerContact: '', //负责人姓名
@@ -359,12 +466,139 @@ const form = reactive({
   auditRemark: '' //审核备注
 })
 
+// 当前选中的活动和活动类型
+const currentActivity = ref({});
+const currentActivityType = ref('');
+
+// 计算属性：获取当前活动类型
+const activityType = computed(() => {
+  return currentActivityType.value || '';
+});
+
+// 计算属性：获取当前活动
+const selectedActivity = computed(() => {
+  return currentActivity.value || {};
+});
+
+// 监听服务开始时间和结束时间变化，自动计算服务时长
+watch(
+  () => [form.serviceStart, form.serviceEnd],
+  ([startTime, endTime]) => {
+    if (startTime && endTime) {
+      const start = dayjs(startTime);
+      const end = dayjs(endTime);
+      if (end.isAfter(start)) {
+        // 计算时间差（分钟），然后转换为小时（保留2位小数）
+        const durationMinutes = end.diff(start, 'minute');
+        form.serviceDuration = parseFloat((durationMinutes / 60).toFixed(2));
+      } else {
+        form.serviceDuration = undefined;
+        message.warning('服务结束时间必须晚于开始时间');
+      }
+    } else {
+      form.serviceDuration = undefined;
+    }
+  },
+  { immediate: true }
+)
+
+// 监听活动名称变化，更新活动类型和设置默认服务时长
+watch(
+  () => form.activityNameId,
+  (activityNameId) => {
+    if (activityNameId) {
+      const selectedActivity = activityList.value.find(activity => activity.goodsId === activityNameId);
+      if (selectedActivity) {
+        currentActivity.value = selectedActivity;
+        currentActivityType.value = selectedActivity.timeType || '';
+        // 将timeType放入serviceType字段中传递给后端
+        form.serviceType = selectedActivity.timeType || '';
+        
+        // 根据活动类型设置默认服务时长
+        if (selectedActivity.timeType === 'TIME') {
+          // 检查活动是否有固定小时数（使用price字段）
+          if (selectedActivity.price) {
+            // 如果价格包含范围（有-），让用户自己填写
+            if (selectedActivity.price.includes('-')) {
+              form.serviceDuration = undefined;
+            } else {
+              // 固定使用活动中的小时数
+              form.serviceDuration = parseFloat(selectedActivity.price);
+            }
+          } else {
+            // 默认值
+            form.serviceDuration = 25;
+          }
+        } else if (selectedActivity.timeType === 'AMOUT') {
+          form.serviceDuration = undefined;
+        } else if (selectedActivity.timeType === 'DICT') {
+          // DICT类型：清空服务时长，让用户通过选择时间或手动填写
+          form.serviceDuration = undefined;
+        }
+      }
+    } else {
+      currentActivity.value = {};
+      currentActivityType.value = '';
+      form.serviceType = '';
+    }
+  },
+  { immediate: true }
+)
+
 // 下拉选项数据
 const positionList = ref([])
 const activityCategoryList = ref([])
 const activityList = ref([])
 const uploadedFiles = ref([])
 
+// 获取用户信息并检查签约状态
+async function getUserInfo() {
+  try {
+    const res = await loginApi.getLoginInfo()
+    const userInfo = res.data
+    
+    // 检查用户签约状态
+    console.log('用户签约状态 agreementSignFlag:', userInfo.agreementSignFlag)
+    agreementSigned.value = userInfo.agreementSignFlag === true
+    showAgreementModal.value = !agreementSigned.value
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
+  }
+}
+
+// 协议确认 - 签署承诺书
+async function handleAgreementConfirm() {
+  try {
+    await letterApi.add()
+    message.success('承诺书签署成功')
+    showAgreementModal.value = false
+    agreementSigned.value = true
+  } catch (error) {
+    message.error('承诺书签署失败，请重新登录')
+    console.error('承诺书签署失败:', error)
+    // 签署失败，退出登录
+    localStorage.removeItem('token')
+    localStorage.removeItem('userInfo')
+    // 延迟跳转到登录页
+    setTimeout(() => {
+      router.push('/mobile/login')
+    }, 1500)
+  }
+}
+
+// 协议取消
+function handleAgreementCancel() {
+  message.warning('您需要同意平台协议才能使用系统')
+  showAgreementModal.value = false
+  // 退出登录
+  localStorage.removeItem('token')
+  localStorage.removeItem('userInfo')
+  // 延迟跳转到登录页
+  setTimeout(() => {
+    router.push('/mobile/login')
+  }, 1500)
+}
+
 // 获取申报详情
 async function getDetail() {
   const applicationId = route.query.applicationId
@@ -376,26 +610,86 @@ async function getDetail() {
 
   loading.value = true
   try {
+    // 先获取用户信息，检查签约状态
+    await getUserInfo()
+    
     const res = await serviceApplicationsApi.queryDetail(applicationId)
     if (res.code === 0) {
+      console.log('后端返回数据:', res.data)
+      console.log('后端返回的活动名称ID:', res.data.activityNameId)
+      console.log('后端返回的活动名称:', res.data.activityName)
+      console.log('后端返回的活动类型ID:', res.data.activityCategoryId)
+      console.log('后端返回的活动类型:', res.data.activityCategory)
+      
       Object.assign(form, res.data)
       
+      console.log('赋值后表单数据:', form)
+      console.log('赋值后的活动名称ID:', form.activityNameId)
+      console.log('赋值后的活动名称:', form.activityName)
+      console.log('赋值后的活动类型ID:', form.activityCategoryId)
+      console.log('赋值后的活动类型:', form.activityCategory)
+      
       // 根据申报状态设置编辑模式
       // status=0：草稿状态，可以编辑
       // status>=1：已提交状态，只能查看
       readonlyMode.value = form.status !== 0
       
-      // 如果是草稿状态，获取下拉选项数据
-      if (!readonlyMode.value) {
-        await getSelectOptions()
+      console.log('当前模式:', readonlyMode.value ? '只读模式' : '编辑模式')
+      
+      // 调试信息：开始获取下拉选项数据
+      console.log('开始获取下拉选项数据...')
+      
+      // 获取下拉选项数据（无论什么状态都需要获取，用于显示名称）
+      await getSelectOptions()
+      
+      console.log('下拉选项数据获取完成')
+      console.log('活动类型列表:', activityCategoryList.value)
+      
+      // 无论什么状态，只要有活动类型ID，都需要获取对应的活动列表（用于显示活动名称）
+      if (form.activityCategoryId) {
+        console.log('有活动类型ID，开始获取活动列表:', form.activityCategoryId)
+        await onActivityCategoryChange()
+      } else {
+        console.log('没有活动类型ID，跳过获取活动列表')
       }
+      
+      // 调试信息
+      console.log('页面加载完成 - 活动类型ID:', form.activityCategoryId)
+      console.log('页面加载完成 - 活动名称ID:', form.activityNameId)
+      console.log('页面加载完成 - 活动列表:', activityList.value)
 
-      // 5. 如果有附件ID，则加载文件列表（与PC端逻辑一致）
+      // 根据活动名称ID更新currentActivity和currentActivityType
+      if (form.activityNameId && activityList.value.length > 0) {
+        // 尝试使用严格相等和宽松相等来查找活动
+        let selectedActivity = activityList.value.find(activity => activity.goodsId === form.activityNameId)
+        if (!selectedActivity) {
+          // 如果严格相等找不到，尝试宽松相等
+          selectedActivity = activityList.value.find(activity => activity.goodsId == form.activityNameId)
+        }
+        if (selectedActivity) {
+          currentActivity.value = selectedActivity
+          currentActivityType.value = selectedActivity.timeType || ''
+          // 将timeType放入serviceType字段中传递给后端
+          form.serviceType = selectedActivity.timeType || ''
+          console.log('更新后的活动类型:', currentActivityType.value)
+          console.log('更新后的活动信息:', currentActivity.value)
+        } else {
+          console.log('未找到对应的活动:', form.activityNameId)
+          console.log('活动列表:', activityList.value)
+        }
+      } else {
+        console.log('活动名称ID或活动列表为空:', form.activityNameId, activityList.value.length)
+      }
+
+      // 如果有附件ID，则加载文件列表（与PC端逻辑一致）
       if (form.attachmentIds && form.attachmentIds.trim()) {
         await getFileListByAttachmentIds(form.attachmentIds)
       }
       
       console.log('详情数据加载完成:', form)
+      console.log('活动列表:', activityList.value)
+      console.log('活动名称ID:', form.activityNameId)
+      console.log('活动名称:', form.activityName)
       console.log('附件ID:', form.attachmentIds)
       console.log('文件列表:', uploadedFiles.value)
     } else {
@@ -460,6 +754,14 @@ async function getSelectOptions() {
       categoryType: 1 // 商品分类
     })
     activityCategoryList.value = categoryRes.data || []
+    
+    console.log('获取活动类型列表成功:', activityCategoryList.value.length, '条记录')
+    
+    // 无论什么状态，只要有活动类型ID，都需要获取对应的活动列表
+    if (form.activityCategoryId) {
+      console.log('有活动类型ID，准备获取活动列表:', form.activityCategoryId)
+      await onActivityCategoryChange()
+    }
   } catch (error) {
     console.error('获取选项数据失败:', error)
   }
@@ -467,23 +769,64 @@ async function getSelectOptions() {
 
 // 活动类型改变事件
 async function onActivityCategoryChange() {
+  console.log('活动类型改变事件被调用 - 活动类型ID:', form.activityCategoryId)
+  
   if (form.activityCategoryId) {
     try {
+      // 清空活动列表，避免旧数据干扰
+      activityList.value = []
+      
       const activityRes = await goodsApi.queryGoodsList({
         categoryId: form.activityCategoryId,
         shelvesFlag: true,
         pageNum: 1,
         pageSize: 100
       })
-      activityList.value = activityRes.data?.list || []
+      
+      console.log('获取活动列表成功:', activityRes.data?.list?.length || 0, '条记录')
+      
+      if (activityRes.data && activityRes.data.list) {
+        // 将活动列表转换为下拉选项格式（与PC端保持一致），保存完整的活动信息
+        activityList.value = activityRes.data.list.map(item => ({
+          label: item.goodsName,
+          value: item.goodsId,
+          goodsId: item.goodsId,
+          goodsName: item.goodsName,
+          timeType: item.timeType,
+          price: item.price,
+          ...item
+        }))
+        
+        console.log('活动列表转换完成，包含timeType:', activityList.value.map(item => ({ goodsId: item.goodsId, timeType: item.timeType, price: item.price })))
+        
+        console.log('活动列表转换完成:', activityList.value)
+        
+        // 如果当前有选中的活动ID，检查是否在新列表中
+        if (form.activityNameId) {
+          const activityExists = activityList.value.some(item => item.goodsId === form.activityNameId)
+          console.log('检查活动是否存在:', form.activityNameId, '=>', activityExists)
+          
+          if (!activityExists) {
+            // 如果当前选中的活动不在新列表中，清空选择
+            form.activityNameId = ''
+            console.log('清空活动名称选择')
+          }
+        }
+      } else {
+        activityList.value = []
+        form.activityNameId = ''
+        console.log('活动列表为空，清空选择')
+      }
     } catch (error) {
       console.error('获取活动列表失败:', error)
       activityList.value = []
+      form.activityNameId = ''
     }
   } else {
     activityList.value = []
+    form.activityNameId = ''
+    console.log('没有活动类型ID，清空活动列表和选择')
   }
-  form.activityNameId = ''
 }
 
 // 返回
@@ -495,6 +838,83 @@ function handleBack() {
 async function handleSave() {
   if (readonlyMode.value) return
   
+  // 表单验证
+  if (!form.positionId) {
+    message.error('请选择职务')
+    return
+  }
+  
+  if (!form.activityCategoryId) {
+    message.error('请选择活动类型')
+    return
+  }
+  
+  if (!form.activityNameId) {
+    message.error('请选择活动名称')
+    return
+  }
+  
+  // 根据活动类型进行不同的验证
+  if (currentActivityType.value === 'DICT') {
+    // DICT类型：验证服务开始时间、结束时间和时长
+    if (!form.serviceStart) {
+      message.error('请选择服务开始时间')
+      return
+    }
+    
+    if (!form.serviceEnd) {
+      message.error('请选择服务结束时间')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+  } else if (currentActivityType.value === 'TIME') {
+    // TIME类型：验证案件编号和服务时长
+    if (!form.recordNo) {
+      message.error('请填写案件编号')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+    
+    // 检查服务时长是否在范围内（如果有范围限制）
+    if (currentActivity.value.price && currentActivity.value.price.includes('-')) {
+      const [min, max] = currentActivity.value.price.split('-').map(Number)
+      if (form.serviceDuration < min || form.serviceDuration > max) {
+        message.error(`你填写的此类公益活动时长超出该活动要求的${currentActivity.value.price}小时，请按规范要求填报具体时长`)
+        return
+      }
+    }
+  } else if (currentActivityType.value === 'AMOUT') {
+    // AMOUNT类型：验证金额和服务时长范围
+    if (!form.workloadScore) {
+      message.error('请填写金额')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+    
+    // 验证服务时长是否在100-200小时范围内
+    if (form.serviceDuration < 100 || form.serviceDuration > 200) {
+      message.error('你填写的此类公益活动时长超出该活动要求的100-200小时，请按规范要求填报具体时长')
+      return
+    }
+  }
+  
+  if (!form.serviceContent) {
+    message.error('请输入服务内容描述')
+    return
+  }
+  
   loading.value = true
   try {
     const submitData = {
@@ -528,16 +948,6 @@ async function handleSubmit() {
     return
   }
   
-  if (!form.serviceStart) {
-    message.error('请选择服务开始时间')
-    return
-  }
-  
-  if (!form.serviceEnd) {
-    message.error('请选择服务结束时间')
-    return
-  }
-  
   if (!form.activityCategoryId) {
     message.error('请选择活动类型')
     return
@@ -548,6 +958,62 @@ async function handleSubmit() {
     return
   }
   
+  // 根据活动类型进行不同的验证
+  if (currentActivityType.value === 'DICT') {
+    // DICT类型：验证服务开始时间、结束时间和时长
+    if (!form.serviceStart) {
+      message.error('请选择服务开始时间')
+      return
+    }
+    
+    if (!form.serviceEnd) {
+      message.error('请选择服务结束时间')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+  } else if (currentActivityType.value === 'TIME') {
+    // TIME类型：验证案件编号和服务时长
+    if (!form.recordNo) {
+      message.error('请填写案件编号')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+    
+    // 检查服务时长是否在范围内（如果有范围限制）
+    if (currentActivity.value.price && currentActivity.value.price.includes('-')) {
+      const [min, max] = currentActivity.value.price.split('-').map(Number)
+      if (form.serviceDuration < min || form.serviceDuration > max) {
+        message.error(`你填写的此类公益活动时长超出该活动要求的${currentActivity.value.price}小时，请按规范要求填报具体时长`)
+        return
+      }
+    }
+  } else if (currentActivityType.value === 'AMOUT') {
+    // AMOUNT类型：验证金额和服务时长范围
+    if (!form.workloadScore) {
+      message.error('请填写金额')
+      return
+    }
+    
+    if (!form.serviceDuration) {
+      message.error('请填写服务时长')
+      return
+    }
+    
+    // 验证服务时长是否在100-200小时范围内
+    if (form.serviceDuration < 100 || form.serviceDuration > 200) {
+      message.error('你填写的此类公益活动时长超出该活动要求的100-200小时，请按规范要求填报具体时长')
+      return
+    }
+  }
+  
   if (!form.serviceContent) {
     message.error('请输入服务内容描述')
     return
@@ -603,6 +1069,15 @@ function getStatusClass(status) {
   return classMap[status] || 'status-unknown'
 }
 
+// 获取活动类型名称
+function getActivityCategoryName() {
+  if (!form.activityCategoryId) return ''
+  
+  // 从活动类型列表中查找对应的名称
+  const category = activityCategoryList.value.find(item => item.categoryId === form.activityCategoryId)
+  return category ? category.categoryName : ''
+}
+
 // HTML标签过滤函数
 function stripHtmlTags(html) {
   if (!html) return ''
@@ -610,6 +1085,28 @@ function stripHtmlTags(html) {
   return html.replace(/<[^>]*>/g, '').trim()
 }
 
+// 只读模式下获取活动类型列表
+async function getActivityCategoryList() {
+  try {
+    // 获取活动类型列表用于显示名称
+    const categoryRes = await categoryApi.queryCategoryTree({
+      categoryType: 1 // 商品分类
+    })
+    activityCategoryList.value = categoryRes.data || []
+  } catch (error) {
+    console.error('获取活动类型列表失败:', error)
+  }
+}
+
+// 获取活动名称
+function getActivityName() {
+  if (!form.activityNameId) return ''
+  
+  // 从活动列表中查找对应的名称
+  const activity = activityList.value.find(item => item.goodsId === form.activityNameId)
+  return activity ? activity.ativityName : ''
+}
+
 onMounted(() => {
   getDetail()
 })
diff --git a/vite.config.js b/vite.config.js
index b4a3246..e722064 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -35,20 +35,20 @@ export default {
     proxy: {
       // 代理API路径
       '/api': {
-        //target: 'http://8.148.67.92:8080/', // 目标服务器地址
-        target: 'http://127.0.0.1:8080/',
+        target: 'http://8.148.67.92:8080/', // 目标服务器地址
+        //target: 'http://127.0.0.1:8080/',
         changeOrigin: true, // 是否修改请求头中的 Origin 字段
         rewrite: (path) => path.replace(/^\/api/, ''), // 重写路径
       },
       '/login': {
-        //target: 'http://8.148.67.92:8080/', // 目标服务器地址
-        target: 'http://127.0.0.1:8080/',
+        target: 'http://8.148.67.92:8080/', // 目标服务器地址
+        //target: 'http://127.0.0.1:8080/',
         changeOrigin: true, // 是否修改请求头中的 Origin 字段
         rewrite: (path) => path.replace(/^\/api/, ''), // 重写路径
       },
       '/mobile/login': {
-        //target: 'http://8.148.67.92:8080/', // 目标服务器地址
-        target: 'http://127.0.0.1:8080/',
+        target: 'http://8.148.67.92:8080/', // 目标服务器地址
+        //target: 'http://127.0.0.1:8080/',
         changeOrigin: true, // 是否修改请求头中的 Origin 字段
         rewrite: (path) => path.replace(/^\/api/, ''), // 重写路径
       },