diff --git a/pages/market/clue/edit_clues.vue b/pages/market/clue/edit_clues.vue
index 663475b..54a399a 100644
--- a/pages/market/clue/edit_clues.vue
+++ b/pages/market/clue/edit_clues.vue
@@ -233,44 +233,7 @@
                   ></fui-input>
                 </view>
               </fui-form-item>
-              <!--客户初步意向度-->
-              <fui-form-item
-                  label="客户初步意向度"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop=""
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'
-              >
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view
-                      class="input-title"
-                      style="margin-right:14rpx;"
-                      @click="openCicker(`initial_intent`)">
-                    {{ (formData.initial_intent) ? picker_config.initial_intent.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-              <!--客户状态-->
-              <fui-form-item
-                  label="客户状态"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop=""
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'
-              >
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view
-                      class="input-title"
-                      style="margin-right:14rpx;"
-                      @click="openCicker(`status`)">
-                    {{ (formData.status) ? picker_config.status.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
+
             </view>
           </fui-form>
         </view>
@@ -287,6 +250,44 @@
 
           <view class="title" style="margin-top: 20rpx;">六要素信息</view>
           <view class="input-style">
+            <!--客户初步意向度-->
+            <fui-form-item
+                label="客户初步意向度"
+                asterisk asteriskPosition="right"
+                labelSize='26'
+                prop=""
+                background='#434544'
+                labelColor='#fff'
+                :bottomBorder='false'
+            >
+              <view class="input-title" style="margin-right:14rpx;">
+                <view
+                    class="input-title"
+                    style="margin-right:14rpx;"
+                    @click="openCicker(`initial_intent`)">
+                  {{ (formData.initial_intent) ? picker_config.initial_intent.text : '点击选择' }}
+                </view>
+              </view>
+            </fui-form-item>
+            <!--客户状态-->
+            <fui-form-item
+                label="客户状态"
+                asterisk asteriskPosition="right"
+                labelSize='26'
+                prop=""
+                background='#434544'
+                labelColor='#fff'
+                :bottomBorder='false'
+            >
+              <view class="input-title" style="margin-right:14rpx;">
+                <view
+                    class="input-title"
+                    style="margin-right:14rpx;"
+                    @click="openCicker(`status`)">
+                  {{ (formData.status) ? picker_config.status.text : '点击选择' }}
+                </view>
+              </view>
+            </fui-form-item>
             <!--购买力-->
             <fui-form-item
                 label="购买力"
@@ -405,6 +406,51 @@
                 ></fui-input>
               </view>
             </fui-form-item>
+            <!--一访情况-->
+            <fui-form-item
+                label="一访情况"
+                asteriskPosition="right"
+                labelSize='26'
+                prop="title"
+                background='#434544'
+                labelColor='#fff'
+                :bottomBorder='false'>
+              <view class="input-title" style="margin-right:14rpx;">
+                <fui-textarea placeholder="点击填写" style="text-align: left;" v-model="formData.first_visit_status" ></fui-textarea>
+
+<!--                <fui-input-->
+<!--                    :borderBottom="false"-->
+<!--                    :padding="[0]"-->
+<!--                    placeholder="点击填写"-->
+<!--                    v-model="formData.first_visit_status"-->
+<!--                    backgroundColor="#434544"-->
+<!--                    size="26"-->
+<!--                    color="#fff"-->
+<!--                ></fui-input>-->
+              </view>
+            </fui-form-item>
+            <!--二访情况-->
+            <fui-form-item
+                label="二访情况"
+                asteriskPosition="right"
+                labelSize='26'
+                prop="title"
+                background='#434544'
+                labelColor='#fff'
+                :bottomBorder='false'>
+              <view class="input-title" style="margin-right:14rpx;">
+                <fui-textarea placeholder="点击填写" borderColor="#292929" style="text-align: left;" v-model="formData.second_visit_status"></fui-textarea>
+<!--                <fui-input-->
+<!--                    :borderBottom="false"-->
+<!--                    :padding="[0]"-->
+<!--                    placeholder="点击填写"-->
+<!--                    v-model="formData.second_visit_status"-->
+<!--                    backgroundColor="#434544"-->
+<!--                    size="26"-->
+<!--                    color="#fff"-->
+<!--                ></fui-input>-->
+              </view>
+            </fui-form-item>
           </view>
         </fui-form>
       </view>
@@ -416,7 +462,7 @@
 
 
     <!-- 年月日-选择时间 -->
-    <fui-date-picker :show="date_picker_show" type="5" @change="change_date" @cancel="cancel_date"></fui-date-picker>
+    <fui-date-picker :show="date_picker_show" type="3" @change="change_date" @cancel="cancel_date"></fui-date-picker>
 
     <!-- 选择器 -->
     <fui-picker
@@ -610,6 +656,8 @@ export default {
         staff_id:'',//人员ID
         distance:'',//距离
         optional_class_time:'',//可选上课时间
+        first_visit_status:'',//一访情况
+        second_visit_status:'',//二访情况
       },
 
       //下拉选择器相关
@@ -740,6 +788,7 @@ export default {
 
       let customerResource = res.data.customerResource || {}//客户资源详情
       let sixSpeed = res.data.customerResource.sixSpeed || {}//六要素详情
+      console.log('12313',sixSpeed)
       console.log('详情',res.data)
 
 
@@ -765,11 +814,13 @@ export default {
         staff_id: sixSpeed.staff_id || '',//人员ID
         distance: sixSpeed.distance || '',//距离
         promised_visit_time: sixSpeed.promised_visit_time || '',//承诺到访时间
-        optional_class_time: sixSpeed.preferred_class_time || ''//可选上课时间
+        optional_class_time: sixSpeed.preferred_class_time || '',//可选上课时间
+        first_visit_status:sixSpeed.first_visit_status || '',//一访情况
+        second_visit_status:sixSpeed.second_visit_status || '',//二访情况
       }
 
-      this.formData.promised_visit_time =  this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d H:i');//格式化时间(Y-m-d H:i)
-      this.formData.optional_class_time =  this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d H:i');//格式化时间(Y-m-d H:i)
+      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.promised_visit_time, 'Y-m-d');//格式化时间(Y-m-d H:i)
 
       //下拉窗文本回显
       this.picker_config.source_channel.text = customerResource.source_channel_name || '点击选择'//来源渠道
@@ -1150,7 +1201,7 @@ export default {
       //跟进时间
       let val = (e.result ?? '')
       if(val){
-        val = val + ':00'
+        val = val
       }
 
       let input_name = this.data_picker_input_name