diff --git a/api/apiRoute.js b/api/apiRoute.js
index 1c17ad9..49f3ed2 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -326,8 +326,12 @@ export default {
     async xy_orderTableAdd(data = {}) {
         return await http.post('/xy/orderTable/add', data);
     },
-
+// 获取通话记录
     async listCallUp(data={}) {
-        return await http.get('/member/list_call_up', data);
+        return await http.get('/per_list_call_up', data);
+    },
+    // 更新通话记录
+    async updateCallUp(data={}) {
+        return await http.post('/per_update_call_up', data);
     },
 }
\ No newline at end of file
diff --git a/api/market.js b/api/market.js
index b9dba6c..1453c92 100644
--- a/api/market.js
+++ b/api/market.js
@@ -83,14 +83,6 @@ export default {
         })
     },
 
-    //拨打电话记录列表
-    listCallUp(data={}) {
-        let url = '/member/list_call_up'
-        return http.get(url, data).then(res => {
-            return res;
-        })
-    },
-
 
     //公海-领取客户
     getSales(data = {}) {
diff --git a/common/axios.js b/common/axios.js
index 4f07913..f391540 100644
--- a/common/axios.js
+++ b/common/axios.js
@@ -135,6 +135,9 @@ export default {
 			});
 
 			console.log('请求配置:', interceptedConfig);
+			console.log('请求URL:', interceptedConfig.url);
+			console.log('请求方法:', interceptedConfig.method);
+			console.log('请求数据:', interceptedConfig.data);
 
 			uni.request({
 				...interceptedConfig,
@@ -166,7 +169,7 @@ export default {
 				}
 			});
 		});
-	}, 300),
+	}, 100),
 
 	// 封装请求方法
 	post(url, data = {}) {
diff --git a/common/util.js b/common/util.js
index 9295a69..1ae1fc6 100644
--- a/common/util.js
+++ b/common/util.js
@@ -224,25 +224,57 @@ function loginOut() {
  * @returns {Promise<Array|Object>}
  */
 async function getDict(dictKey) {
+	console.log(`util.getDict - 开始获取字典: ${dictKey}`);
+	
 	const cacheKey = `dict_${dictKey}`;
 	const cache = uni.getStorageSync(cacheKey);
 	const now = Date.now();
+	
+	// 检查缓存是否有效
 	if (cache && cache.data && cache.expire > now) {
+		console.log(`util.getDict - 使用缓存数据: ${dictKey}, 数据条数: ${cache.data.length}`);
 		return cache.data;
 	}
+	
+	console.log(`util.getDict - 缓存无效，请求接口: ${dictKey}`);
+	
 	// 缓存无效，请求接口
-	const res = await marketApi.common_Dictionary({ key: dictKey });
-	if (res && res.code === 1) {
-		// 处理接口返回的数据，确保返回格式一致
-		// 接口返回的是 [{name: "抖音", value: "1", sort: 0, memo: ""}, ...]
-		const formattedData = Array.isArray(res.data) ? res.data : [];
+	try {
+		console.log(`util.getDict - 调用API: common_Dictionary, key=${dictKey}`);
 		
-		uni.setStorageSync(cacheKey, {
-			data: formattedData,
-			expire: now + 3600 * 1000
+		// 添加超时处理
+		const timeoutPromise = new Promise((_, reject) => {
+			setTimeout(() => reject(new Error(`字典加载超时: ${dictKey}`)), 3000);
 		});
-		return formattedData;
-	} else {
+		
+		// 实际API请求
+		const apiPromise = marketApi.common_Dictionary({ key: dictKey });
+		
+		// 使用Promise.race来实现超时控制
+		const res = await Promise.race([apiPromise, timeoutPromise]);
+		
+		console.log(`util.getDict - API响应:`, res);
+		
+		if (res && res.code === 1) {
+			// 处理接口返回的数据，确保返回格式一致
+			// 接口返回的是 [{name: "抖音", value: "1", sort: 0, memo: ""}, ...]
+			const formattedData = Array.isArray(res.data) ? res.data : [];
+			
+			console.log(`util.getDict - 保存缓存: ${dictKey}, 数据条数: ${formattedData.length}`);
+			uni.setStorageSync(cacheKey, {
+				data: formattedData,
+				expire: now + 3600 * 1000
+			});
+			console.log(`util.getDict - 字典获取成功: ${dictKey}`);
+			return formattedData;
+		} else {
+			console.error(`util.getDict - API请求失败: ${dictKey}`, res);
+			// 返回空数组而不是抛出异常，避免阻塞流程
+			return [];
+		}
+	} catch (error) {
+		console.error(`util.getDict - 异常: ${dictKey}`, error);
+		// 返回空数组，避免阻塞流程
 		return [];
 	}
 }
diff --git a/components/AQ/AQTabber.vue b/components/AQ/AQTabber.vue
index 2886369..337fa1e 100644
--- a/components/AQ/AQTabber.vue
+++ b/components/AQ/AQTabber.vue
@@ -142,7 +142,7 @@
 							},
 							{
 								text: "数据",
-								urlPath: '/pages/market/data/index', //自定义页面跳转路径
+								urlPath: '/pages/market/data/statistics', //自定义页面跳转路径
 								iconPath: util.img('/uniapp_src/static/images/tabbar/timetable.png'),
 								selectedIconPath: util.img('/uniapp_src/static/images/tabbar/timetables.png'),
 							},
diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue
index 6c41db7..57e0ee8 100644
--- a/pages/market/clue/clue_info.vue
+++ b/pages/market/clue/clue_info.vue
@@ -10,17 +10,17 @@
             <view class="course_box_top">
               <view class="course_box_top_top">
                 <image class="pic" :src="$util.img('/uniapp_src/static/images/index/myk.png')"></image>
-                <view class="name">{{ clientInfo.customerResource.name }}</view>
+                <view class="name">{{ safeGet(clientInfo, 'customerResource.name', '未知客户') }}</view>
               </view>
               <view class="course_box_top_below">
                 <view class="course_box_top_below-left">
-                  <view>{{ $util.formatToDateTime((clientInfo.customerResource.updated_at || ''),'m-d H:i') }} 跟进</view>
+                  <view>{{ $util.formatToDateTime((safeGet(clientInfo, 'customerResource.updated_at', '')),'m-d H:i') }} 跟进</view>
 
                   <view style="display: flex;align-items: center;">
                     <view style="padding-left: 30rpx;">
-                      <image v-if="clientInfo.customerResource.initial_intent == 'high'"
+                      <image v-if="safeGet(clientInfo, 'customerResource.initial_intent') == 'high'"
                              :src="$util.img('/uniapp_src/static/images/index/lvs.png')" class="drop-image-x"></image>
-                      <image v-else-if="clientInfo.customerResource.initial_intent == 'medium'"
+                      <image v-else-if="safeGet(clientInfo, 'customerResource.initial_intent') == 'medium'"
                              :src="$util.img('/uniapp_src/static/images/index/intention2.png')" class="drop-image-x"></image>
                       <image
                           v-else
@@ -37,7 +37,7 @@
                     <view class="btn-item" @click="handleMakeCall">
                       <image class="btn-icon" :src="$util.img('/uniapp_src/static/images/index/phone.png')"></image>
                     </view>
-                    <view class="btn-item" @click="handleSendMessage" v-if="this.clientInfo.customerResource.member_id">
+                    <view class="btn-item" @click="handleSendMessage" v-if="safeGet(clientInfo, 'customerResource.member_id')">
                       <image class="btn-icon" :src="$util.img('/uniapp_src/static/images/index/message.png')"></image>
                     </view>
                   </view>
@@ -68,23 +68,23 @@
         <view class="basic-message-div">
           <view class="basic-message-div-txt">
             <view>来源渠道</view>
-            <view>{{clientInfo.customerResource.source_channel_name}}</view>
+            <view>{{safeGet(clientInfo, 'customerResource.source_channel_name', '未知渠道')}}</view>
           </view>
           <view class="basic-message-div-txt">
             <view>来源</view>
-            <view>{{clientInfo.customerResource.source_name}}</view>
+            <view>{{safeGet(clientInfo, 'customerResource.source_name', '未知来源')}}</view>
           </view>
           <view class="basic-message-div-txt">
             <view>顾问</view>
-            <view>{{clientInfo.customerResource.consultant_name}}</view>
+            <view>{{safeGet(clientInfo, 'customerResource.consultant_name', '未知顾问')}}</view>
           </view>
           <view class="basic-message-div-txt">
             <view>学生姓名</view>
-            <view>{{clientInfo.customerResource.name}}</view>
+            <view>{{safeGet(clientInfo, 'customerResource.name', '未知学生')}}</view>
           </view>
           <view class="basic-message-div-txt">
             <view>性别</view>
-            <view>{{clientInfo.customerResource.gender_name}}</view>
+            <view>{{safeGet(clientInfo, 'customerResource.gender_name', '未知性别')}}</view>
           </view>
         </view>
 
@@ -92,11 +92,11 @@
         <view class="basic-message-div">
           <view class="basic-message-div-txt" @click="openViewOrder()">
             <view>已成交次数</view>
-            <view>{{clientInfo.customerResource.cj_count || 0}}次</view>
+            <view>{{safeGet(clientInfo, 'customerResource.cj_count', 0)}}次</view>
           </view>
           <view class="basic-message-div-txt">
             <view>体验课程</view>
-            <view>{{clientInfo.customerResource.trial_class_count}}次</view>
+            <view>{{safeGet(clientInfo, 'customerResource.trial_class_count', 0)}}次</view>
           </view>
         </view>
         <view style="height: 200rpx;"></view>
@@ -120,6 +120,10 @@
 
 <!--      通话记录-->
       <view class="call-log" v-if="switch_tags_type == 3">
+        <!-- 添加备注按钮 -->
+        <view style="width: 92%; margin: 20rpx auto; display: flex; justify-content: center;">
+          <button type="primary" style="background-color: #29D3B4; color: white;" @click="openAddRemark">添加备注</button>
+        </view>
         <view style="margin-top: 20rpx" v-for="(v,k) in listCallUp" :key="k">
 <!--          <view class="basic-message">08-23</view>-->
           <view class="follow-records-list">
@@ -128,8 +132,8 @@
               <view>{{v.create_time}}</view>
             </view>
             <view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
-              <view>呼叫对象：{{v.student_name}}</view>
-              <view>呼叫号码：{{v.student_phone}}</view>
+              <view>呼叫时间：{{v.created_at}}</view>
+              <view>呼叫备注：{{v.remarks}}</view>
             </view>
           </view>
         </view>
@@ -267,6 +271,21 @@
         <view @click="openViewEditCluesLog()">修改记录</view>
         <view @click="openViewOrder()">订单列表</view>
       </view>
+      
+      <!-- 添加备注弹窗 -->
+      <uni-popup ref="remarkPopup" type="dialog">
+        <uni-popup-dialog 
+          title="添加备注" 
+          :before-close="true" 
+          @confirm="confirmRemark" 
+          @close="closeRemark">
+          <uni-easyinput 
+            type="textarea" 
+            v-model="remark_content" 
+            placeholder="请输入备注内容">
+          </uni-easyinput>
+        </uni-popup-dialog>
+      </uni-popup>
     </view>
   </view>
 </template>
@@ -297,51 +316,144 @@
 
         //当前登录的员工信息
         userInfo:{},
+        
+        // 备注相关
+        remark_content: '',
 			}
 		},
     onLoad(options) {
+      console.log('onLoad - 接收到参数:', options);
+      
+      // 检查options是否存在且包含resource_sharing_id
+      if (!options || !options.resource_sharing_id) {
+        console.error('onLoad - 缺少必要参数resource_sharing_id');
+        uni.showToast({
+          title: '缺少必要参数',
+          icon: 'none'
+        });
+        
+        // 延迟返回上一页
+        setTimeout(() => {
+          uni.navigateBack();
+        }, 1500);
+        return;
+      }
+      
       this.resource_sharing_id = options.resource_sharing_id//共享资源表id
+      console.log('onLoad - 设置 resource_sharing_id:', this.resource_sharing_id);
     },
     onShow(){
+      console.log('onShow - 开始初始化');
       this.init()
     },
 		methods: {
 		  async init(){
-		    await this.getInfo()//客户详情
-		    this.getUserInfo()//获取当前登录的员工信息
-		    this.getListCallUp()//获取通话记录
+		    console.log('init - 开始初始化流程');
+		    
+		    // 预加载常用字典数据
+		    try {
+		      console.log('init - 开始预加载字典数据');
+		      const dictPromises = [
+		        this.$util.getDict('SourceChannel'), // 来源渠道
+		        this.$util.getDict('source'), // 来源
+		        this.$util.getDict('preliminarycustomerintention'), // 客户初步意向度
+		        this.$util.getDict('kh_status'), // 客户状态
+		      ];
+		      
+		      // 使用Promise.all并行加载字典，但设置超时处理
+		      const timeoutPromise = new Promise((_, reject) => 
+		        setTimeout(() => reject(new Error('字典加载超时')), 5000)
+		      );
+		      
+		      await Promise.race([
+		        Promise.all(dictPromises),
+		        timeoutPromise
+		      ]).catch(err => {
+		        console.warn('字典加载异常或超时，继续执行流程:', err);
+		      });
+		      
+		      console.log('init - 字典数据预加载完成或已超时');
+		    } catch (error) {
+		      console.warn('init - 字典数据预加载失败，继续执行流程:', error);
+		    }
+		    
+		    // 恢复为串行请求处理，确保数据依赖关系正确
+		    try {
+		      // 先获取客户详情，因为其他操作可能依赖于客户详情
+		      console.log('init - 开始获取客户详情');
+		      await this.getInfo();
+		      console.log('init - 客户详情获取完成');
+		      
+		      // 获取员工信息和通话记录可以并行
+		      console.log('init - 开始获取员工信息和通话记录');
+		      await Promise.all([
+		        this.getUserInfo(),
+		        this.getListCallUp()
+		      ]);
+		      console.log('init - 员工信息和通话记录获取完成');
+		    } catch (error) {
+		      console.error('init - 数据加载出错:', error);
+		    }
       },
 
       //获取当前登录的员工信息
       async getUserInfo(){
-        let res = await apiRoute.getPersonnelInfo({})
-        if (res.code != 1) {
-          uni.showToast({
-            title: res.msg,
-            icon: 'none'
-          })
-          return
+        console.log('getUserInfo - 开始获取员工信息');
+        try {
+          let res = await apiRoute.getPersonnelInfo({})
+          if (res.code != 1) {
+            uni.showToast({
+              title: res.msg,
+              icon: 'none'
+            })
+            return false;
+          }
+  
+          this.userInfo = res.data
+          console.log('getUserInfo - 员工信息获取成功');
+          return true;
+        } catch (error) {
+          console.error('getUserInfo - 获取员工信息失败:', error);
+          return false;
         }
-
-        this.userInfo = res.data
-        // console.log('员工',this.userInfo)
       },
 
       //获取客户详情
 		  async getInfo(){
-		    let data = {
-          resource_sharing_id:this.resource_sharing_id//共享资源表id
-        }
-        let res = await apiRoute.xs_resourceSharingInfo(data)
-        if(res.code != 1){
-          uni.showToast({
-            title: res.msg,
-            icon: 'none'
-          })
-          return
-        }
-        this.clientInfo = res.data
-        console.log('详情',this.clientInfo)
+		    console.log('getInfo - 开始获取客户详情, resource_sharing_id:', this.resource_sharing_id);
+		    try {
+		      // 检查resource_sharing_id是否存在
+		      if (!this.resource_sharing_id) {
+		        console.error('getInfo - resource_sharing_id为空，无法获取客户详情');
+		        uni.showToast({
+		          title: '缺少必要参数',
+		          icon: 'none'
+		        });
+		        return false;
+		      }
+		      
+		      let data = {
+            resource_sharing_id:this.resource_sharing_id//共享资源表id
+          }
+          console.log('getInfo - 发起请求:', data);
+          let res = await apiRoute.xs_resourceSharingInfo(data)
+          console.log('getInfo - 请求响应:', res);
+          if(res.code != 1){
+            console.error('getInfo - 请求失败:', res.msg);
+            uni.showToast({
+              title: res.msg,
+              icon: 'none'
+            })
+            return false;
+          }
+          this.clientInfo = res.data
+          console.log('getInfo - 客户详情数据:', this.clientInfo);
+          console.log('getInfo - 客户详情获取完成');
+          return true;
+		    } catch (error) {
+		      console.error('getInfo - 获取客户详情失败:', error);
+		      return false;
+		    }
       },
 
       //获取跟进记录
@@ -362,22 +474,46 @@
 
       //获取通话记录
       async getListCallUp(){
-        let data = {
-          sales_id:this.resource_sharing_id//
-        }
-        let res = await apiRoute.listCallUp(data)
-        if(res.code != 1){
-          uni.showToast({
-            title: res.msg,
-            icon: 'none'
-          })
-          return
+        console.log('getListCallUp - 开始获取通话记录');
+        try {
+          // 检查resource_sharing_id是否存在
+          if (!this.resource_sharing_id) {
+            console.error('getListCallUp - resource_sharing_id为空，无法获取通话记录');
+            return false;
+          }
+          
+          let data = {
+            sales_id:this.resource_sharing_id//
+          }
+          let res = await apiRoute.listCallUp(data)
+          if(res.code != 1){
+            uni.showToast({
+              title: res.msg,
+              icon: 'none'
+            })
+            return false;
+          }
+          this.listCallUp = res.data
+          console.log('getListCallUp - 通话记录获取成功');
+          return true;
+        } catch (error) {
+          console.error('getListCallUp - 获取通话记录失败:', error);
+          return false;
         }
-        this.listCallUp = res.data
       },
 
       //跳转页面-编辑客户详情
       openViewEditClues(){
+        // 检查resource_sharing_id是否存在
+        if (!this.resource_sharing_id) {
+          console.error('openViewEditClues - resource_sharing_id为空，无法跳转');
+          uni.showToast({
+            title: '缺少必要参数',
+            icon: 'none'
+          });
+          return;
+        }
+        
 		    let resource_sharing_id = this.resource_sharing_id//共享资源表id
         this.$navigateTo({
           url: `/pages/market/clue/edit_clues?resource_sharing_id=${resource_sharing_id}`
@@ -386,7 +522,17 @@
 
       //跳转页面-客户信息修改记录
       openViewEditCluesLog() {
-        let resource_id = this.clientInfo.resource_id
+        // 检查clientInfo.resource_id是否存在
+        const resource_id = this.safeGet(this.clientInfo, 'resource_id');
+        if (!resource_id) {
+          console.error('openViewEditCluesLog - resource_id为空，无法跳转');
+          uni.showToast({
+            title: '缺少必要参数',
+            icon: 'none'
+          });
+          return;
+        }
+        
         this.$navigateTo({
           url: `/pages/market/clue/edit_clues_log?resource_id=${resource_id}`
         })
@@ -394,11 +540,20 @@
 
       //跳转页面-订单列表
       openViewOrder() {
-        let resource_id = this.clientInfo.resource_id//客户资源id
-        let resource_name = this.clientInfo.customerResource.name || ''//客户资源id姓名
-
-        let staff_id = this.userInfo.id//员工id
-        let staff_id_name = this.userInfo.name || ''//员工姓名
+        // 检查必要参数是否存在
+        const resource_id = this.safeGet(this.clientInfo, 'resource_id');
+        if (!resource_id) {
+          console.error('openViewOrder - resource_id为空，无法跳转');
+          uni.showToast({
+            title: '缺少必要参数',
+            icon: 'none'
+          });
+          return;
+        }
+        
+        let resource_name = this.safeGet(this.clientInfo, 'customerResource.name', '')//客户资源id姓名
+        let staff_id = this.safeGet(this.userInfo, 'id', '')//员工id
+        let staff_id_name = this.safeGet(this.userInfo, 'name', '')//员工姓名
 
         this.$navigateTo({
           url: `/pages/market/clue/order_list?resource_id=${resource_id}&resource_name=${resource_name}&staff_id=${staff_id}&staff_id_name=${staff_id_name}`
@@ -451,29 +606,100 @@
 				})
       },
 
-      // 拨打电话
+      // 打开添加备注弹窗
+      openAddRemark() {
+        this.remark_content = '';
+        this.$refs.remarkPopup.open();
+      },
+      
+      // 确认添加备注
+      async confirmRemark() {
+        if (!this.remark_content.trim()) {
+          uni.showToast({
+            title: '请输入备注内容',
+            icon: 'none'
+          });
+          return;
+        }
+        
+        try {
+          uni.showLoading({
+            title: '提交中...',
+            mask: true
+          });
+          
+          const params = {
+            staff_id: this.userInfo.id, // 员工id
+            resource_id: this.clientInfo.resource_id, // 资源ID
+            resource_type: '', // 资源类型
+            communication_type: 'note', // 沟通类型: phone-电话, note-备注
+            communication_result: 'success', // 沟通结果
+            remarks: this.remark_content, // 备注内容
+            tag: null // 标签
+          };
+          
+          const res = await apiRoute.xs_communicationRecordsAdd(params);
+          
+          if (res.code !== 1) {
+            uni.showToast({
+              title: res.msg || '添加备注失败',
+              icon: 'none'
+            });
+            return;
+          }
+          
+          uni.showToast({
+            title: '添加备注成功',
+            icon: 'success'
+          });
+          
+          // 刷新通话记录列表
+          this.getListCallUp();
+          
+        } catch (error) {
+          console.error('添加备注失败:', error);
+          uni.showToast({
+            title: '添加备注失败，请重试',
+            icon: 'none'
+          });
+        } finally {
+          uni.hideLoading();
+          this.$refs.remarkPopup.close();
+        }
+      },
+      
+      // 关闭备注弹窗
+      closeRemark() {
+        this.$refs.remarkPopup.close();
+      },
+
+      // 拨打电话按钮点击
       handleMakeCall() {
-        if (!this.clientInfo.customerResource.phone_number) {
+        if (!this.clientInfo.customerResource.phone) {
           uni.showToast({
             title: '电话号码为空',
             icon: 'none'
           });
           return;
         }
-        this.callTel(this.clientInfo.customerResource.phone_number);
+        this.callTel(this.clientInfo.customerResource.phone);
       },
 
-      // 发送消息
+      // 发送消息按钮点击
       handleSendMessage() {
-        if (!this.clientInfo.customerResource.staff_id) {
+        if (!this.clientInfo.customerResource.member_id) {
           uni.showToast({
-            title: '未找到相关人员',
+            title: '该客户未注册账号，无法发送消息',
             icon: 'none'
           });
           return;
         }
+        
+        let member_id = this.clientInfo.customerResource.member_id;
+        let member_name = this.clientInfo.customerResource.name || '';
+        
         this.$navigateTo({
-          url: `/pages/common/im_chat_info?hair_staff_id=${this.clientInfo.customerResource.staff_id}`
+          url: `/pages/market/clue/chat?member_id=${member_id}&member_name=${member_name}`
         });
       },
 
@@ -484,6 +710,20 @@
 			getSelect(type){
 				this.select_type = type
 			},
+
+      // 安全访问对象属性的方法
+      safeGet(obj, path, defaultValue = '') {
+        if (!obj) return defaultValue;
+        const keys = path.split('.');
+        let result = obj;
+        for (const key of keys) {
+          if (result === null || result === undefined || !result.hasOwnProperty(key)) {
+            return defaultValue;
+          }
+          result = result[key];
+        }
+        return result || defaultValue;
+      },
 		}
 	}
 </script>
@@ -501,6 +741,26 @@
 		min-height: 28vh;
 	}
 
+	// 操作按钮样式
+	.action-buttons {
+		display: flex;
+		align-items: center;
+		
+		.btn-item {
+			width: 60rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-left: 20rpx;
+			
+			.btn-icon {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+
 	//统计信息
 	.count_section {
 		width: 100%;
@@ -699,24 +959,4 @@
 		padding: 12rpx 8rpx;
 		text-align: center;
 	}
-	.action-buttons {
-		display: flex;
-		gap: 20rpx;
-		align-items: center;
-
-		.btn-item {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 60rpx;
-			height: 60rpx;
-			border-radius: 50%;
-			background: #f5f5f5;
-
-			.btn-icon {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-	}
 </style>
\ No newline at end of file
diff --git a/pages/market/clue/edit_clues.vue b/pages/market/clue/edit_clues.vue
index 8946159..7ce1aff 100644
--- a/pages/market/clue/edit_clues.vue
+++ b/pages/market/clue/edit_clues.vue
@@ -134,13 +134,13 @@
 							</view>
 						</fui-form-item>
 						<!-- 客户分类 -->
-						<fui-form-item label="客户分类" labelSize='26' prop="customer_type" background='#434544' labelColor='#fff' :bottomBorder='false'>
+						<!-- <fui-form-item label="客户分类" labelSize='26' prop="customer_type" background='#434544' labelColor='#fff' :bottomBorder='false'>
 							<view class="input-title" style="margin-right:14rpx;">
 								<view class="input-title" style="margin-right:14rpx;" @click="openCicker('customer_type')">
 									{{ formData.customer_type ? picker_config.customer_type.text : '点击选择' }}
 								</view>
 							</view>
-						</fui-form-item>
+						</fui-form-item> -->
 						<!-- 预约体验课 -->
 						<!-- <fui-form-item label="预约体验课" labelSize='26' prop="trial_lesson" background='#434544' labelColor='#fff' :bottomBorder='false'>
 							<view class="input-title" style="margin-right:14rpx;">
@@ -470,20 +470,50 @@
 			}
 		},
 		onLoad(options) {
-			this.resource_sharing_id = options.resource_sharing_id //共享资源表id
+			console.log('onLoad - 接收到参数:', options);
+			if (!options || !options.resource_sharing_id) {
+				console.error('缺少必要参数 resource_sharing_id');
+				uni.showToast({
+					title: '缺少必要参数',
+					icon: 'none'
+				});
+				setTimeout(() => {
+					uni.navigateBack();
+				}, 1500);
+				return;
+			}
+			this.resource_sharing_id = options.resource_sharing_id; //共享资源表id
+			console.log('设置 resource_sharing_id:', this.resource_sharing_id);
 		},
 		onShow() {
-			this.init()
+			console.log('onShow - 开始初始化');
+			this.init();
 		},
 		methods: {
 			//初始化
 			async init() {
 				try {
+					console.log('init - 开始初始化流程');
+					
+					if (!this.resource_sharing_id) {
+						console.error('resource_sharing_id 为空，无法初始化');
+						uni.showToast({
+							title: '缺少必要参数',
+							icon: 'none'
+						});
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 1500);
+						return;
+					}
+					
 					uni.showLoading({
 						title: '加载中...',
 						mask: true
 					});
 					
+					console.log('init - 开始加载字典数据');
+					
 					// 先加载所有字典数据
 					const dictPromises = [
 						this.getDict('source_channel'), //获取字典-来源渠道
@@ -494,15 +524,21 @@
 						this.getDict('status'), //获取字典-客户状态
 						this.getDict('decision_maker'), //获取字典-决策人
 						this.getDict('distance'), //获取字典-距离
+						// this.getDict('customer_type'), //获取字典-客户分类
 					];
 					
 					await Promise.all(dictPromises);
+					console.log('init - 字典数据加载完成');
 					
 					// 加载校区列表
+					console.log('init - 开始加载校区列表');
 					await this.get_campus_list();
+					console.log('init - 校区列表加载完成');
 					
 					// 获取资源共享详情并回显数据
+					console.log('init - 开始获取客户详情');
 					await this.getInfo();
+					console.log('init - 客户详情获取完成');
 					
 				} catch (error) {
 					console.error('初始化失败:', error);
@@ -543,103 +579,160 @@
 
 			//获取资源共享-详情(客户资源详情)
 			async getInfo() {
-				let params = {
-					resource_sharing_id: this.resource_sharing_id
-				}
-
-				let res = await apiRoute.xs_resourceSharingInfo(params) //资源共享-详情(客户资源详情)
-				if (res.code != 1) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-					return
-				}
-
-				let customerResource = res.data.customerResource || {} //客户资源详情
-				let sixSpeed = res.data.customerResource.sixSpeed || {} //六要素详情
-				console.log('12313', sixSpeed)
-				console.log('详情', res.data)
+				try {
+					console.log('getInfo - 开始获取客户详情, resource_sharing_id:', this.resource_sharing_id);
+					
+					if (!this.resource_sharing_id) {
+						console.error('getInfo - resource_sharing_id 为空，无法获取客户详情');
+						return;
+					}
+					
+					let params = {
+						resource_sharing_id: this.resource_sharing_id
+					};
 
+					console.log('getInfo - 发起请求:', params);
+					let res = await apiRoute.xs_resourceSharingInfo(params); //资源共享-详情(客户资源详情)
+					console.log('getInfo - 请求响应:', res);
+					
+					if (res.code != 1) {
+						console.error('getInfo - 请求失败:', res.msg);
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+						return;
+					}
 
-				this.formData = {
-					resource_sharing_id: this.resource_sharing_id, //资源共享表id
-					// 客户基础信息
-					id: customerResource.id || '', //客户资源表id
-					source_channel: customerResource.source_channel || '', //来源渠道
-					source: customerResource.source || '', //来源
-					name: customerResource.name || '', //姓名
-					age: customerResource.age || '', //年龄
-					gender: customerResource.gender || '', //性别|male-男性, female-女性, other-其他
-					phone_number: customerResource.phone_number || '', //联系电话
-					demand: customerResource.demand || '', //需求
-					decision_maker: customerResource.decision_maker || '', //决策人
-					initial_intent: customerResource.initial_intent || '', //客户初步意向度: high-高, medium-中, low-低
-					status: customerResource.status || '', //客户状态: active-活跃, inactive-不活跃, pending-待定
-					campus: customerResource.campus || '', // 校区
+					let customerResource = res.data.customerResource || {}; //客户资源详情
+					let sixSpeed = res.data.customerResource.sixSpeed || {}; //六要素详情
+					console.log('getInfo - 客户资源详情:', customerResource);
+					console.log('getInfo - 六要素详情:', sixSpeed);
+
+					// 存储原始数据，用于后续回显
+					this._resourceDetail = res.data;
+
+					this.formData = {
+						resource_sharing_id: this.resource_sharing_id, //资源共享表id
+						// 客户基础信息
+						id: customerResource.id || '', //客户资源表id
+						source_channel: customerResource.source_channel || '', //来源渠道
+						source: customerResource.source || '', //来源
+						name: customerResource.name || '', //姓名
+						age: customerResource.age || '', //年龄
+						gender: customerResource.gender || 'male', //性别|male-男性, female-女性, other-其他
+						phone_number: customerResource.phone_number || '', //联系电话
+						demand: customerResource.demand || '', //需求
+						decision_maker: customerResource.decision_maker || '', //决策人
+						initial_intent: customerResource.initial_intent || '', //客户初步意向度: high-高, medium-中, low-低
+						status: customerResource.status || '', //客户状态: active-活跃, inactive-不活跃, pending-待定
+						campus: customerResource.campus || '', // 校区
+						customer_type: customerResource.customer_type || '', // 客户分类
+
+						//六要素信息
+						purchasing_power: sixSpeed.purchase_power || '', //购买力
+						cognitive_idea: sixSpeed.concept_awareness || '', //认知理念
+						communication: sixSpeed.communication || '', //沟通备注
+						staff_id: sixSpeed.staff_id || '', //人员ID
+						distance: sixSpeed.distance || '', //距离
+						promised_visit_time: sixSpeed.promised_visit_time || '', //承诺到访时间
+						optional_class_time: sixSpeed.preferred_class_time || '', //可选上课时间
+						first_visit_time: sixSpeed.first_visit_time || '', // 一访时间
+						first_visit_status: sixSpeed.first_visit_status || '', //一访情况
+						second_visit_time: sixSpeed.second_visit_time || '', // 二访时间
+						second_visit_status: sixSpeed.second_visit_status || '', //二访情况
+						remark: sixSpeed.remark || '', // 备注
+						consultation_remark: sixSpeed.consultation_remark || '', // 面咨备注
+						chasing_orders: sixSpeed.chasing_orders || '', // 追单标注
+						is_bm: sixSpeed.is_bm || 2, // 是否报名，默认未报名
+						efficacious: sixSpeed.efficacious || ''
+					};
+					
+					console.log('getInfo - 表单数据设置完成:', this.formData);
 
-					//六要素信息
-					purchasing_power: sixSpeed.purchase_power || '', //购买力
-					cognitive_idea: sixSpeed.concept_awareness || '', //认知理念
-					communication: sixSpeed.communication || '', //沟通备注
-					staff_id: sixSpeed.staff_id || '', //人员ID
-					distance: sixSpeed.distance || '', //距离
-					promised_visit_time: sixSpeed.promised_visit_time || '', //承诺到访时间
-					optional_class_time: sixSpeed.preferred_class_time || '', //可选上课时间
-					first_visit_status: sixSpeed.first_visit_status || '', //一访情况
-					second_visit_status: sixSpeed.second_visit_status || '', //二访情况
-					efficacious : sixSpeed.efficacious
+					// 格式化日期时间
+					if (sixSpeed.promised_visit_time) {
+						this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');
+					}
+					
+					if (sixSpeed.preferred_class_time) {
+						this.formData.optional_class_time = this.$util.formatToDateTime(sixSpeed.preferred_class_time, 'Y-m-d');
+					}
+					
+					if (sixSpeed.first_visit_time) {
+						this.formData.first_visit_time = this.$util.formatToDateTime(sixSpeed.first_visit_time, 'Y-m-d');
+					}
+					
+					if (sixSpeed.second_visit_time) {
+						this.formData.second_visit_time = this.$util.formatToDateTime(sixSpeed.second_visit_time, 'Y-m-d');
+					}
+					
+					console.log('getInfo - 日期格式化完成');
+					
+					// 设置选择器文本回显
+					console.log('getInfo - 开始设置选择器文本回显');
+					await this.setPickerText();
+					console.log('getInfo - 选择器文本回显完成');
+					
+				} catch (error) {
+					console.error('获取客户详情失败:', error);
+					uni.showToast({
+						title: '获取客户详情失败，请重试',
+						icon: 'none'
+					});
 				}
-
-				this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time,
-					'Y-m-d'); //格式化时间(Y-m-d H:i)
-				this.formData.optional_class_time = this.$util.formatToDateTime(sixSpeed.preferred_class_time,
-					'Y-m-d'); //格式化时间(Y-m-d H:i)
-				
-				// 获取校区列表，确保校区选择器数据已加载
-				await this.get_campus_list()
-				
-				// 等待所有字典数据加载完成后再进行回显
-				await this.setPickerText()
 			},
 
 			// 设置选择器文本回显
 			async setPickerText() {
-				const { customerResource = {}, sixSpeed = {} } = await this.getResourceDetail() || {}
-				
-				// 设置选择器文本回显
-				this.setPickerTextByValue('source_channel', this.formData.source_channel, customerResource.source_channel_name)
-				this.setPickerTextByValue('source', this.formData.source, customerResource.source_name)
-				this.setPickerTextByValue('consultant', this.formData.consultant, customerResource.consultant_name)
-				this.setPickerTextByValue('initial_intent', this.formData.initial_intent, customerResource.initial_intent_name)
-				this.setPickerTextByValue('status', this.formData.status, customerResource.status_name)
-				this.setPickerTextByValue('decision_maker', this.formData.decision_maker, customerResource.decision_maker_name || customerResource.decision_maker)
-				this.setPickerTextByValue('campus', this.formData.campus, customerResource.campus_name)
-				
-				// 六要素相关
-				this.setPickerTextByValue('purchasing_power', this.formData.purchasing_power, sixSpeed.purchase_power_name)
-				this.setPickerTextByValue('cognitive_idea', this.formData.cognitive_idea, sixSpeed.concept_awareness_name)
-				this.setPickerTextByValue('distance', this.formData.distance, sixSpeed.distance_name || sixSpeed.distance)
+				try {
+					const { customerResource = {}, sixSpeed = {} } = await this.getResourceDetail() || {};
+					
+					// 设置选择器文本回显
+					this.setPickerTextByValue('source_channel', this.formData.source_channel, customerResource.source_channel_name);
+					this.setPickerTextByValue('source', this.formData.source, customerResource.source_name);
+					this.setPickerTextByValue('consultant', this.formData.consultant, customerResource.consultant_name);
+					this.setPickerTextByValue('initial_intent', this.formData.initial_intent, customerResource.initial_intent_name);
+					this.setPickerTextByValue('status', this.formData.status, customerResource.status_name);
+					this.setPickerTextByValue('decision_maker', this.formData.decision_maker, customerResource.decision_maker_name);
+					this.setPickerTextByValue('campus', this.formData.campus, customerResource.campus_name);
+					this.setPickerTextByValue('customer_type', this.formData.customer_type, customerResource.customer_type_name);
+					
+					// 六要素相关
+					this.setPickerTextByValue('purchasing_power', this.formData.purchasing_power, sixSpeed.purchase_power_name);
+					this.setPickerTextByValue('cognitive_idea', this.formData.cognitive_idea, sixSpeed.concept_awareness_name);
+					this.setPickerTextByValue('distance', this.formData.distance, sixSpeed.distance_name);
+					
+					console.log('选择器文本回显完成');
+				} catch (error) {
+					console.error('设置选择器文本回显失败:', error);
+				}
 			},
 
 			// 根据值设置选择器文本
 			setPickerTextByValue(pickerName, value, defaultText) {
 				if (!value) {
-					this.picker_config[pickerName].text = '点击选择'
-					return
+					this.picker_config[pickerName] = this.picker_config[pickerName] || {};
+					this.picker_config[pickerName].text = '点击选择';
+					return;
+				}
+				
+				// 确保 picker_config[pickerName] 存在
+				if (!this.picker_config[pickerName]) {
+					this.picker_config[pickerName] = { options: [] };
 				}
 				
 				// 先尝试从选项中找到匹配的文本
-				const options = this.picker_config[pickerName].options || []
-				const option = options.find(opt => opt.value == value)
+				const options = this.picker_config[pickerName].options || [];
+				const option = options.find(opt => String(opt.value) === String(value));
 				
 				if (option) {
-					this.picker_config[pickerName].text = option.text
+					this.picker_config[pickerName].text = option.text;
 				} else if (defaultText) {
 					// 如果找不到匹配的选项但有默认文本，则使用默认文本
-					this.picker_config[pickerName].text = defaultText
+					this.picker_config[pickerName].text = defaultText;
 				} else {
-					this.picker_config[pickerName].text = '点击选择'
+					this.picker_config[pickerName].text = '点击选择';
 				}
 			},
 
@@ -753,67 +846,91 @@
 
 			//获取字典
 			async getDict(inputName) {
-				let key = ''
-				switch (inputName) {
-					//来源渠道
-					case 'source_channel':
-						key = 'SourceChannel'
-						break;
+				try {
+					console.log(`getDict - 开始获取字典数据: ${inputName}`);
+					
+					let key = '';
+					switch (inputName) {
+						//来源渠道
+						case 'source_channel':
+							key = 'SourceChannel';
+							break;
 						//来源
-					case 'source':
-						key = 'source'
-						break;
+						case 'source':
+							key = 'source';
+							break;
 						//购买力
-					case 'purchasing_power':
-						key = 'customer_purchasing_power'
-						break;
+						case 'purchasing_power':
+							key = 'customer_purchasing_power';
+							break;
 						//认知理念
-					case 'cognitive_idea':
-						key = 'cognitive_concept'
-						break;
+						case 'cognitive_idea':
+							key = 'cognitive_concept';
+							break;
 						//决策人
-					case 'decision_maker':
-						key = 'decision_maker'
-						break;
+						case 'decision_maker':
+							key = 'decision_maker';
+							break;
 						//客户初步意向度
-					case 'initial_intent':
-						key = 'preliminarycustomerintention'
-						break;
+						case 'initial_intent':
+							key = 'preliminarycustomerintention';
+							break;
 						//客户状态
-					case 'status':
-						key = 'kh_status'
-						break;
+						case 'status':
+							key = 'kh_status';
+							break;
 						//距离
-					case 'distance':
-						key = 'distance'
-						break;
-				}
-				if (!key) {
-					return
-				}
+						case 'distance':
+							key = 'distance';
+							break;
+						//客户分类
+						case 'customer_type':
+							key = 'customer_type';
+							break;
+						default:
+							console.warn(`未知的字典类型: ${inputName}`);
+							return;
+					}
+					
+					console.log(`getDict - 字典键值映射: ${inputName} -> ${key}`);
+					
+					// 确保 picker_config[inputName] 存在
+					if (!this.picker_config[inputName]) {
+						this.picker_config[inputName] = { options: [], text: '点击选择' };
+					}
 
-				// 使用 util.getDict 获取并缓存字典
-				let dictionary = await this.$util.getDict(key)
-				if(!dictionary || !Array.isArray(dictionary) || dictionary.length === 0){
-					uni.showToast({ title: '暂无选项', icon: 'none' })
-					return
-				}
-				
-				let arr = []
-				// 处理接口返回的数据结构 [{name: "抖音", value: "1", sort: 0, memo: ""}, ...]
-				dictionary.forEach((v) => {
-					arr.push({ text: v.name, value: v.value })
-				})
+					// 使用 util.getDict 获取并缓存字典
+					console.log(`getDict - 调用 $util.getDict('${key}')`);
+					let dictionary = await this.$util.getDict(key);
+					console.log(`getDict - 字典数据获取结果:`, dictionary);
+					
+					if(!dictionary || !Array.isArray(dictionary) || dictionary.length === 0){
+						console.warn(`字典 ${key} 数据为空`);
+						return;
+					}
+					
+					let arr = [];
+					// 处理接口返回的数据结构 [{name: "抖音", value: "1", sort: 0, memo: ""}, ...]
+					dictionary.forEach((v) => {
+						arr.push({ text: v.name, value: v.value });
+					});
 
-				if (inputName == 'source_channel') {
-					//插入到arr的头部
-					arr.unshift({
-						text: '线下',
-						value: '0',
-					})
-				}
+					if (inputName == 'source_channel') {
+						// 插入到arr的头部
+						arr.unshift({
+							text: '线下',
+							value: '0',
+						});
+					}
 
-				this.picker_config[inputName].options = arr
+					this.picker_config[inputName].options = arr;
+					
+					console.log(`getDict - 字典 ${inputName} 加载完成，选项数: ${arr.length}`);
+					return arr;
+				} catch (error) {
+					console.error(`获取字典 ${inputName} 失败:`, error);
+					return [];
+				}
 			},
 
 			//##### 查重相关 #####
@@ -1044,29 +1161,30 @@
 			},
 			//监听-下拉选择器
 			changeCicker(e) {
-				console.log('监听-下拉选择器', this.picker_input_name, e)
-				let input_name = this.picker_input_name
+				console.log('监听-下拉选择器', this.picker_input_name, e);
+				let input_name = this.picker_input_name;
 				
 				// 更新表单数据
-				this.formData[input_name] = e.value
+				this.formData[input_name] = e.value;
 				
 				// 更新选择器文本
-				this.picker_config[input_name].text = e.text
+				this.picker_config[input_name].text = e.text;
 				
 				// 特殊处理：来源选择
-				if (input_name == 'source') {
-					if (e.value == 1) {
-						// 如果选择了线上，则清空来源渠道，等待用户选择
-						this.formData.source_channel = ''
-						this.picker_config.source_channel.text = '点击选择'
+				if (input_name === 'source') {
+					// 如果选择了线上(1)，则需要选择来源渠道
+					if (e.value === '1' || e.value === 1) {
+						// 清空来源渠道，等待用户选择
+						this.formData.source_channel = '';
+						this.picker_config.source_channel.text = '点击选择';
 					} else {
 						// 如果选择了其他来源，则设置来源渠道为线下
-						this.formData.source_channel = '0' //0=线下
-						this.picker_config.source_channel.text = '线下'
+						this.formData.source_channel = '0'; // 0=线下
+						this.picker_config.source_channel.text = '线下';
 					}
 				}
 				
-				this.cancelCicker()
+				this.cancelCicker();
 			},
 			//关闭下拉选择器
 			cancelCicker() {