diff --git a/App.vue b/App.vue
index f52eeba..4db626b 100644
--- a/App.vue
+++ b/App.vue
@@ -43,4 +43,5 @@
 
 <style lang="scss">
 	@import '~@/static/styles/app.scss';
+	@import "@/uni.scss";
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b8379c2..342b3f6 100644
--- a/pages.json
+++ b/pages.json
@@ -573,6 +573,24 @@
         "navigationBarBackgroundColor": "#fff",
         "navigationBarTextStyle": "black"
       }
+    },
+    {
+      "path": "pages/market/clue/class_arrangement",
+      "style": {
+        "navigationBarTitleText": "课程安排",
+        "navigationStyle": "default",
+        "navigationBarBackgroundColor": "#232323",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/market/clue/class_arrangement_detail",
+      "style": {
+        "navigationBarTitleText": "课程安排详情",
+        "navigationStyle": "default",
+        "navigationBarBackgroundColor": "#232323",
+        "navigationBarTextStyle": "white"
+      }
     }
 
 
diff --git a/pages/market/clue/add_clues.vue b/pages/market/clue/add_clues.vue
index e318d85..0b69d93 100644
--- a/pages/market/clue/add_clues.vue
+++ b/pages/market/clue/add_clues.vue
@@ -26,11 +26,52 @@
 
             <view class="title" style="margin-top: 20rpx;">基础信息</view>
             <view class="input-style">
-
+				<!--姓名-->
+				<fui-form-item
+				    label="姓名"
+				    labelSize='26'
+					asterisk asteriskPosition="right"
+				    prop="title"
+				    background='#434544'
+				    labelColor='#fff'
+				    :bottomBorder='false'>
+				  <view class="input-title" style="margin-right:14rpx;">
+				    <fui-input
+				        :borderBottom="false"
+				        :padding="[0]"
+				        placeholder="点击填写"
+				        v-model="formData.name"
+				        backgroundColor="#434544"
+				        size="26"
+				        color="#fff"
+				    ></fui-input>
+				  </view>
+				</fui-form-item>
+              <!--联系电话-->
+              <fui-form-item
+                  label="联系电话"
+                  asterisk asteriskPosition="right"
+                  labelSize='26'
+                  prop="title"
+                  background='#434544'
+                  labelColor='#fff'
+                  :bottomBorder='false'>
+                <view class="input-title" style="margin-right:14rpx;">
+                  <fui-input
+                      :borderBottom="false"
+                      :padding="[0]"
+                      placeholder="点击填写"
+                      v-model="formData.phone_number"
+                      backgroundColor="#434544"
+                      size="26"
+                      color="#fff"
+                      @blur="handlePhoneBlur"
+                  ></fui-input>
+                </view>
+              </fui-form-item>
               <!--来源-->
               <fui-form-item
                   label="来源"
-                  asterisk asteriskPosition="right"
                   labelSize='26'
                   prop=""
                   background='#434544'
@@ -50,7 +91,6 @@
               <fui-form-item
                   v-if="formData.source == 1"
                   label="来源渠道"
-                  asterisk asteriskPosition="right"
                   labelSize='26'
                   prop=""
                   background='#434544'
@@ -71,7 +111,7 @@
 <!--
               <fui-form-item
                   label="顾问"
-                  asterisk asteriskPosition="right"
+
                   labelSize='26'
                   prop=""
                   background='#434544'
@@ -91,7 +131,6 @@
               <fui-form-item
                   v-show="false"
                   label="顾问"
-                  asterisk asteriskPosition="right"
                   labelSize='26'
                   prop="title"
                   background='#434544'
@@ -110,33 +149,11 @@
                   ></fui-input>
                 </view>
               </fui-form-item>
-              <!--姓名-->
-              <fui-form-item
-                  label="姓名"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      placeholder="点击填写"
-                      v-model="formData.name"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#fff"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
+
               <!--年龄-->
               <fui-form-item
                   label="年龄"
                   labelSize='26'
-                  asterisk
-                  asteriskPosition="right"
                   prop="age"
                   background='#434544'
                   labelColor='#fff'
@@ -149,7 +166,6 @@
               <fui-form-item
                   label="性别"
                   labelSize='26'
-                  asterisk asteriskPosition="right"
                   prop="age"
                   background='#434544'
                   labelColor='#fff'
@@ -173,32 +189,11 @@
                   </fui-radio-group>
                 </view>
               </fui-form-item>
-              <!--联系电话-->
-              <fui-form-item
-                  label="联系电话"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      placeholder="点击填写"
-                      v-model="formData.phone_number"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#fff"
-                      @blur="handlePhoneBlur"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
+
               <!--需求-->
               <fui-form-item
                   label="需求"
-                  asterisk asteriskPosition="right"
+
                   labelSize='26'
                   prop="title"
                   background='#434544'
@@ -219,7 +214,7 @@
               <!--决策人-->
               <fui-form-item
                   label="决策人"
-                  asterisk asteriskPosition="right"
+
                   labelSize='26'
                   prop="title"
                   background='#434544'
@@ -237,7 +232,7 @@
               <!--客户初步意向度-->
               <fui-form-item
                   label="客户初步意向度"
-                  asterisk asteriskPosition="right"
+
                   labelSize='26'
                   prop=""
                   background='#434544'
@@ -257,7 +252,7 @@
               <fui-form-item
                   v-show="false"
                   label="客户状态"
-                  asterisk asteriskPosition="right"
+
                   labelSize='26'
                   prop=""
                   background='#434544'
@@ -292,7 +287,6 @@
             <!--购买力-->
             <fui-form-item
                 label="购买力"
-                asterisk asteriskPosition="right"
                 labelSize='26'
                 prop=""
                 background='#434544'
@@ -311,7 +305,6 @@
             <!--认知理念-->
             <fui-form-item
                 label="认知理念"
-                asterisk asteriskPosition="right"
                 labelSize='26'
                 prop=""
                 background='#434544'
@@ -330,7 +323,6 @@
             <!--可选上课时间-->
             <fui-form-item
                 label="可选上课时间"
-                asterisk asteriskPosition="right"
                 labelSize='26'
                 prop=""
                 background='#434544'
@@ -349,7 +341,6 @@
             <!--承诺到访时间-->
             <fui-form-item
                 label="承诺到访时间"
-                asterisk asteriskPosition="right"
                 labelSize='26'
                 prop=""
                 background='#434544'
@@ -368,7 +359,6 @@
             <!--距离-->
             <fui-form-item
                 label="距离"
-                asterisk asteriskPosition="right"
                 labelSize='26'
                 prop="title"
                 background='#434544'
@@ -387,7 +377,6 @@
             <!--沟通备注-->
             <fui-form-item
                 label="沟通备注"
-                asterisk asteriskPosition="right"
                 labelSize='26'
                 prop="title"
                 background='#434544'
@@ -904,18 +893,6 @@ export default {
         })
       })
 
-      if(inputName == 'source_channel'){
-          //插入到arr的头部
-          arr.unshift({
-            text: '线下',
-            value: '0',
-          })
-      }
-      if(inputName == 'status'){
-        //插入到arr的头部
-        console.log(arr)
-      }
-
       this.picker_config[inputName].options = arr
     },
 
@@ -1205,26 +1182,6 @@ export default {
     },
     //表单验证
     async validatorForm(data) {
-
-      //客户基础信息
-      //来源渠道
-      if(!data.source_channel.length){
-        uni.showToast({
-          title: '请选择来源渠道',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //来源
-      if(!data.source){
-        uni.showToast({
-          title: '请选择来源',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
       //姓名
       if(!data.name){
         uni.showToast({
@@ -1234,24 +1191,6 @@ export default {
         this.nextStep('0')
         return false
       }
-      //年龄
-      if(!data.age){
-        uni.showToast({
-          title: '年龄必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //性别
-      if(!data.gender){
-        uni.showToast({
-          title: '性别必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
       //电话
       if(!data.phone_number){
         uni.showToast({
@@ -1261,100 +1200,6 @@ export default {
         this.nextStep('0')
         return false
       }
-
-      //需求
-      if(!data.demand){
-        uni.showToast({
-          title: '需求必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //决策人
-      if(!data.decision_maker){
-        uni.showToast({
-          title: '决策人必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //客户初步意向度必填
-      if(!data.initial_intent){
-        uni.showToast({
-          title: '客户初步意向度必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //客户状态
-      if(!data.status){
-        uni.showToast({
-          title: '客户状态必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-
-
-      //##### 六要素信息 #####
-      //购买力
-      if(!data.purchasing_power){
-        uni.showToast({
-          title: '购买力必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //认知理念
-      if(!data.cognitive_idea){
-        uni.showToast({
-          title: '认知理念必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //沟通备注
-      if(!data.communication){
-        uni.showToast({
-          title: '沟通备注必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //承诺到访时间
-      if(!data.promised_visit_time){
-        uni.showToast({
-          title: '承诺到访时间必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //距离
-      if(!data.distance){
-        uni.showToast({
-          title: '距离必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //可选上课时间
-      if(!data.optional_class_time){
-        uni.showToast({
-          title: '可选上课时间必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
       return true
     },
     //提交
diff --git a/pages/market/clue/class_arrangement.vue b/pages/market/clue/class_arrangement.vue
new file mode 100644
index 0000000..11a5c4d
--- /dev/null
+++ b/pages/market/clue/class_arrangement.vue
@@ -0,0 +1,196 @@
+<template>
+  <view class="class-arrange-root">
+    <!-- 顶部日期选择 -->
+    <view class="date-bar">
+      <view class="date-item" v-for="(item, idx) in weekList" :key="idx" :class="{active: idx === selectedDayIndex}">
+        <view class="week">{{ item.week }}</view>
+        <view class="day">{{ item.day }}</view>
+      </view>
+    </view>
+    <!-- "查看更多"按钮移到日期条下方 -->
+    <view class="more-bar-wrapper">
+      <view class="more-bar" @click="openCalendar">
+        <text>查看更多</text>
+        <uni-icons type="arrowdown" size="18" color="#bdbdbd" />
+      </view>
+    </view>
+    <!-- 日历底部弹窗 -->
+    <uni-popup ref="calendarPopup" type="bottom">
+      <uni-calendar @confirm="onCalendarConfirm" @close="closeCalendar" />
+    </uni-popup>
+
+    <!-- 课程卡片列表 -->
+    <view class="course-list">
+      <view class="course-card" v-for="(course, idx) in courseList" :key="idx">
+        <view class="card-header">
+          <view class="status-end">已结束</view>
+        </view>
+        <view class="card-body">
+          <view class="row">时间：{{ course.date }}</view>
+          <view class="row">教室：{{ course.classroom }}</view>
+          <view class="row">课程：{{ course.name }}</view>
+          <view class="row">人数：{{ course.count }}</view>
+        </view>
+        <view class="card-footer">
+          <view class="sign-info">已签到学生 (0/{{ course.count }})</view>
+          <button class="detail-btn" @click="viewDetail(course)">详情</button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      weekList: [
+        { week: '星期一', day: 11 },
+        { week: '星期二', day: 12 },
+        { week: '星期三', day: 13 },
+        { week: '星期四', day: 14 },
+        { week: '星期五', day: 15 },
+        { week: '星期六', day: 16 },
+        { week: '星期日', day: 17 },
+      ],
+      selectedDayIndex: 4,
+      courseList: [
+        {
+          date: '2025-06-15',
+          classroom: '时间范围教室',
+          name: '大课7+1类型',
+          count: 10,
+        },
+        {
+          date: '2025-06-15',
+          classroom: '时间范围教室',
+          name: '大课5+1',
+          count: 10,
+        },
+      ],
+    };
+  },
+  methods: {
+    openCalendar() {
+      this.$refs.calendarPopup.open();
+    },
+    closeCalendar() {
+      this.$refs.calendarPopup.close();
+    },
+    viewDetail(course) {
+      // 跳转到课程详情页
+      this.$navigateTo({
+        url: '/pages/market/clue/class_arrangement_detail?date=' + course.date
+      });
+    },
+    onCalendarConfirm(e) {
+      this.closeCalendar();
+      // 这里可以处理选中的日期 e.fulldate
+      uni.showToast({ title: '选择日期：' + e.fulldate, icon: 'none' });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.class-arrange-root {
+  background: #232323;
+  min-height: 100vh;
+  padding-bottom: 30rpx;
+}
+.date-bar {
+  display: flex;
+  align-items: center;
+  background: #232323;
+  padding: 0 0 10rpx 0;
+  overflow-x: auto;
+  border-bottom: 1px solid #333;
+  .date-item {
+    flex: 1;
+    text-align: center;
+    color: #bdbdbd;
+    padding: 16rpx 0 0 0;
+    .week {
+      font-size: 22rpx;
+    }
+    .day {
+      font-size: 28rpx;
+      margin-top: 4rpx;
+    }
+    &.active {
+      color: #29d3b4;
+      .day {
+        border-radius: 50%;
+        background: #333;
+        color: #29d3b4;
+        padding: 2rpx 10rpx;
+      }
+    }
+  }
+}
+.more-bar-wrapper {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin: 10rpx 0 0 0;
+}
+.more-bar {
+  display: flex;
+  align-items: center;
+  color: #bdbdbd;
+  font-size: 22rpx;
+  cursor: pointer;
+  background: #333;
+  border-radius: 20rpx;
+  padding: 8rpx 24rpx;
+}
+.course-list {
+  margin-top: 20rpx;
+  .course-card {
+    background: #434544;
+    border-radius: 10rpx;
+    margin: 0 0 20rpx 0;
+    padding: 0 0 20rpx 0;
+    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08);
+    .card-header {
+      display: flex;
+      justify-content: flex-end;
+      padding: 10rpx 20rpx 0 0;
+      .status-end {
+        background: #e95c6b;
+        color: #fff;
+        border-radius: 10rpx;
+        padding: 4rpx 18rpx;
+        font-size: 22rpx;
+      }
+    }
+    .card-body {
+      padding: 0 20rpx;
+      .row {
+        color: #fff;
+        font-size: 24rpx;
+        margin: 8rpx 0;
+      }
+    }
+    .card-footer {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 20rpx;
+      .sign-info {
+        color: #bdbdbd;
+        font-size: 22rpx;
+      }
+      .detail-btn {
+        background: transparent;
+        border: 2rpx solid #ffd86b;
+        color: #ffd86b;
+        border-radius: 8rpx;
+        padding: 6rpx 24rpx;
+        font-size: 24rpx;
+        margin-left: 10rpx;
+      }
+    }
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/pages/market/clue/class_arrangement_detail.vue b/pages/market/clue/class_arrangement_detail.vue
new file mode 100644
index 0000000..5a65e69
--- /dev/null
+++ b/pages/market/clue/class_arrangement_detail.vue
@@ -0,0 +1,148 @@
+<template>
+  <view class="detail-root">
+    <view class="header">
+      <view class="title">课程安排详情</view>
+      <view class="date">日期：{{ date }}</view>
+    </view>
+    <view class="section">
+      <view class="section-title">学员列表</view>
+      <view class="student-list">
+        <view v-for="(stu, idx) in students" :key="idx" class="student-item">
+          <view class="avatar">{{ stu.name.charAt(0) }}</view>
+          <view class="info">
+            <view class="name">{{ stu.name }}</view>
+            <view class="desc">{{ stu.desc }}</view>
+          </view>
+        </view>
+        <view
+          v-for="n in emptyArray"
+          :key="n"
+          class="student-item empty"
+          @tap="addStudent"
+          :data-index="n"
+        >
+          <view class="avatar empty-avatar">+</view>
+          <view class="info">
+            <view class="name">空位</view>
+            <view class="desc">点击添加学员</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      date: '',
+      students: [
+        { name: '张三', desc: '已签到' },
+        { name: '李四', desc: '未签到' },
+      ],
+      maxCount: 5,
+    };
+  },
+  computed: {
+    emptyCount() {
+      return this.maxCount - this.students.length;
+    },
+    emptyArray() {
+      return Array.from({length: this.emptyCount}, (v, i) => i + 1);
+    },
+  },
+  onLoad(query) {
+    this.date = query.date || '';
+  },
+  methods: {
+    addStudent(e) {
+      const n = e.currentTarget.dataset.index;
+      uni.showToast({ title: '添加学员功能待实现，空位号：' + n, icon: 'none' });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.detail-root {
+  background: #232323;
+  min-height: 100vh;
+  padding-bottom: 30rpx;
+}
+.header {
+  padding: 40rpx 30rpx 20rpx 30rpx;
+  .title {
+    color: #fff;
+    font-size: 36rpx;
+    font-weight: bold;
+  }
+  .date {
+    color: #29d3b4;
+    font-size: 26rpx;
+    margin-top: 10rpx;
+  }
+}
+.section {
+  margin: 30rpx;
+  background: #434544;
+  border-radius: 16rpx;
+  padding: 30rpx 20rpx;
+}
+.section-title {
+  color: #ffd86b;
+  font-size: 28rpx;
+  margin-bottom: 20rpx;
+}
+.student-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+}
+.student-item {
+  background: #333;
+  border-radius: 12rpx;
+  display: flex;
+  align-items: center;
+  padding: 18rpx 24rpx;
+  min-width: 260rpx;
+  .avatar {
+    width: 60rpx;
+    height: 60rpx;
+    border-radius: 50%;
+    background: #29d3b4;
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    margin-right: 18rpx;
+  }
+  .info {
+    .name {
+      color: #fff;
+      font-size: 28rpx;
+    }
+    .desc {
+      color: #bdbdbd;
+      font-size: 22rpx;
+      margin-top: 4rpx;
+    }
+  }
+  &.empty {
+    border: 2rpx dashed #ffd86b;
+    background: #232323;
+    .avatar.empty-avatar {
+      background: #ffd86b;
+      color: #232323;
+      font-size: 36rpx;
+    }
+    .info .name {
+      color: #ffd86b;
+    }
+    .info .desc {
+      color: #ffd86b;
+    }
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue
index bec3426..a356f69 100644
--- a/pages/market/clue/clue_info.vue
+++ b/pages/market/clue/clue_info.vue
@@ -28,15 +28,19 @@
                           class="drop-image-x">
                       </image>
                     </view>
-                    <view class="title-x">意向：{{ clientInfo.customerResource.initial_intent_name }}</view>
                   </view>
 
                 </view>
                 <view class="course_box_top_below-right">
-<!--                  <view v-if="clientInfo.customerResource.is_zdgz == 1">-->
-<!--                    <image :src="$util.img('/uniapp_src/static/images/index/star.png')" class="drop-image-star"></image>-->
-<!--                  </view>-->
-<!--                  <view class="title-x">重点关注</view>-->
+                  <!-- 操作按钮 -->
+                  <view class="action-buttons">
+                    <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">
+                      <image class="btn-icon" :src="$util.img('/uniapp_src/static/images/index/message.png')"></image>
+                    </view>
+                  </view>
                 </view>
               </view>
             </view>
@@ -166,7 +170,7 @@
               <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
               <view>课程：课程名称1</view>
             </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
+            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
           </view>
         </view>
         <view style="margin: 16rpx;">
@@ -187,7 +191,7 @@
               <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
               <view>课程：课程名称1</view>
             </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
+            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
           </view>
         </view>
         <view style="margin: 16rpx;">
@@ -208,7 +212,7 @@
               <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
               <view>课程：课程名称1</view>
             </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
+            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
           </view>
         </view>
         <view style="margin: 16rpx;">
@@ -229,7 +233,7 @@
               <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
               <view>课程：课程名称1</view>
             </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
+            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
           </view>
         </view>
         <view style="margin: 16rpx;">
@@ -250,7 +254,7 @@
               <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
               <view>课程：课程名称1</view>
             </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
+            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
           </view>
         </view>
         <view style="height: 200rpx;"></view>
@@ -259,7 +263,7 @@
 <!--      底部按钮组-->
       <view class="bottom-label">
         <view @click="openViewEditClues()">编辑详情</view>
-        <view @click="callTel(clientInfo.student_phone)">拨打电话</view>
+        <view @click="openViewEditClassLog()">课程安排</view>
         <view @click="openViewEditCluesLog()">修改记录</view>
         <view @click="openViewOrder()">订单列表</view>
       </view>
@@ -407,6 +411,19 @@
         })
       },
 
+      //跳转页面-课程安排
+      openViewEditClassLog() {
+        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 || ''//员工姓名
+
+        this.$navigateTo({
+          url: `/pages/market/clue/class_arrangement?resource_id=${resource_id}&resource_name=${resource_name}&staff_id=${staff_id}&staff_id_name=${staff_id_name}`
+        })
+      },
+
       //跳转页面-转接跟进任务
       openViewNewTask() {
         this.$navigateTo({
@@ -453,7 +470,31 @@
         });
       },
 
+      // 拨打电话
+      handleMakeCall() {
+        if (!this.clientInfo.customerResource.phone_number) {
+          uni.showToast({
+            title: '电话号码为空',
+            icon: 'none'
+          });
+          return;
+        }
+        this.callTel(this.clientInfo.customerResource.phone_number);
+      },
 
+      // 发送消息
+      handleSendMessage() {
+        if (!this.clientInfo.customerResource.staff_id) {
+          uni.showToast({
+            title: '未找到相关人员',
+            icon: 'none'
+          });
+          return;
+        }
+        this.$navigateTo({
+          url: `/pages/common/im_chat_info?hair_staff_id=${this.clientInfo.customerResource.staff_id}`
+        });
+      },
 
 			//切换标签
 			switch_tags(type){
@@ -677,4 +718,24 @@
 		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 92c5cf6..78b99af 100644
--- a/pages/market/clue/edit_clues.vue
+++ b/pages/market/clue/edit_clues.vue
@@ -1,1508 +1,1308 @@
 <!--编辑客户-->
 <template>
-  <view class="assemble">
-    <fui-segmented-control
-        style="padding-top: 30rpx;"
-        :values="optionTable"
-        :current="(Number(optionTableId))"
-        type="text"
-        activeColor="#29d3b4"
-        color="#fff"
-        @click="segmented">
-    </fui-segmented-control>
-
-
-<!--    添加客户-->
-    <view style="margin-top: 20rpx;" v-if="optionTableId == 0">
-<!--        <view class="search_box">-->
-<!--          <view class="input_box">-->
-<!--            <input type="text" v-model="student_name" placeholder="请输入客户名称">-->
-<!--          </view>-->
-<!--          <view class="btn" @click="clientList()">查重</view>-->
-<!--        </view>-->
-
-        <view class="form-style">
-          <fui-form ref="form" top="0" :model="formData" :show="false">
-
-            <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(`source`)">
-                    {{ (formData.source) ? picker_config.source.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-
-              <!--来源渠道-->
-              <fui-form-item
-                  v-if="formData.source == 1"
-                  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(`source_channel`)">
-                    {{ (formData.source_channel) ? picker_config.source_channel.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(`consultant`)">
-                    {{ (formData.consultant) ? picker_config.consultant.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
--->
-              <fui-form-item
-                  label="顾问"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      :disabled="true"
-                      placeholder="点击填写"
-                      v-model="picker_config.consultant.text"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#808080"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
-              <!--姓名-->
-              <fui-form-item
-                  label="姓名"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      placeholder="点击填写"
-                      v-model="formData.name"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#fff"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
-              <!--年龄-->
-              <fui-form-item
-                  label="年龄"
-                  labelSize='26'
-                  asterisk
-                  asteriskPosition="right"
-                  prop="age"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input-number signColor="#FFF" :min="3" :max="18" v-model="formData.age"></fui-input-number>
-                </view>
-              </fui-form-item>
-              <!--性别-->
-              <fui-form-item
-                  label="性别"
-                  labelSize='26'
-                  asterisk asteriskPosition="right"
-                  prop="age"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-radio-group name="radio" v-model="formData.gender" @change="changeSex">
-                    <view class="fui-list__item" style="display: flex;justify-content: flex-end;">
-                      <fui-label>
-                        <view class="fui-align__center">
-                          <fui-radio value="male" checked></fui-radio>
-                          <text class="fui-text">男</text>
-                        </view>
-                      </fui-label>
-                      <fui-label :margin="['0','0','0','40rpx']">
-                        <view class="fui-align__center">
-                          <fui-radio value="female"></fui-radio>
-                          <text class="fui-text">女</text>
-                        </view>
-                      </fui-label>
-                    </view>
-                  </fui-radio-group>
-                </view>
-              </fui-form-item>
-              <!--联系电话-->
-              <fui-form-item
-                  label="联系电话"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      placeholder="点击填写"
-                      v-model="formData.phone_number"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#fff"
-                      @blur="handlePhoneBlur"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
-              <!--需求-->
-              <fui-form-item
-                  label="需求"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      placeholder="点击填写"
-                      v-model="formData.demand"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#fff"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
-              <!--决策人-->
-              <fui-form-item
-                  label="决策人"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view
-                      class="input-title"
-                      style="margin-right:14rpx;"
-                      @click="openCicker(`decision_maker`)">
-                    {{ (formData.decision_maker) ? picker_config.decision_maker.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-
-            </view>
-          </fui-form>
-        </view>
-
-        <view class="fui-btn__box">
-          <fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="nextStep('1')">下一步</fui-button>
-        </view>
-    </view>
-
-<!--    添加六要素-->
-    <view style="margin-top: 20rpx;" v-if="optionTableId == 1">
-      <view class="form-style">
-        <fui-form ref="form" top="0" :model="formData" :show="false">
-
-          <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="购买力"
-                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(`purchasing_power`)">
-                  {{ (formData.purchasing_power) ? picker_config.purchasing_power.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(`cognitive_idea`)">
-                  {{ (formData.cognitive_idea) ? picker_config.cognitive_idea.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="openDate(`optional_class_time`)">
-                  {{ (formData.optional_class_time) ? formData.optional_class_time : '点击选择' }}
-                </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="openDate(`promised_visit_time`)">
-                  {{ (formData.promised_visit_time) ? formData.promised_visit_time : '点击选择' }}
-                </view>
-              </view>
-            </fui-form-item>
-            <!--距离-->
-            <fui-form-item
-                label="距离"
-                asterisk asteriskPosition="right"
-                labelSize='26'
-                prop="title"
-                background='#434544'
-                labelColor='#fff'
-                :bottomBorder='false'>
-              <view class="input-title" style="margin-right:14rpx;">
-                <view
-                    class="input-title"
-                    style="margin-right:14rpx;"
-                    @click="openCicker(`distance`)">
-                  {{ (formData.distance) ? picker_config.distance.text : '点击选择' }}
-                </view>
-              </view>
-            </fui-form-item>
-            <!--沟通备注-->
-            <fui-form-item
-                label="沟通备注"
-                asterisk asteriskPosition="right"
-                labelSize='26'
-                prop="title"
-                background='#434544'
-                labelColor='#fff'
-                :bottomBorder='false'>
-              <view class="input-title" style="margin-right:14rpx;">
-                <fui-input
-                    :borderBottom="false"
-                    :padding="[0]"
-                    placeholder="点击填写"
-                    v-model="formData.communication"
-                    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="点击填写" 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>
-      <view class="fui-btn__box">
-        <fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="submit">保存</fui-button>
-      </view>
-    </view>
-
-
-
-    <!-- 年月日-选择时间 -->
-    <fui-date-picker :show="date_picker_show" type="3" @change="change_date" @cancel="cancel_date"></fui-date-picker>
-
-    <!-- 选择器 -->
-    <fui-picker
-        :linkage='picker_linkage'
-        :options="picker_options"
-        :layer="1"
-        :show="picker_show"
-        @change="changeCicker"
-        @cancel="cancelCicker">
-    </fui-picker>
-
-<!--    查重弹出层-->
-    <fui-bottom-popup :show="showDuplicateCheck" @close="closeDuplicateCheck">
-      <view class="fui-scroll__wrap">
-        <view class="title_box">
-          <view></view>
-          <view class="title">查重结果</view>
-          <view class="close" @tap="closeDuplicateCheck">
-            <fui-icon name="close" :size="48"></fui-icon>
-          </view>
-        </view>
-
-        <scroll-view scroll-y class="section_ul">
-          <!--暂无数据时展示-->
-          <view class="not_list" v-if="clientUserList.length == 0">
-            <image :src="$util.img('/uniapp_src/static/images/index/zan_wu.png')" class="img"></image>
-            <view class="title">暂无重复客户</view>
-          </view>
-
-          <!--数据列表-->
-          <view class="ul" v-else>
-            <view class="li" v-for="(v,k) in clientUserList" :key="k">
-              <view class="left_box" @click="openViewClueInfo(v)">
-                <view class="box_1">
-                  <image
-                      class="img"
-                      :src="$util.img('/uniapp_src/static/images/index/myk.png')"></image>
-                  <view class="name">{{v.student_name}}</view>
-                  <view class="tag">{{ v.is_status == 1 ? '试听' : '成交' }}</view>
-                </view>
-                <view class="box_2">
-                  <view class="left">
-                    <view class="name">首选联系人：{{v.contact_name}}</view>
-<!--                    <view class="call">妈妈</view>-->
-                  </view>
-                </view>
-                <view class="box_3">
-                  <view class="left">
-                    {{ $util.formatToDateTime((v.follow && v.follow.follow_up_time || ''), 'm-d H:i') }} 跟进
-                  </view>
-                  <view class="right">
-
-                    <image
-                        v-if="['A+','A','A-'].includes(v.follow && v.follow.initial_customer_intent || '')"
-                        :src="$util.img('/uniapp_src/static/images/index/intention3.png')"
-                        class="img"
-                    ></image>
-                    <image
-                        v-else-if="['B+','B','B-'].includes(v.follow && v.follow.initial_customer_intent || '')"
-                        :src="$util.img('/uniapp_src/static/images/index/intention2.png')"
-                        class="img"
-                    ></image>
-                    <image
-                        v-else
-                        :src="$util.img('/uniapp_src/static/images/index/intention1.png')"
-                        class="img"
-                    ></image>
-
-                    <view>意向：{{ v.follow && v.follow.initial_customer_intent || '' }}</view>
-                  </view>
-                </view>
-              </view>
-              <view class="right_box">
-                <image class="img" :src="$util.img('/uniapp_src/static/images/index/message.png')" @click="openViewMyMessage(v)"></image>
-                <image class="img" :src="$util.img('/uniapp_src/static/images/index/phone.png')" @click="dialTel(v)"></image>
-              </view>
-            </view>
-          </view>
-
-        </scroll-view>
-
-      </view>
-    </fui-bottom-popup>
-
-  </view>
+	<view class="assemble">
+		<fui-segmented-control style="padding-top: 30rpx;" :values="optionTable" :current="(Number(optionTableId))"
+			type="text" activeColor="#29d3b4" color="#fff" @click="segmented">
+		</fui-segmented-control>
+
+
+		<!--    添加客户-->
+		<view style="margin-top: 20rpx;" v-if="optionTableId == 0">
+			<!--        <view class="search_box">-->
+			<!--          <view class="input_box">-->
+			<!--            <input type="text" v-model="student_name" placeholder="请输入客户名称">-->
+			<!--          </view>-->
+			<!--          <view class="btn" @click="clientList()">查重</view>-->
+			<!--        </view>-->
+
+			<view class="form-style">
+				<fui-form ref="form" top="0" :model="formData" :show="false">
+
+					<view class="title" style="margin-top: 20rpx;">基础信息</view>
+					<view class="input-style">
+						<!--姓名-->
+						<fui-form-item label="姓名" asterisk asteriskPosition="right" labelSize='26' prop="title"
+							background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<fui-input :borderBottom="false" :padding="[0]" placeholder="点击填写"
+									v-model="formData.name" backgroundColor="#434544" size="26"
+									color="#fff"></fui-input>
+							</view>
+						</fui-form-item>
+						<!--联系电话-->
+						<fui-form-item label="联系电话" asterisk asteriskPosition="right" labelSize='26' prop="title"
+							background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<fui-input :borderBottom="false" :padding="[0]" placeholder="点击填写"
+									v-model="formData.phone_number" backgroundColor="#434544" size="26" color="#fff"
+									@blur="handlePhoneBlur"></fui-input>
+							</view>
+						</fui-form-item>
+						<!--来源-->
+						<fui-form-item label="来源"  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(`source`)">
+									{{ (formData.source) ? picker_config.source.text : '点击选择' }}
+								</view>
+							</view>
+						</fui-form-item>
+
+						<!--来源渠道-->
+						<fui-form-item v-if="formData.source == 1" label="来源渠道" 
+							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(`source_channel`)">
+									{{ (formData.source_channel) ? picker_config.source_channel.text : '点击选择' }}
+								</view>
+							</view>
+						</fui-form-item>
+
+						<!--顾问-->
+						<fui-form-item v-show="false" label="顾问"  labelSize='26'
+							prop="title" background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<fui-input :borderBottom="false" :padding="[0]" :disabled="true" placeholder="点击填写"
+									v-model="picker_config.consultant.text" backgroundColor="#434544" size="26"
+									color="#808080"></fui-input>
+							</view>
+						</fui-form-item>
+
+						<!--年龄-->
+						<fui-form-item label="年龄" labelSize='26'  prop="age"
+							background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<fui-input-number signColor="#FFF" :min="3" :max="18"
+									v-model="formData.age"></fui-input-number>
+							</view>
+						</fui-form-item>
+						<!--性别-->
+						<fui-form-item label="性别" labelSize='26'  prop="age"
+							background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<fui-radio-group name="radio" v-model="formData.gender" @change="changeSex">
+									<view class="fui-list__item" style="display: flex;justify-content: flex-end;">
+										<fui-label>
+											<view class="fui-align__center">
+												<fui-radio value="male" checked></fui-radio>
+												<text class="fui-text">男</text>
+											</view>
+										</fui-label>
+										<fui-label :margin="['0','0','0','40rpx']">
+											<view class="fui-align__center">
+												<fui-radio value="female"></fui-radio>
+												<text class="fui-text">女</text>
+											</view>
+										</fui-label>
+									</view>
+								</fui-radio-group>
+							</view>
+						</fui-form-item>
+
+						<!--需求-->
+						<fui-form-item label="需求"  labelSize='26' prop="title"
+							background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<fui-input :borderBottom="false" :padding="[0]" placeholder="点击填写"
+									v-model="formData.demand" backgroundColor="#434544" size="26"
+									color="#fff"></fui-input>
+							</view>
+						</fui-form-item>
+						<!--决策人-->
+						<fui-form-item label="决策人"  labelSize='26' prop="title"
+							background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<view class="input-title" style="margin-right:14rpx;"
+									@click="openCicker(`decision_maker`)">
+									{{ (formData.decision_maker) ? picker_config.decision_maker.text : '点击选择' }}
+								</view>
+							</view>
+						</fui-form-item>
+
+					</view>
+				</fui-form>
+			</view>
+
+			<view class="fui-btn__box">
+				<fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F"
+					@click="nextStep('1')">下一步</fui-button>
+			</view>
+		</view>
+
+		<!--    添加六要素-->
+		<view style="margin-top: 20rpx;" v-if="optionTableId == 1">
+			<view class="form-style">
+				<fui-form ref="form" top="0" :model="formData" :show="false">
+
+					<view class="title" style="margin-top: 20rpx;">六要素信息</view>
+					<view class="input-style">
+						<!--客户初步意向度-->
+						<fui-form-item label="客户初步意向度"  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="客户状态"  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="购买力"  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(`purchasing_power`)">
+									{{ (formData.purchasing_power) ? picker_config.purchasing_power.text : '点击选择' }}
+								</view>
+							</view>
+						</fui-form-item>
+						<!--认知理念-->
+						<fui-form-item label="认知理念"  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(`cognitive_idea`)">
+									{{ (formData.cognitive_idea) ? picker_config.cognitive_idea.text : '点击选择' }}
+								</view>
+							</view>
+						</fui-form-item>
+						<!--可选上课时间-->
+						<fui-form-item label="可选上课时间"  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="openDate(`optional_class_time`)">
+									{{ (formData.optional_class_time) ? formData.optional_class_time : '点击选择' }}
+								</view>
+							</view>
+						</fui-form-item>
+						<!--承诺到访时间-->
+						<fui-form-item label="承诺到访时间"  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="openDate(`promised_visit_time`)">
+									{{ (formData.promised_visit_time) ? formData.promised_visit_time : '点击选择' }}
+								</view>
+							</view>
+						</fui-form-item>
+						<!--距离-->
+						<fui-form-item label="距离"  labelSize='26' prop="title"
+							background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<view class="input-title" style="margin-right:14rpx;" @click="openCicker(`distance`)">
+									{{ (formData.distance) ? picker_config.distance.text : '点击选择' }}
+								</view>
+							</view>
+						</fui-form-item>
+						<!--沟通备注-->
+						<fui-form-item label="沟通备注"  labelSize='26' prop="title"
+							background='#434544' labelColor='#fff' :bottomBorder='false'>
+							<view class="input-title" style="margin-right:14rpx;">
+								<fui-input :borderBottom="false" :padding="[0]" placeholder="点击填写"
+									v-model="formData.communication" 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="点击填写" style="text-align: left;"
+									v-model="formData.first_visit_status"></fui-textarea>
+							</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>
+							</view>
+						</fui-form-item>
+					</view>
+				</fui-form>
+			</view>
+			<view class="fui-btn__box">
+				<fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="submit">保存</fui-button>
+			</view>
+		</view>
+
+
+
+		<!-- 年月日-选择时间 -->
+		<fui-date-picker :show="date_picker_show" type="3" @change="change_date"
+			@cancel="cancel_date" :value="default_date_value"></fui-date-picker>
+
+		<!-- 选择器 -->
+		<fui-picker :linkage='picker_linkage' :options="picker_options" :layer="1" :show="picker_show"
+			@change="changeCicker" @cancel="cancelCicker">
+		</fui-picker>
+
+		<!--    查重弹出层-->
+		<fui-bottom-popup :show="showDuplicateCheck" @close="closeDuplicateCheck">
+			<view class="fui-scroll__wrap">
+				<view class="title_box">
+					<view></view>
+					<view class="title">查重结果</view>
+					<view class="close" @tap="closeDuplicateCheck">
+						<fui-icon name="close" :size="48"></fui-icon>
+					</view>
+				</view>
+
+				<scroll-view scroll-y class="section_ul">
+					<!--暂无数据时展示-->
+					<view class="not_list" v-if="clientUserList.length == 0">
+						<image :src="$util.img('/uniapp_src/static/images/index/zan_wu.png')" class="img"></image>
+						<view class="title">暂无重复客户</view>
+					</view>
+
+					<!--数据列表-->
+					<view class="ul" v-else>
+						<view class="li" v-for="(v,k) in clientUserList" :key="k">
+							<view class="left_box" @click="openViewClueInfo(v)">
+								<view class="box_1">
+									<image class="img" :src="$util.img('/uniapp_src/static/images/index/myk.png')">
+									</image>
+									<view class="name">{{v.student_name}}</view>
+									<view class="tag">{{ v.is_status == 1 ? '试听' : '成交' }}</view>
+								</view>
+								<view class="box_2">
+									<view class="left">
+										<view class="name">首选联系人：{{v.contact_name}}</view>
+										<!--                    <view class="call">妈妈</view>-->
+									</view>
+								</view>
+								<view class="box_3">
+									<view class="left">
+										{{ $util.formatToDateTime((v.follow && v.follow.follow_up_time || ''), 'm-d H:i') }}
+										跟进
+									</view>
+									<view class="right">
+
+										<image
+											v-if="['A+','A','A-'].includes(v.follow && v.follow.initial_customer_intent || '')"
+											:src="$util.img('/uniapp_src/static/images/index/intention3.png')"
+											class="img"></image>
+										<image
+											v-else-if="['B+','B','B-'].includes(v.follow && v.follow.initial_customer_intent || '')"
+											:src="$util.img('/uniapp_src/static/images/index/intention2.png')"
+											class="img"></image>
+										<image v-else :src="$util.img('/uniapp_src/static/images/index/intention1.png')"
+											class="img"></image>
+
+										<view>意向：{{ v.follow && v.follow.initial_customer_intent || '' }}</view>
+									</view>
+								</view>
+							</view>
+							<view class="right_box">
+								<image class="img" :src="$util.img('/uniapp_src/static/images/index/message.png')"
+									@click="openViewMyMessage(v)"></image>
+								<image class="img" :src="$util.img('/uniapp_src/static/images/index/phone.png')"
+									@click="dialTel(v)"></image>
+							</view>
+						</view>
+					</view>
+
+				</scroll-view>
+
+			</view>
+		</fui-bottom-popup>
+
+	</view>
 </template>
 
 <script>
-import apiRoute from '@/api/apiRoute.js';
-import commonApi from '@/api/common.js';
-import marketApi from '@/api/market.js';
-import memberApi from '@/api/member.js';
-
-
-const rules = [
-  {
-    name: "student_name",
-    rule: ["required"],
-    msg: ["请输入学员姓名"]
-  },
-  {
-    name: "title",
-    rule: ["required"],
-    msg: ["请输入线索标题"]
-  },
-  {
-    name: "student_phone",
-    rule: ["required", "isMobile"],
-    msg: ["请输入电话", "请输入正确的手机号"]
-  },
-  {
-    name: "age",
-    rule: ["required", "isNumber"],
-    msg: ["请输入年龄", "请输入正确的数字"]
-  },
-  {
-    name: "school_name",
-    rule: ["required"],
-    msg: ["请输入学校"]
-  },
-  {
-    name: "grade",
-    rule: ["required"],
-    msg: ["请输入年级"]
-  },
-  {
-    name: "class_name",
-    rule: ["required"],
-    msg: ["请输入班级"]
-  },
-  {
-    name: "customer_source",
-    rule: ["required"],
-    msg: ["请选择客户来源"]
-  },
-  {
-    name: "add_staff_id",
-    rule: ["required"],
-    msg: ["请选择顾问"]
-  },
-  {
-    name: "contact_name",
-    rule: ["required"],
-    msg: ["请输入联系人"]
-  },
-  {
-    name: "full_address",
-    rule: ["required"],
-    msg: ["请选择所在地区"]
-  },
-  {
-    name: "community_name",
-    rule: ["required"],
-    msg: ["请输入小区"]
-  },
-  {
-    name: "customer_tags_name",
-    rule: ["required"],
-    msg: ["请选择客户标签"]
-  }
-];
-export default {
-  data() {
-    return {
-      switchChange_type: 1,
-      rules,
-
-      is_submit: true,//是否提交(防止重复提交)|true=可提交,false=不可提交
-
-      resource_sharing_id:'',//resource_sharing_id(资源共享表id)
-      //表单
-      formData: {
-        // 客户基础信息
-        source_channel:'',//来源渠道
-        source:'',//来源
-        consultant:'',//顾问
-        name:'',//姓名
-        age:'',//年龄
-        gender:'male',//性别|male-男性, female-女性, other-其他
-        phone_number:'',//联系电话
-        demand:'',//需求
-        decision_maker:'',//决策人
-        initial_intent:'',//客户初步意向度: high-高, medium-中, low-低
-        status:'',//客户状态: active-活跃, inactive-不活跃, pending-待定
-
-        //六要素信息
-        purchasing_power:'',//购买力
-        cognitive_idea:'',//认知理念
-        communication:'',//沟通备注
-        promised_visit_time:'',//承诺到访时间
-        staff_id:'',//人员ID
-        distance:'',//距离
-        optional_class_time:'',//可选上课时间
-        first_visit_status:'',//一访情况
-        second_visit_status:'',//二访情况
-      },
-
-      //下拉选择器相关
-      picker_input_name:'',//下拉组件的input_name
-      picker_show:false,//下拉组件是否展示
-      picker_linkage:true,//选择器是否为联动选择
-      picker_options:[
-        // {
-        //   text:'张三',
-        //   value:'1'
-        // },
-      ],//选择器可选值列表
-      picker_config:{
-        //来源渠道
-        source_channel:{
-          text:'',//回显中文名字
-          options:[
-            // {
-            //   text:'张三',
-            //   value:'1'
-            // }
-          ],//可选值列表
-        },
-        //来源
-        source:{
-          text:'',
-          options:[],
-        },
-        //顾问
-        consultant:{
-          text:'',
-          options:[],
-        },
-        //购买力
-        purchasing_power:{
-          text:'',
-          options:[],
-        },
-        //认知理念
-        cognitive_idea:{
-          text:'',
-          options:[],
-        },
-        //客户初步意向度
-        initial_intent:{
-          text:'',
-          options:[],
-        },
-        //所属校区
-        campus:{
-          text:'',
-          options:[],
-        },
-        //客户状态
-        status:{
-          text:'',
-          options:[],
-        },
-        //决策人
-        decision_maker:{
-          text:'',
-          options:[],
-        },
-        //距离
-        distance:{
-          text:'',
-          options:[],
-        },
-      },//选择器选项配置
-
-      // 年月日选择组件
-      data_picker_input_name:'',//时间组件的input_name
-      date_picker_show:false,//时间选择器是否展示
-
-
-      //地区三级联动
-      show_area: false,
-      options_area: [],
-
-      //登录用户信息
-      userInfo:{},
-
-      // 查重相关
-      student_name:'',//检索关键字
-      clientUserList:[],//查重用户列表
-      showDuplicateCheck:false,//是否显示查重弹出层
-
-
-      //tab切换
-      optionTableId:0,
-      optionTable: [
-        {
-          id: 0,
-          name: '添加客户'
-        },
-        {
-          id: 1,
-          name: '添加六要素'
-        }
-      ],
-    }
-  },
-  onLoad(options) {
-    this.resource_sharing_id = options.resource_sharing_id//共享资源表id
-  },
-  onShow() {
-    this.init()
-  },
-  methods: {
-    //初始化
-    async init() {
-      await this.getDict('source_channel')//获取字典-来源渠道
-      await this.getDict('source')//获取字典-来源
-      await this.getDict('purchasing_power')//获取字典-购买力
-      await this.getDict('initial_intent')//获取字典-客户初步意向度
-      await this.getDict('cognitive_idea')//获取字典-认知理念
-      await this.getDict('status')//获取字典-客户状态
-      await this.getDict('decision_maker')//获取字典-决策人
-      await this.getDict('distance')//获取字典-距离
-      // this.getStaffList()//获取人员列表
-      // this.getAreaTree()//获取地区树形结构
-
-      await this.getInfo()//获取资源共享-详情(客户资源详情)
-    },
-
-    //获取资源共享-详情(客户资源详情)
-    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)
-
-
-      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-待定
-
-        //六要素信息
-        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 || '',//二访情况
-      }
-
-      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 || '点击选择'//来源渠道
-      this.picker_config.source.text = customerResource.source_name || '点击选择'//来源
-      this.picker_config.consultant.text = customerResource.consultant_name || '点击选择'//顾问
-      this.picker_config.initial_intent.text = customerResource.initial_intent_name || '点击选择'//客户初步意向度
-      this.picker_config.status.text = customerResource.status_name || '点击选择'//客户状态
-
-      this.picker_config.decision_maker.text = customerResource.decision_maker || '点击选择'//决策人
-
-      //六要素相关
-      this.picker_config.purchasing_power.text = sixSpeed.purchase_power_name || '点击选择'//购买力
-      this.picker_config.cognitive_idea.text = sixSpeed.concept_awareness_name || '点击选择'//认知理念
-      this.picker_config.distance.text = sixSpeed.distance || '点击选择'//距离
-
-    },
-
-    //获取字典-课程id选择
-    async getDict_courses_id(){
-      let res = await marketApi.selectCourseList({})
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      let dictionary =  res.data
-      let arr = []
-      dictionary.forEach((v,k)=>{
-        arr.push({
-          text: v.name,
-          value: v.id,
-        })
-      })
-      this.options_courses_id = arr
-    },
-
-
-    //获取人员列表
-    async getStaffList() {
-      let res = await memberApi.staffList({type: 2})
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      let arr = []
-      res.data.forEach((v,k)=>{
-        arr.push({
-          text: v.name,
-          value: v.id,
-        })
-      })
-      this.options_add_staff_id = arr
-    },
-
-    //获取人员列表 role_id|5=市场,6=销售
-    async getRoleStaffList(role_id) {
-      let res = await memberApi.staffList({
-        type: 2,
-        role_id:role_id
-      })
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      let arr = []
-      res.data.forEach((v,k)=>{
-        arr.push({
-          text: v.name,
-          value: v.id,
-        })
-      })
-
-      if(role_id == 5){
-        this.options_staff_id_5 = arr
-        console.log('市场',arr)
-      }else{
-        this.options_staff_id_6 = arr
-        console.log('销售',arr)
-      }
-    },
-
-    //获取地区树形结构
-    async getAreaTree() {
-      let res = await commonApi.getAreaTree()
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      this.options_area = res.data
-    },
-
-    //获取字典
-    async getDict(inputName){
-      let key = ''
-      switch (inputName){
-        //来源渠道
-        case 'source_channel':
-          key = 'SourceChannel'
-          break;
-          //来源
-        case 'source':
-          key = 'source'
-          break;
-          //购买力
-        case 'purchasing_power':
-          key = 'customer_purchasing_power'
-          break;
-          //认知理念
-        case 'cognitive_idea':
-          key = 'cognitive_concept'
-          break;
-          //决策人
-        case 'decision_maker':
-          key = 'decision_maker'
-          break;
-          //客户初步意向度
-        case 'initial_intent':
-          key = 'preliminarycustomerintention'
-          break;
-          //客户状态
-        case 'status':
-          key = 'kh_status'
-          break;
-          //距离
-        case 'distance':
-          key = 'distance'
-          break;
-      }
-      if(!key){
-        return
-      }
-
-
-      let res = await apiRoute.common_Dictionary({key:key})
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      let dictionary =  res.data.dictionary
-      let arr = []
-      dictionary.forEach((v,k)=>{
-        arr.push({
-          text: v.name,
-          value: v.value,
-        })
-      })
-
-      if(inputName == 'source_channel'){
-          //插入到arr的头部
-          arr.unshift({
-            text: '线下',
-            value: '0',
-          })
-      }
-      if(inputName == 'status'){
-        //插入到arr的头部
-        console.log(arr)
-      }
-
-      this.picker_config[inputName].options = arr
-    },
-
-    //##### 查重相关 #####
-    //客户列表--查重
-    async clientList(){
-
-      if(!this.student_name){
-        uni.showToast({
-          title: '请输入检索关键字',
-          icon: 'none'
-        })
-        return
-      }
-
-      this.clientUserList = []
-
-      let param = {
-        student_name:this.student_name
-      }
-      let res = await marketApi.clientList(param)
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      console.log('查重',res)
-      this.clientUserList = res.data
-      this.openDuplicateCheck()
-    },
-    //打开结果列表
-    openDuplicateCheck(){
-      this.showDuplicateCheck = true
-    },
-    //关闭结果列表
-    closeDuplicateCheck(e){
-      this.showDuplicateCheck = false
-    },
-
-
-    //跳转页面-客户详情
-    openViewClueInfo(item) {
-      let id = item.id
-      this.$navigateTo({
-        url: `/pages/market/clue/clue_info?id=${id}`
-      })
-    },
-
-    //跳转页面-我的消息
-    openViewMyMessage(item) {
-      let hair_staff_id = item.hair_staff_id
-      this.$navigateTo({
-        url: `/pages/common/im_chat_info?hair_staff_id=${hair_staff_id}`
-      })
-    },
-
-    //拨打电话
-    async dialTel(item) {
-      let tel = item.student_phone
-
-      if (!tel) {
-        uni.showToast({
-          title: '电话号码为空',
-          icon: 'none'
-        });
-        return;
-      }
-
-      let param = {
-        sales_id: item.id//线索id
-      }
-      let res = await marketApi.setCallUp(param)//添加通过记录
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      uni.makePhoneCall({
-        phoneNumber: tel
-      })
-    },
-
-
-    //联系电话失去焦点时间
-    async handlePhoneBlur(){
-      if(!this.formData.phone_number){
-        return
-      }
-
-      this.clientUserList = []
-
-      let param = {
-        phone_number:this.formData.phone_number
-      }
-      let res = await apiRoute.xs_getAllCustomerResources(param)
-      if(res.code != 1){
-        if(res.msg == '暂无数据'){
-          return
-        }
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      console.log('查重',res)
-
-
-
-      this.clientUserList = res.data
-
-      if(this.clientUserList.length == 1){
-        if (this.clientUserList[0].id == this.formData.id) {
-          //查重后的手机号是自己,就不展示查重结果了
-          return
-        }
-      }
-
-      this.openDuplicateCheck()
-    },
-
-
-
-
-    //多选客户标签-选中后回调
-    onConfirmCustomerTags(e) {
-      console.log('多选客户标签', e)
-      this.show_customer_tags = false
-      let customer_tags_name_arr = []
-      let customer_tags_arr = []
-      e.options.forEach((v, k) => {
-        customer_tags_arr.push(v.value)
-        customer_tags_name_arr.push(v.text)
-        //根据v.value 设置this.options_customer_tags中对应元素的checked属性为true
-        this.options_customer_tags.forEach((v, k) => {
-          if (v.value == v.value) {
-            v.checked = true
-          }
-        })
-      })
-
-      this.formData.customer_tags_name = customer_tags_name_arr.join(',')//数组转字符串
-      this.formData.customer_tags = customer_tags_arr//数组转字符串
-    },
-
-    //地区选择相关
-    changeArea(e) {
-      this.show_area = false
-      console.log('地区选择', e)
-      this.formData.province_id = e.value[0]
-      this.formData.city_id = e.value[1]
-      this.formData.district_id = e.value[2]
-      this.formData.full_address = `${e.text[0]}-${e.text[1]}-${e.text[2]}`
-    },
-
-    //开关选择
-    switchChange(e) {
-      if (e.detail.value) {
-        this.switchChange_type = 1
-      } else {
-        this.switchChange_type = 2
-      }
-    },
-
-    //性别选择器
-    changeSex(e){
-      this.formData.gender = e.detail.value
-    },
-
-    //监听-是否创建跟进任务
-    changeIsFollow(e) {
-      console.log(111, e.detail.value)
-      this.is_follow = e.detail.value
-      //是否创建跟进任务 1跟进
-      if (this.is_follow) {
-        this.formData.is_follow = '1'
-      } else {
-        //2不跟进
-        this.formData.is_follow = '2'
-
-        this.formData.entry_type = ''//跟进类型
-        this.formData.staff_id = ''//跟进人员
-        this.formData.follow_up_time = ''//跟进时间
-        this.formData.follow_up_content = ''//备注
-      }
-    },
-
-
-    //切换tag列表
-    async segmented(e) {
-      console.log(e)
-      //e.id|0=基础信息 1=六要素
-      let status = e.id
-      this.optionTableId = String(status)
-    },
-
-
-    //######-----下拉选择器组件相关-----######
-    //打开下拉选择器
-    openCicker(input_name, linkage = true) {
-      this.picker_options = []
-
-      this.picker_input_name = input_name
-
-      let arr = this.picker_config[input_name]?.options || []
-
-      if (!arr.length) {
-        uni.showToast({ title: '暂无选项', icon: 'none' })
-        return
-      }
-
-      this.picker_options =arr
-      this.picker_linkage = linkage
-      // 使用 nextTick 确保数据更新后再打开 picker
-      this.$nextTick(() => {
-        this.picker_show = true
-      })
-    },
-    //监听-下拉选择器
-    changeCicker(e) {
-      console.log('监听-下拉选择器', this.picker_input_name, e)
-      let input_name = this.picker_input_name
-      this.formData[input_name] = e.value
-      this.picker_config[input_name]['text'] = e.text
-      if(input_name == 'source'){
-        if(e.value != 1){
-          this.formData.source_channel = '0'//0=线下
-        }else{
-          this.formData.source_channel = ''//线下
-        }
-      }
-      this.cancelCicker()
-    },
-    //关闭下拉选择器
-    cancelCicker() {
-      this.picker_show = false
-      this.picker_input_name = ''
-      this.picker_options = []
-    },
-
-
-    //######-----时间选择器组件相关-----######
-    //打开下拉选择器
-    openDate(input_name) {
-      this.date_picker_show = true
-      this.data_picker_input_name = input_name
-    },
-    //选择跟进时间
-    change_date(e) {
-      //跟进时间
-      let val = (e.result ?? '')
-      if(val){
-        val = val
-      }
-
-      let input_name = this.data_picker_input_name
-      this.formData[input_name] = val
-
-      this.cancel_date()
-    },
-    //关闭选择跟进时间
-    cancel_date() {
-      this.date_picker_show = false
-    },
-
-    //下一步 index|0=添加客户,1六要素
-    async nextStep(index) {
-      this.optionTableId = String(index)
-    },
-    //表单验证
-    async validatorForm(data) {
-      console.log('tijiao',data)
-
-      //客户基础信息
-      //来源渠道
-      if(!data.source_channel.length){
-        uni.showToast({
-          title: '请选择来源渠道',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //来源
-      if(!data.source){
-        uni.showToast({
-          title: '请选择来源',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //姓名
-      if(!data.name){
-        uni.showToast({
-          title: '学生姓名必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //年龄
-      if(!data.age){
-        uni.showToast({
-          title: '年龄必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //性别
-      if(!data.gender){
-        uni.showToast({
-          title: '性别必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //电话
-      if(!data.phone_number){
-        uni.showToast({
-          title: '电话必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-
-      //需求
-      if(!data.demand){
-        uni.showToast({
-          title: '需求必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //决策人
-      if(!data.decision_maker){
-        uni.showToast({
-          title: '决策人必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //客户初步意向度必填
-      if(!data.initial_intent){
-        uni.showToast({
-          title: '客户初步意向度必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //客户状态
-      if(!data.status){
-        uni.showToast({
-          title: '客户状态必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-
-
-      //##### 六要素信息 #####
-      //购买力
-      if(!data.purchasing_power){
-        uni.showToast({
-          title: '购买力必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //认知理念
-      if(!data.cognitive_idea){
-        uni.showToast({
-          title: '认知理念必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //沟通备注
-      if(!data.communication){
-        uni.showToast({
-          title: '沟通备注必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //承诺到访时间
-      if(!data.promised_visit_time){
-        uni.showToast({
-          title: '承诺到访时间必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //距离
-      if(!data.distance){
-        uni.showToast({
-          title: '距离必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      //可选上课时间
-      if(!data.optional_class_time){
-        uni.showToast({
-          title: '可选上课时间必填',
-          icon: 'none'
-        })
-        this.nextStep('1')
-        return false
-      }
-      return true
-    },
-    //提交
-    async submit() {
-      console.log('提交',this.formData)
-      let data = {...this.formData}
-      //表单验证
-      let validatorForm = await this.validatorForm(data)
-      console.log('验证结果',validatorForm)
-      if(!validatorForm){
-        return
-      }
-
-      //防止重复提交
-      if (!this.is_submit) {
-        return
-      }
-      this.is_submit = false
-
-      let res = await apiRoute.xs_editCustomerResources(data)
-
-      this.is_submit = true
-
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      uni.showToast({
-        title: res.msg,
-        icon: 'success'
-      })
-      //延迟1s执行
-      setTimeout(() => {
-        //跳转页面-客户详情列表
-        //关闭当前页跳转新页面
-        uni.redirectTo({
-          url: `/pages/market/clue/clue_info?resource_sharing_id=${this.resource_sharing_id}`
-        })
-      }, 1000)
-    },
-  }
-}
+	import apiRoute from '@/api/apiRoute.js';
+	import commonApi from '@/api/common.js';
+	import marketApi from '@/api/market.js';
+	import memberApi from '@/api/member.js';
+
+
+	const rules = [{
+			name: "student_name",
+			rule: ["required"],
+			msg: ["请输入学员姓名"]
+		},
+		{
+			name: "title",
+			rule: ["required"],
+			msg: ["请输入线索标题"]
+		},
+		{
+			name: "student_phone",
+			rule: ["required", "isMobile"],
+			msg: ["请输入电话", "请输入正确的手机号"]
+		},
+		{
+			name: "age",
+			rule: ["required", "isNumber"],
+			msg: ["请输入年龄", "请输入正确的数字"]
+		},
+		{
+			name: "school_name",
+			rule: ["required"],
+			msg: ["请输入学校"]
+		},
+		{
+			name: "grade",
+			rule: ["required"],
+			msg: ["请输入年级"]
+		},
+		{
+			name: "class_name",
+			rule: ["required"],
+			msg: ["请输入班级"]
+		},
+		{
+			name: "customer_source",
+			rule: ["required"],
+			msg: ["请选择客户来源"]
+		},
+		{
+			name: "add_staff_id",
+			rule: ["required"],
+			msg: ["请选择顾问"]
+		},
+		{
+			name: "contact_name",
+			rule: ["required"],
+			msg: ["请输入联系人"]
+		},
+		{
+			name: "full_address",
+			rule: ["required"],
+			msg: ["请选择所在地区"]
+		},
+		{
+			name: "community_name",
+			rule: ["required"],
+			msg: ["请输入小区"]
+		},
+		{
+			name: "customer_tags_name",
+			rule: ["required"],
+			msg: ["请选择客户标签"]
+		}
+	];
+	export default {
+		data() {
+			return {
+				switchChange_type: 1,
+				rules,
+
+				is_submit: true, //是否提交(防止重复提交)|true=可提交,false=不可提交
+
+				resource_sharing_id: '', //resource_sharing_id(资源共享表id)
+				//表单
+				formData: {
+					// 客户基础信息
+					source_channel: '', //来源渠道
+					source: '', //来源
+					consultant: '', //顾问
+					name: '', //姓名
+					age: '', //年龄
+					gender: 'male', //性别|male-男性, female-女性, other-其他
+					phone_number: '', //联系电话
+					demand: '', //需求
+					decision_maker: '', //决策人
+					initial_intent: '', //客户初步意向度: high-高, medium-中, low-低
+					status: '', //客户状态: active-活跃, inactive-不活跃, pending-待定
+
+					//六要素信息
+					purchasing_power: '', //购买力
+					cognitive_idea: '', //认知理念
+					communication: '', //沟通备注
+					promised_visit_time: '', //承诺到访时间
+					staff_id: '', //人员ID
+					distance: '', //距离
+					optional_class_time: '', //可选上课时间
+					first_visit_status: '', //一访情况
+					second_visit_status: '', //二访情况
+				},
+
+				//下拉选择器相关
+				picker_input_name: '', //下拉组件的input_name
+				picker_show: false, //下拉组件是否展示
+				picker_linkage: true, //选择器是否为联动选择
+				picker_options: [
+					// {
+					//   text:'张三',
+					//   value:'1'
+					// },
+				], //选择器可选值列表
+				picker_config: {
+					//来源渠道
+					source_channel: {
+						text: '', //回显中文名字
+						options: [
+							// {
+							//   text:'张三',
+							//   value:'1'
+							// }
+						], //可选值列表
+					},
+					//来源
+					source: {
+						text: '',
+						options: [],
+					},
+					//顾问
+					consultant: {
+						text: '',
+						options: [],
+					},
+					//购买力
+					purchasing_power: {
+						text: '',
+						options: [],
+					},
+					//认知理念
+					cognitive_idea: {
+						text: '',
+						options: [],
+					},
+					//客户初步意向度
+					initial_intent: {
+						text: '',
+						options: [],
+					},
+					//所属校区
+					campus: {
+						text: '',
+						options: [],
+					},
+					//客户状态
+					status: {
+						text: '',
+						options: [],
+					},
+					//决策人
+					decision_maker: {
+						text: '',
+						options: [],
+					},
+					//距离
+					distance: {
+						text: '',
+						options: [],
+					},
+				}, //选择器选项配置
+
+				// 年月日选择组件
+				data_picker_input_name: '', //时间组件的input_name
+				date_picker_show: false, //时间选择器是否展示
+				default_date_value: '', // 添加默认日期值
+
+
+				//地区三级联动
+				show_area: false,
+				options_area: [],
+
+				//登录用户信息
+				userInfo: {},
+
+				// 查重相关
+				student_name: '', //检索关键字
+				clientUserList: [], //查重用户列表
+				showDuplicateCheck: false, //是否显示查重弹出层
+
+
+				//tab切换
+				optionTableId: 0,
+				optionTable: [{
+						id: 0,
+						name: '编辑客户'
+					},
+					{
+						id: 1,
+						name: '编辑六要素'
+					}
+				],
+			}
+		},
+		onLoad(options) {
+			this.resource_sharing_id = options.resource_sharing_id //共享资源表id
+		},
+		onShow() {
+			this.init()
+		},
+		methods: {
+			//初始化
+			async init() {
+				await this.getDict('source_channel') //获取字典-来源渠道
+				await this.getDict('source') //获取字典-来源
+				await this.getDict('purchasing_power') //获取字典-购买力
+				await this.getDict('initial_intent') //获取字典-客户初步意向度
+				await this.getDict('cognitive_idea') //获取字典-认知理念
+				await this.getDict('status') //获取字典-客户状态
+				await this.getDict('decision_maker') //获取字典-决策人
+				await this.getDict('distance') //获取字典-距离
+				// this.getStaffList()//获取人员列表
+				// this.getAreaTree()//获取地区树形结构
+
+				await this.getInfo() //获取资源共享-详情(客户资源详情)
+			},
+
+			//获取资源共享-详情(客户资源详情)
+			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)
+
+
+				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-待定
+
+					//六要素信息
+					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 || '', //二访情况
+				}
+
+				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 || '点击选择' //来源渠道
+				this.picker_config.source.text = customerResource.source_name || '点击选择' //来源
+				this.picker_config.consultant.text = customerResource.consultant_name || '点击选择' //顾问
+				this.picker_config.initial_intent.text = customerResource.initial_intent_name || '点击选择' //客户初步意向度
+				this.picker_config.status.text = customerResource.status_name || '点击选择' //客户状态
+
+				this.picker_config.decision_maker.text = customerResource.decision_maker || '点击选择' //决策人
+
+				//六要素相关
+				this.picker_config.purchasing_power.text = sixSpeed.purchase_power_name || '点击选择' //购买力
+				this.picker_config.cognitive_idea.text = sixSpeed.concept_awareness_name || '点击选择' //认知理念
+				this.picker_config.distance.text = sixSpeed.distance || '点击选择' //距离
+
+			},
+
+			//获取字典-课程id选择
+			async getDict_courses_id() {
+				let res = await marketApi.selectCourseList({})
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				let dictionary = res.data
+				let arr = []
+				dictionary.forEach((v, k) => {
+					arr.push({
+						text: v.name,
+						value: v.id,
+					})
+				})
+				this.options_courses_id = arr
+			},
+
+
+			//获取人员列表
+			async getStaffList() {
+				let res = await memberApi.staffList({
+					type: 2
+				})
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				let arr = []
+				res.data.forEach((v, k) => {
+					arr.push({
+						text: v.name,
+						value: v.id,
+					})
+				})
+				this.options_add_staff_id = arr
+			},
+
+			//获取人员列表 role_id|5=市场,6=销售
+			async getRoleStaffList(role_id) {
+				let res = await memberApi.staffList({
+					type: 2,
+					role_id: role_id
+				})
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				let arr = []
+				res.data.forEach((v, k) => {
+					arr.push({
+						text: v.name,
+						value: v.id,
+					})
+				})
+
+				if (role_id == 5) {
+					this.options_staff_id_5 = arr
+					console.log('市场', arr)
+				} else {
+					this.options_staff_id_6 = arr
+					console.log('销售', arr)
+				}
+			},
+
+			//获取地区树形结构
+			async getAreaTree() {
+				let res = await commonApi.getAreaTree()
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+				this.options_area = res.data
+			},
+
+			//获取字典
+			async getDict(inputName) {
+				let key = ''
+				switch (inputName) {
+					//来源渠道
+					case 'source_channel':
+						key = 'SourceChannel'
+						break;
+						//来源
+					case 'source':
+						key = 'source'
+						break;
+						//购买力
+					case 'purchasing_power':
+						key = 'customer_purchasing_power'
+						break;
+						//认知理念
+					case 'cognitive_idea':
+						key = 'cognitive_concept'
+						break;
+						//决策人
+					case 'decision_maker':
+						key = 'decision_maker'
+						break;
+						//客户初步意向度
+					case 'initial_intent':
+						key = 'preliminarycustomerintention'
+						break;
+						//客户状态
+					case 'status':
+						key = 'kh_status'
+						break;
+						//距离
+					case 'distance':
+						key = 'distance'
+						break;
+				}
+				if (!key) {
+					return
+				}
+
+
+				let res = await apiRoute.common_Dictionary({
+					key: key
+				})
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				let dictionary = res.data.dictionary
+				let arr = []
+				dictionary.forEach((v, k) => {
+					arr.push({
+						text: v.name,
+						value: v.value,
+					})
+				})
+
+				if (inputName == 'source_channel') {
+					//插入到arr的头部
+					arr.unshift({
+						text: '线下',
+						value: '0',
+					})
+				}
+				if (inputName == 'status') {
+					//插入到arr的头部
+					console.log(arr)
+				}
+
+				this.picker_config[inputName].options = arr
+			},
+
+			//##### 查重相关 #####
+			//客户列表--查重
+			async clientList() {
+
+				if (!this.student_name) {
+					uni.showToast({
+						title: '请输入检索关键字',
+						icon: 'none'
+					})
+					return
+				}
+
+				this.clientUserList = []
+
+				let param = {
+					student_name: this.student_name
+				}
+				let res = await marketApi.clientList(param)
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+				console.log('查重', res)
+				this.clientUserList = res.data
+				this.openDuplicateCheck()
+			},
+			//打开结果列表
+			openDuplicateCheck() {
+				this.showDuplicateCheck = true
+			},
+			//关闭结果列表
+			closeDuplicateCheck(e) {
+				this.showDuplicateCheck = false
+			},
+
+
+			//跳转页面-客户详情
+			openViewClueInfo(item) {
+				let id = item.id
+				this.$navigateTo({
+					url: `/pages/market/clue/clue_info?id=${id}`
+				})
+			},
+
+			//跳转页面-我的消息
+			openViewMyMessage(item) {
+				let hair_staff_id = item.hair_staff_id
+				this.$navigateTo({
+					url: `/pages/common/im_chat_info?hair_staff_id=${hair_staff_id}`
+				})
+			},
+
+			//拨打电话
+			async dialTel(item) {
+				let tel = item.student_phone
+
+				if (!tel) {
+					uni.showToast({
+						title: '电话号码为空',
+						icon: 'none'
+					});
+					return;
+				}
+
+				let param = {
+					sales_id: item.id //线索id
+				}
+				let res = await marketApi.setCallUp(param) //添加通过记录
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				uni.makePhoneCall({
+					phoneNumber: tel
+				})
+			},
+
+
+			//联系电话失去焦点时间
+			async handlePhoneBlur() {
+				if (!this.formData.phone_number) {
+					return
+				}
+
+				this.clientUserList = []
+
+				let param = {
+					phone_number: this.formData.phone_number
+				}
+				let res = await apiRoute.xs_getAllCustomerResources(param)
+				if (res.code != 1) {
+					if (res.msg == '暂无数据') {
+						return
+					}
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+				console.log('查重', res)
+
+
+
+				this.clientUserList = res.data
+
+				if (this.clientUserList.length == 1) {
+					if (this.clientUserList[0].id == this.formData.id) {
+						//查重后的手机号是自己,就不展示查重结果了
+						return
+					}
+				}
+
+				this.openDuplicateCheck()
+			},
+
+
+
+
+			//多选客户标签-选中后回调
+			onConfirmCustomerTags(e) {
+				console.log('多选客户标签', e)
+				this.show_customer_tags = false
+				let customer_tags_name_arr = []
+				let customer_tags_arr = []
+				e.options.forEach((v, k) => {
+					customer_tags_arr.push(v.value)
+					customer_tags_name_arr.push(v.text)
+					//根据v.value 设置this.options_customer_tags中对应元素的checked属性为true
+					this.options_customer_tags.forEach((v, k) => {
+						if (v.value == v.value) {
+							v.checked = true
+						}
+					})
+				})
+
+				this.formData.customer_tags_name = customer_tags_name_arr.join(',') //数组转字符串
+				this.formData.customer_tags = customer_tags_arr //数组转字符串
+			},
+
+			//地区选择相关
+			changeArea(e) {
+				this.show_area = false
+				console.log('地区选择', e)
+				this.formData.province_id = e.value[0]
+				this.formData.city_id = e.value[1]
+				this.formData.district_id = e.value[2]
+				this.formData.full_address = `${e.text[0]}-${e.text[1]}-${e.text[2]}`
+			},
+
+			//开关选择
+			switchChange(e) {
+				if (e.detail.value) {
+					this.switchChange_type = 1
+				} else {
+					this.switchChange_type = 2
+				}
+			},
+
+			//性别选择器
+			changeSex(e) {
+				this.formData.gender = e.detail.value
+			},
+
+			//监听-是否创建跟进任务
+			changeIsFollow(e) {
+				console.log(111, e.detail.value)
+				this.is_follow = e.detail.value
+				//是否创建跟进任务 1跟进
+				if (this.is_follow) {
+					this.formData.is_follow = '1'
+				} else {
+					//2不跟进
+					this.formData.is_follow = '2'
+
+					this.formData.entry_type = '' //跟进类型
+					this.formData.staff_id = '' //跟进人员
+					this.formData.follow_up_time = '' //跟进时间
+					this.formData.follow_up_content = '' //备注
+				}
+			},
+
+
+			//切换tag列表
+			async segmented(e) {
+				console.log(e)
+				//e.id|0=基础信息 1=六要素
+				let status = e.id
+				this.optionTableId = String(status)
+			},
+
+
+			//######-----下拉选择器组件相关-----######
+			//打开下拉选择器
+			openCicker(input_name, linkage = true) {
+				this.picker_options = []
+
+				this.picker_input_name = input_name
+
+				let arr = this.picker_config[input_name]?.options || []
+
+				if (!arr.length) {
+					uni.showToast({
+						title: '暂无选项',
+						icon: 'none'
+					})
+					return
+				}
+
+				this.picker_options = arr
+				this.picker_linkage = linkage
+				// 使用 nextTick 确保数据更新后再打开 picker
+				this.$nextTick(() => {
+					this.picker_show = true
+				})
+			},
+			//监听-下拉选择器
+			changeCicker(e) {
+				console.log('监听-下拉选择器', this.picker_input_name, e)
+				let input_name = this.picker_input_name
+				this.formData[input_name] = e.value
+				this.picker_config[input_name]['text'] = e.text
+				if (input_name == 'source') {
+					if (e.value != 1) {
+						this.formData.source_channel = '0' //0=线下
+					} else {
+						this.formData.source_channel = '' //线下
+					}
+				}
+				this.cancelCicker()
+			},
+			//关闭下拉选择器
+			cancelCicker() {
+				this.picker_show = false
+				this.picker_input_name = ''
+				this.picker_options = []
+			},
+
+
+			//######-----时间选择器组件相关-----######
+			//打开下拉选择器
+			openDate(input_name) {
+				this.date_picker_show = true
+				this.data_picker_input_name = input_name
+				
+				// 设置默认日期值
+				if (this.formData[input_name]) {
+					// 如果有值，使用当前值
+					this.default_date_value = this.formData[input_name]
+				} else {
+					// 如果没有值，使用当天日期
+					const today = new Date()
+					const year = today.getFullYear()
+					const month = String(today.getMonth() + 1).padStart(2, '0')
+					const day = String(today.getDate()).padStart(2, '0')
+					this.default_date_value = `${year}-${month}-${day}`
+				}
+			},
+			//选择跟进时间
+			change_date(e) {
+				//跟进时间
+				let val = (e.result ?? '')
+				if (val) {
+					val = val
+				}
+
+				let input_name = this.data_picker_input_name
+				this.formData[input_name] = val
+
+				this.cancel_date()
+			},
+			//关闭选择跟进时间
+			cancel_date() {
+				this.date_picker_show = false
+			},
+
+			//下一步 index|0=添加客户,1六要素
+			async nextStep(index) {
+				this.optionTableId = String(index)
+			},
+			//表单验证
+			async validatorForm(data) {
+				console.log('tijiao', data)
+
+				//客户基础信息
+				//来源渠道
+				if (!data.source_channel.length) {
+					uni.showToast({
+						title: '请选择来源渠道',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+				//来源
+				if (!data.source) {
+					uni.showToast({
+						title: '请选择来源',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+				//姓名
+				if (!data.name) {
+					uni.showToast({
+						title: '学生姓名必填',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+				//年龄
+				if (!data.age) {
+					uni.showToast({
+						title: '年龄必填',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+				//性别
+				if (!data.gender) {
+					uni.showToast({
+						title: '性别必填',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+				//电话
+				if (!data.phone_number) {
+					uni.showToast({
+						title: '电话必填',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+
+				//需求
+				if (!data.demand) {
+					uni.showToast({
+						title: '需求必填',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+				//决策人
+				if (!data.decision_maker) {
+					uni.showToast({
+						title: '决策人必填',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+				//客户初步意向度必填
+				if (!data.initial_intent) {
+					uni.showToast({
+						title: '客户初步意向度必填',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+				//客户状态
+				if (!data.status) {
+					uni.showToast({
+						title: '客户状态必填',
+						icon: 'none'
+					})
+					this.nextStep('0')
+					return false
+				}
+
+
+				//##### 六要素信息 #####
+				//购买力
+				if (!data.purchasing_power) {
+					uni.showToast({
+						title: '购买力必填',
+						icon: 'none'
+					})
+					this.nextStep('1')
+					return false
+				}
+				//认知理念
+				if (!data.cognitive_idea) {
+					uni.showToast({
+						title: '认知理念必填',
+						icon: 'none'
+					})
+					this.nextStep('1')
+					return false
+				}
+				//沟通备注
+				if (!data.communication) {
+					uni.showToast({
+						title: '沟通备注必填',
+						icon: 'none'
+					})
+					this.nextStep('1')
+					return false
+				}
+				//承诺到访时间
+				if (!data.promised_visit_time) {
+					uni.showToast({
+						title: '承诺到访时间必填',
+						icon: 'none'
+					})
+					this.nextStep('1')
+					return false
+				}
+				//距离
+				if (!data.distance) {
+					uni.showToast({
+						title: '距离必填',
+						icon: 'none'
+					})
+					this.nextStep('1')
+					return false
+				}
+				//可选上课时间
+				if (!data.optional_class_time) {
+					uni.showToast({
+						title: '可选上课时间必填',
+						icon: 'none'
+					})
+					this.nextStep('1')
+					return false
+				}
+				return true
+			},
+			//提交
+			async submit() {
+				console.log('提交', this.formData)
+				let data = {
+					...this.formData
+				}
+				//表单验证
+				let validatorForm = await this.validatorForm(data)
+				console.log('验证结果', validatorForm)
+				if (!validatorForm) {
+					return
+				}
+
+				//防止重复提交
+				if (!this.is_submit) {
+					return
+				}
+				this.is_submit = false
+
+				let res = await apiRoute.xs_editCustomerResources(data)
+
+				this.is_submit = true
+
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+				uni.showToast({
+					title: res.msg,
+					icon: 'success'
+				})
+				//延迟1s执行
+				setTimeout(() => {
+					//跳转页面-客户详情列表
+					//关闭当前页跳转新页面
+					uni.redirectTo({
+						url: `/pages/market/clue/clue_info?resource_sharing_id=${this.resource_sharing_id}`
+					})
+				}, 1000)
+			},
+		}
+	}
 </script>
 
 <style lang="less" scoped>
-.search_box{
-  padding: 20rpx 40rpx;
-  border-bottom: 1px solid #333333;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .input_box{
-    width: 70%;
-    input{
-      width: 100%;
-      height: 60rpx;
-      color: #fff;
-      font-size: 28rpx;
-    }
-  }
-  .btn{
-    font-size: 28rpx;
-    color: #24BA9F;
-  }
-}
+	.search_box {
+		padding: 20rpx 40rpx;
+		border-bottom: 1px solid #333333;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.input_box {
+			width: 70%;
+
+			input {
+				width: 100%;
+				height: 60rpx;
+				color: #fff;
+				font-size: 28rpx;
+			}
+		}
+
+		.btn {
+			font-size: 28rpx;
+			color: #24BA9F;
+		}
+	}
 
 	.assemble {
 		width: 100%;
@@ -1543,132 +1343,155 @@ export default {
 		width: 92%;
 	}
 
-  //查重结构弹出层
-  .fui-scroll__wrap{
-    height: 60vh;
-    .title_box{
-      padding: 10rpx 20rpx;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .title{
-        font-size: 28rpx;
-        color: #101010;
-      }
-    }
-    .section_ul{
-      margin-bottom: 100rpx;
-      height: 98%;
-      .not_list{
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        .img{
-          width: 112rpx;
-          height: 112rpx;
-        }
-        .title{
-          padding: 0;
-          margin-top: 10rpx;
-          color: #101010;
-          font-size: 28rpx;
-          text-align: center;
-        }
-      }
-      .ul{
-        padding: 26rpx;
-        padding-bottom: 100rpx;
-        display: flex;
-        flex-direction: column;
-        .li{
-          margin-bottom: 26rpx;
-          padding: 26rpx;
-          display: flex;
-          justify-content: space-between;
-          gap: 10rpx;
-
-          border-radius: 18rpx;
-          background-color: rgba(67,69,68,1);
-          color: #fff;
-          font-size: 28rpx;
-          border: 0rpx solid rgba(121,121,121,1);
-          .left_box{
-            width: 80%;
-            display: flex;
-            flex-direction: column;
-            gap: 20rpx;
-            .box_1 {
-              display: flex;
-              align-items: center;
-              .img {
-                width: 48rpx;
-                height: 48rpx;
-                border-right: 50%;
-              }
-              .name{
-                margin-left: 20rpx;
-              }
-              .tag{
-                margin-left: 20rpx;
-                width: 84rpx;
-                height: 32rpx;
-                line-height: 28rpx;
-                border-radius: 0rpx 20rpx 20rpx 20rpx;
-                background-color: rgba(236,128,141,0.3);
-                color: rgba(240,90,90,1);
-                font-size: 20rpx;
-                text-align: center;
-                border: 0rpx solid rgba(121,121,121,1);
-              }
-            }
-            .box_2{
-              display: flex;
-              justify-content: space-between;
-              align-items: center;
-              .left{
-                display: flex;
-                align-items: flex-end;
-                .name{
-                  font-size: 28rpx;
-                }
-                .call{
-                  margin-left: 10rpx;
-                  font-size: 24rpx;
-                  color: #ba7b30;
-                }
-              }
-            }
-            .box_3{
-              display: flex;
-              gap: 30rpx;
-              .left{}
-              .right{
-                display: flex;
-                align-items: center;
-                gap: 10rpx;
-                .img{
-                  width: 16rpx;
-                  height: 16rpx;
-                  border-right: 50%;
-                }
-              }
-            }
-          }
-          .right_box{
-            width: 25%;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            .img{
-              width: 70rpx;
-              height: 70rpx;
-              border-radius: 50%;
-            }
-          }
-        }
-      }
-    }
-
-  }
+	//查重结构弹出层
+	.fui-scroll__wrap {
+		height: 60vh;
+
+		.title_box {
+			padding: 10rpx 20rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.title {
+				font-size: 28rpx;
+				color: #101010;
+			}
+		}
+
+		.section_ul {
+			margin-bottom: 100rpx;
+			height: 98%;
+
+			.not_list {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+				.img {
+					width: 112rpx;
+					height: 112rpx;
+				}
+
+				.title {
+					padding: 0;
+					margin-top: 10rpx;
+					color: #101010;
+					font-size: 28rpx;
+					text-align: center;
+				}
+			}
+
+			.ul {
+				padding: 26rpx;
+				padding-bottom: 100rpx;
+				display: flex;
+				flex-direction: column;
+
+				.li {
+					margin-bottom: 26rpx;
+					padding: 26rpx;
+					display: flex;
+					justify-content: space-between;
+					gap: 10rpx;
+
+					border-radius: 18rpx;
+					background-color: rgba(67, 69, 68, 1);
+					color: #fff;
+					font-size: 28rpx;
+					border: 0rpx solid rgba(121, 121, 121, 1);
+
+					.left_box {
+						width: 80%;
+						display: flex;
+						flex-direction: column;
+						gap: 20rpx;
+
+						.box_1 {
+							display: flex;
+							align-items: center;
+
+							.img {
+								width: 48rpx;
+								height: 48rpx;
+								border-right: 50%;
+							}
+
+							.name {
+								margin-left: 20rpx;
+							}
+
+							.tag {
+								margin-left: 20rpx;
+								width: 84rpx;
+								height: 32rpx;
+								line-height: 28rpx;
+								border-radius: 0rpx 20rpx 20rpx 20rpx;
+								background-color: rgba(236, 128, 141, 0.3);
+								color: rgba(240, 90, 90, 1);
+								font-size: 20rpx;
+								text-align: center;
+								border: 0rpx solid rgba(121, 121, 121, 1);
+							}
+						}
+
+						.box_2 {
+							display: flex;
+							justify-content: space-between;
+							align-items: center;
+
+							.left {
+								display: flex;
+								align-items: flex-end;
+
+								.name {
+									font-size: 28rpx;
+								}
+
+								.call {
+									margin-left: 10rpx;
+									font-size: 24rpx;
+									color: #ba7b30;
+								}
+							}
+						}
+
+						.box_3 {
+							display: flex;
+							gap: 30rpx;
+
+							.left {}
+
+							.right {
+								display: flex;
+								align-items: center;
+								gap: 10rpx;
+
+								.img {
+									width: 16rpx;
+									height: 16rpx;
+									border-right: 50%;
+								}
+							}
+						}
+					}
+
+					.right_box {
+						width: 25%;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.img {
+							width: 70rpx;
+							height: 70rpx;
+							border-radius: 50%;
+						}
+					}
+				}
+			}
+		}
+
+	}
 </style>
\ No newline at end of file
diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue
index 6732e86..44baab4 100644
--- a/pages/market/clue/index.vue
+++ b/pages/market/clue/index.vue
@@ -1,720 +1,721 @@
 <template>
-  <view class="assemble">
-    <fui-segmented-control :values="values" type="text" activeColor="#29d3b4" color="#fff"
-                           @click="segmented"></fui-segmented-control>
-
-    <!--我的客户-->
-    <scroll-view
-        v-if="segmented_type == 1"
-        scroll-y="true"
-        :lower-threshold="lowerThreshold"
-        @scrolltolower="loadMoreData_1"
-        style="height: 100vh;"
-    >
-      <view class="search_section" >
-        <view class="item">
-          <view class="input_box" @click="openShowDrawer()">
-            <view class="input_box_text">用户名/手机号/时间范围</view>
-          </view>
-          <view class="button" @click="openShowDrawer()">搜索</view>
-        </view>
-      </view>
-      <view class="card" v-for="(v,k) in tableList_1" :key="k">
-        <view style="width: 70%;" @click="clue_info(v)">
-          <view style="display: flex;align-items: center;padding: 20rpx;">
-            <view>
-              <image :src="$util.img('/uniapp_src/static/images/index/myk.png')" class="card-image"></image>
-            </view>
-            <view class="card-text">{{ v.customerResource.name }}</view>
-<!--            <view class="card-label">{{ v.is_status == 1 ? '试听' : '成交' }}</view>-->
-          </view>
-          <view class="card-con">
-            首联系人：{{ v.customerResource.name }} <span class="card-con-span">{{ v.customerResource.decision_maker }}</span>
-          </view>
-          <view class="card-date">
-            <view class="card-con">{{ $util.formatToDateTime((v.customerResource.updated_at || ''), 'm-d H:i') }}
-              跟进
-            </view>
-            <view style="margin-left: 30rpx;">
-              <view style="display: flex;align-items: center;">
-                <view style="padding: 12rpx;">
-                  <image
-                      v-if="v.customerResource.initial_intent == 'high'"
-                      :src="$util.img('/uniapp_src/static/images/index/intention3.png')"
-                      class="drop-image-x"
-                  ></image>
-                  <image
-                      v-else-if="v.customerResource.initial_intent == 'medium'"
-                      :src="$util.img('/uniapp_src/static/images/index/intention2.png')"
-                      class="drop-image-x"
-                  ></image>
-                  <image
-                      v-else
-                      :src="$util.img('/uniapp_src/static/images/index/intention1.png')"
-                      class="drop-image-x"
-                  ></image>
-                </view>
-                <view class="title-x">意向：{{ v.customerResource && v.customerResource.initial_intent_name || '' }}</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <!--只有注册了member表的账号才可操作IM对话-->
-        <view style="width: 15%;">
-          <image v-if="v.customerResource.member_id" :src="$util.img('/uniapp_src/static/images/index/message.png')" class="image" @click="openViewMyMessage(v)"></image>
-        </view>
-        <view style="width: 15%;">
-          <image v-if="v.customerResource.phone_number" :src="$util.img('/uniapp_src/static/images/index/phone.png')" class="image" @click="dialTel(v)"></image>
-        </view>
-      </view>
-    </scroll-view>
-
-    <!--资源分配-->
-    <scroll-view
-        v-if="segmented_type == 2"
-        scroll-y="true"
-        :lower-threshold="lowerThreshold"
-        @scrolltolower="loadMoreData_2"
-        style="height: 100vh;"
-    >
-      <view class="search_section">
-        <view class="item">
-          <view class="input_box" @click="openShowDrawer()">
-            <view class="input_box_text">用户名/手机号/时间范围</view>
-          </view>
-          <view class="button" @click="openShowDrawer()">搜索</view>
-        </view>
-      </view>
-      <view class="card" v-for="(v,k) in tableList_2" :key="k">
-        <view style="width: 70%;">
-          <view style="display: flex;align-items: center;padding: 20rpx;">
-            <view>
-              <image :src="$util.img('/uniapp_src/static/images/index/myk.png')" class="card-image"></image>
-            </view>
-            <view class="card-text">{{v.customerResource.name}}</view>
-<!--            <view class="card-label">{{v.is_status == 1 ? '试听' : '成交'}}</view>-->
-          </view>
-          <view class="card-con">
-            决策人：{{v.customerResource.name}} <span class="card-con-span">{{v.customerResource.decision_maker}}</span>
-          </view>
-          <view class="card-date">
-            <view class="card-con">{{ $util.formatToDateTime((v.customerResource.updated_at || ''),'m-d H:i') }} 跟进</view>
-            <view style="margin-left: 30rpx;">
-              <view style="display: flex;align-items: center;">
-                <view style="padding: 12rpx;">
-                  <image
-                      v-if="v.customerResource.initial_intent == 'high'"
-                      :src="$util.img('/uniapp_src/static/images/index/intention3.png')"
-                      class="drop-image-x"
-                  ></image>
-                  <image
-                      v-else-if="v.customerResource.initial_intent == 'medium'"
-                      :src="$util.img('/uniapp_src/static/images/index/intention2.png')"
-                      class="drop-image-x"
-                  ></image>
-                  <image
-                      v-else
-                      :src="$util.img('/uniapp_src/static/images/index/intention1.png')"
-                      class="drop-image-x"
-                  ></image>
-                </view>
-                <view class="title-x">意向：{{ v.customerResource && v.customerResource.initial_intent_name || '' }}</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view style="width: 15%;">
-<!--          <image :src="$util.img('/uniapp_src/static/images/index/message.png')" class="image"></image>-->
-        </view>
-        <view style="width: 15%;" @click="openAssign(v)">
-          <view class="ling">领</view>
-        </view>
-      </view>
-    </scroll-view>
-
-<!--下拉选择器-->
-    <fui-select :show="select_show" :options="select_options"  title="请选择员工" @confirm="getSales" @close="closeAssign"></fui-select>
-
-<!--    时间范围选择器-->
-    <fui-date-picker range :show="date_picker_show" type="3" @change="changeDatePicker" @cancel="cancelDatePicker"></fui-date-picker>
-
-    <!--    我的客户搜索条件栏目-->
-    <fui-drawer :show="showDrawer" direction="left" :maskClosable="true">
-      <view class="fui-scroll__view">
-        <view class="fui-title">筛选</view>
-        <scroll-view scroll-y style="height: 720rpx;">
-          <view class="drawer_box">
-            <fui-list-cell>
-              <view class="item">
-                <view class="title">时间筛选</view>
-                <view class="input_box">
-                  <fui-input :clearable="true"  borderTop placeholder="开始时间-结束时间" @click="openDatePicker" v-model="showDrawerForm.shared_at_str"></fui-input>
-                </view>
-              </view>
-            </fui-list-cell>
-
-            <fui-list-cell>
-              <view class="item">
-                <view class="title">姓名筛选</view>
-                <view class="input_box">
-                  <fui-input :clearable="true"  borderTop placeholder="姓名筛选" v-model="showDrawerForm.name"></fui-input>
-                </view>
-              </view>
-            </fui-list-cell>
-
-            <fui-list-cell>
-              <view class="item">
-                <view class="title">电话筛选</view>
-                <view class="input_box">
-                  <fui-input :clearable="true"  borderTop placeholder="电话筛选" v-model="showDrawerForm.phone_number"></fui-input>
-                </view>
-              </view>
-            </fui-list-cell>
-          </view>
-        </scroll-view>
-        <view class="fui-btn__box">
-          <fui-button type="success" width="400rpx" height="84rpx" text="搜索" bold @click="searchData()">
-          </fui-button>
-          <fui-button type="warning" width="400rpx" height="84rpx" text="关闭" bold @click="closeShowDrawer()">
-          </fui-button>
-        </view>
-      </view>
-    </fui-drawer>
-
-    <view style="height: 170rpx;"></view>
-    <AQTabber/>
-  </view>
+	<view class="assemble">
+		<fui-segmented-control :values="values" type="text" activeColor="#29d3b4" color="#fff"
+			@click="segmented"></fui-segmented-control>
+
+		<!--我的客户-->
+		<scroll-view v-if="segmented_type == 1" scroll-y="true" :lower-threshold="lowerThreshold"
+			@scrolltolower="loadMoreData_1" style="height: 100vh;">
+			<view class="search_section">
+				<view class="item">
+					<view class="input_box" @click="openShowDrawer()">
+						<view class="input_box_text">用户名/手机号/时间范围</view>
+					</view>
+					<view class="button" @click="openShowDrawer()">搜索</view>
+				</view>
+			</view>
+			<view class="card" v-for="(v,k) in tableList_1" :key="k">
+				<view style="width: 70%;" @click="clue_info(v)">
+					<view style="display: flex;align-items: center;padding: 20rpx;">
+						<view>
+							<image :src="$util.img('/uniapp_src/static/images/index/myk.png')" class="card-image">
+							</image>
+						</view>
+						<view class="card-text">{{ v.customerResource.name }}</view>
+						<!--            <view class="card-label">{{ v.is_status == 1 ? '试听' : '成交' }}</view>-->
+					</view>
+					<view class="card-con">
+						首联系人：{{ v.customerResource.name }} <span
+							class="card-con-span">{{ v.customerResource.decision_maker }}</span>
+					</view>
+					<view class="card-date">
+						<view class="card-con">
+							{{ $util.formatToDateTime((v.customerResource.updated_at || ''), 'm-d H:i') }}
+							跟进
+						</view>
+						<view style="margin-left: 30rpx;">
+							<view style="display: flex;align-items: center;">
+								<view style="padding: 12rpx;">
+									<image v-if="v.customerResource.initial_intent == 'high'"
+										:src="$util.img('/uniapp_src/static/images/index/intention3.png')"
+										class="drop-image-x"></image>
+									<image v-else-if="v.customerResource.initial_intent == 'medium'"
+										:src="$util.img('/uniapp_src/static/images/index/intention2.png')"
+										class="drop-image-x"></image>
+									<image v-else :src="$util.img('/uniapp_src/static/images/index/intention1.png')"
+										class="drop-image-x"></image>
+								</view>
+								<view class="title-x">
+									意向：{{ v.customerResource && v.customerResource.initial_intent_name || '' }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!--只有注册了member表的账号才可操作IM对话-->
+				<view style="width: 15%;">
+					<image v-if="v.customerResource.member_id"
+						:src="$util.img('/uniapp_src/static/images/index/message.png')" class="image"
+						@click="openViewMyMessage(v)"></image>
+				</view>
+				<view style="width: 15%;">
+					<image v-if="v.customerResource.phone_number"
+						:src="$util.img('/uniapp_src/static/images/index/phone.png')" class="image" @click="dialTel(v)">
+					</image>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!--资源分配-->
+		<scroll-view v-if="segmented_type == 2" scroll-y="true" :lower-threshold="lowerThreshold"
+			@scrolltolower="loadMoreData_2" style="height: 100vh;">
+			<view class="search_section">
+				<view class="item">
+					<view class="input_box" @click="openShowDrawer()">
+						<view class="input_box_text">用户名/手机号/时间范围</view>
+					</view>
+					<view class="button" @click="openShowDrawer()">搜索</view>
+				</view>
+			</view>
+			<view class="card" v-for="(v,k) in tableList_2" :key="k">
+				<view style="width: 70%;">
+					<view style="display: flex;align-items: center;padding: 20rpx;">
+						<view>
+							<image :src="$util.img('/uniapp_src/static/images/index/myk.png')" class="card-image">
+							</image>
+						</view>
+						<view class="card-text">{{v.customerResource.name}}</view>
+						<!--            <view class="card-label">{{v.is_status == 1 ? '试听' : '成交'}}</view>-->
+					</view>
+					<view class="card-con">
+						决策人：{{v.customerResource.name}} <span
+							class="card-con-span">{{v.customerResource.decision_maker}}</span>
+					</view>
+					<view class="card-date">
+						<view class="card-con">
+							{{ $util.formatToDateTime((v.customerResource.updated_at || ''),'m-d H:i') }} 跟进
+						</view>
+						<view style="margin-left: 30rpx;">
+							<view style="display: flex;align-items: center;">
+								<view style="padding: 12rpx;">
+									<image v-if="v.customerResource.initial_intent == 'high'"
+										:src="$util.img('/uniapp_src/static/images/index/intention3.png')"
+										class="drop-image-x"></image>
+									<image v-else-if="v.customerResource.initial_intent == 'medium'"
+										:src="$util.img('/uniapp_src/static/images/index/intention2.png')"
+										class="drop-image-x"></image>
+									<image v-else :src="$util.img('/uniapp_src/static/images/index/intention1.png')"
+										class="drop-image-x"></image>
+								</view>
+								<view class="title-x">
+									意向：{{ v.customerResource && v.customerResource.initial_intent_name || '' }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view style="width: 15%;">
+					<!--          <image :src="$util.img('/uniapp_src/static/images/index/message.png')" class="image"></image>-->
+				</view>
+				<view style="width: 15%;" @click="openAssign(v)">
+					<view class="ling">领</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!--下拉选择器-->
+		<fui-select :show="select_show" :options="select_options" title="请选择员工" @confirm="getSales"
+			@close="closeAssign"></fui-select>
+
+		<!--    时间范围选择器-->
+		<fui-date-picker range :show="date_picker_show" type="3" @change="changeDatePicker" :value="selectedDate"
+			@cancel="cancelDatePicker"></fui-date-picker>
+
+		<!--    我的客户搜索条件栏目-->
+		<fui-drawer :show="showDrawer" direction="left" :maskClosable="true">
+			<view class="fui-scroll__view">
+				<view class="fui-title">筛选</view>
+				<scroll-view scroll-y style="height: 720rpx;">
+					<view class="drawer_box">
+						<fui-list-cell>
+							<view class="item">
+								<view class="title">时间筛选</view>
+								<view class="input_box">
+									<fui-input :clearable="true" borderTop placeholder="开始时间-结束时间"
+										@click="openDatePicker" v-model="showDrawerForm.shared_at_str"></fui-input>
+								</view>
+							</view>
+						</fui-list-cell>
+
+						<fui-list-cell>
+							<view class="item">
+								<view class="title">姓名筛选</view>
+								<view class="input_box">
+									<fui-input :clearable="true" borderTop placeholder="姓名筛选"
+										v-model="showDrawerForm.name"></fui-input>
+								</view>
+							</view>
+						</fui-list-cell>
+
+						<fui-list-cell>
+							<view class="item">
+								<view class="title">电话筛选</view>
+								<view class="input_box">
+									<fui-input :clearable="true" borderTop placeholder="电话筛选"
+										v-model="showDrawerForm.phone_number"></fui-input>
+								</view>
+							</view>
+						</fui-list-cell>
+					</view>
+				</scroll-view>
+				<view class="fui-btn__box">
+					<view class="button clientbtn" @click="searchData()">搜索</view>
+					<view class="button clientbtn" @click="closeShowDrawer()">关闭</view>
+				</view>
+			</view>
+		</fui-drawer>
+
+		<view style="height: 170rpx;"></view>
+		<AQTabber />
+	</view>
 </template>
 
 <script>
-import AQTabber from "@/components/AQ/AQTabber.vue"
-import apiRoute from '@/api/apiRoute.js';
-import marketApi from '@/api/market.js';
-
-export default {
-  components: {
-    AQTabber,
-  },
-  data() {
-    return {
-      loading:false,//加载状态
-      lowerThreshold: 100,//距离底部多远触发
-      isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
-
-      //筛选条件
-      filteredData:{
-        page:1,//当前页码
-        limit:10,//每页返回数据条数
-        total:10,//数据总条数
-        type: '0',//0=全部,1=待跟进,2=7天,3=30天
-        is_gh: '2',//1=资源分配,2=我的客户
-      },
-
-      //顶部Tab栏
-      values: [
-        {
-          id: 1,
-          name: '我的客户'
-        },
-        // {
-        //   id: 2,
-        //   name: '资源分配'
-        // }
-      ],
-      segmented_type: 1,//当前选中的Tab栏目|1=我的客户,2=资源分配
-
-      userInfo:{},//用户信息
-      //我的客户列表相关
-      //筛选条件
-      filteredData_1:{
-        page:1,//当前页码
-        limit:10,//每页返回数据条数
-        total:10,//数据总条数
-        shared_by:'',//共享人ID|0=未分配
-        shared_at_str:'',//共享时间|开始时间(Y-m-d)-结束时间(Y-m-d)
-        phone_number:'',//客户资源表-手机号
-        name:'',//客户资源表-用户姓名
-      },
-      //数据列表
-      tableList_1:[],//表格数据
-
-      //资源分配列表相关
-      //筛选条件
-      filteredData_2:{
-        page:1,//当前页码
-        limit:10,//每页返回数据条数
-        total:10,//数据总条数
-        shared_by:'0',//共享人ID|0=未分配
-        shared_at_str:'',//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-        phone_number:'',//客户资源表-手机号
-        name:'',//客户资源表-用户姓名
-      },
-      //数据列表
-      tableList_2:[],//表格数据
-
-      //员工select选择器
-      select_show:false,//是否展示选择器
-      select_item:{},//当前选中的选项
-      select_options:[
-        // {
-        //   text: '张三',
-        //   value: '1',
-        // }
-      ],//选择器可选项
-
-      //时间选择器相关
-      date_picker_show:false,//是否展示时间选择器
-
-      //抽屉搜索条件展示窗相关
-      showDrawer:false,//是否展示|false=否
-      showDrawerForm:{
-        shared_at_str:'',//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-        phone_number:'',//客户资源表-手机号
-        name:'',//客户资源表-用户姓名
-      },
-
-
-    }
-  },
-  onLoad(options) {},
-  onShow(){
-    this.init()//初始化
-  },
-  //下拉刷新
-  async onPullDownRefresh() {
-    //重置为第一页
-    if(this.segmented_type == 1){
-      //我的客户
-      await this.resetFilteredData_1()
-      await this.getList_1()
-    }else{
-      //资源分配
-      await this.resetFilteredData_2()
-      await this.getList_2()
-    }
-
-
-  },
-  methods: {
-    //初始化
-    async init() {
-      await this.getUserInfo();
-      if (this.segmented_type == 1) {
-        await this.getList_1();
-      } else {
-        await this.getList_2();
-      }
-    },
-
-    //获取用户信息
-    async getUserInfo(){
-      let res = await apiRoute.getPersonnelInfo({})
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      this.userInfo = res.data
-
-      this.filteredData_1.shared_by = this.userInfo.id//共享人ID始终是当前登录的员工
-
-      //判断用户是不是销售经理,是就展示"资源分配"
-      if(this.userInfo.role_key_arr.includes('market_manager')){
-        this.values = [
-          {
-            id: 1,
-            name: '我的客户'
-          },
-          {
-            id: 2,
-            name: '资源分配'
-          }
-        ]
-        //是经理的情况下,获取这个校区的全部用户(身份是销售的)
-        await this.getPersonnelAll();
-      }else{
-        this.values = [
-          {
-            id: 1,
-            name: '我的客户'
-          },
-        ]
-      }
-    },
-
-
-    //获取全部员工
-    async getPersonnelAll(){
-      let res = await apiRoute.common_getPersonnelAll({
-        personnel_id:this.userInfo.id,//客户id
-        account_type:'market',//账号类型|teacher=老师,market=销售
-      })
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      let arr = []
-      res.data.forEach((v, k) => {
-        arr.push({
-          text: v.name,
-          value: v.id,
-        })
-      })
-      this.select_options = arr
-      console.log('员工',this.select_options)
-    },
-
-    //获取列表-我的客户相关
-    //加载更多(下一页)
-    loadMoreData_1() {
-      //判断是否加载
-      if (!this.isReachedBottom) {
-        this.isReachedBottom = true;//设置为不可请求状态
-        this.getList_1();
-      }
-    },
-    //重置为第一页
-    async resetFilteredData_1() {
-      this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
-
-      this.filteredData_1.page = 1//当前页码
-      this.filteredData_1.limit = 10//每页返回数据条数
-      this.filteredData_1.total = 10//数据总条数
-    },
-    //获取列表-我的客户
-    async getList_1(){
-      this.loading = true
-
-      let data = {...this.filteredData_1}
-
-      //判断是否还有数据
-      if(this.filteredData_1.page * this.filteredData_1.limit > this.filteredData_1.total){
-        this.loading = false
-        uni.showToast({
-          title: '暂无更多',
-          icon: 'none'
-        })
-        return
-      }
-
-      this.filteredData_1.shared_by = this.userInfo.id//共享人ID始终是当前登录的员工
-
-      if(data.page == 1){
-        this.tableList_1 = []
-      }
-
-      let res = await apiRoute.xs_resourceSharingIndex(data)
-      this.loading = false
-      this.isReachedBottom = false;
-      if (res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      this.tableList_1 = this.tableList_1.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
-
-      console.log('列表1',this.tableList_1)
-      this.filteredData_1.total = res.data.total
-      this.filteredData_1.page++
-
-    },
-
-    //获取列表-资源分配相关
-    //加载更多(下一页)
-    loadMoreData_2() {
-      //判断是否加载
-      if (!this.isReachedBottom) {
-        this.isReachedBottom = true;//设置为不可请求状态
-        this.getList_2();
-      }
-    },
-    //重置为第一页
-    async resetFilteredData_2() {
-      this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
-      this.filteredData_2.page = 1//当前页码
-      this.filteredData_2.limit = 10//每页返回数据条数
-      this.filteredData_2.total = 10//数据总条数
-    },
-    //获取列表-资源分配
-    async getList_2(){
-      this.loading = true
-
-      let data = {...this.filteredData_2}
-
-      //判断是否还有数据
-      if(this.filteredData_2.page * this.filteredData_2.limit > this.filteredData_2.total){
-        this.loading = false
-        uni.showToast({
-          title: '暂无更多',
-          icon: 'none'
-        })
-        return
-      }
-
-      if(data.page == 1){
-        this.tableList_2 = []
-      }
-
-      let res = await apiRoute.xs_resourceSharingIndex(data)
-      this.loading = false
-      this.isReachedBottom = false;
-      if (res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      console.log(123123,res)
-
-      this.tableList_2 = this.tableList_2.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
-
-      console.log('列表2',this.tableList_2)
-      this.filteredData_2.total = res.data.total
-      this.filteredData_2.page++
-    },
-
-
-    //切换tag列表
-    async segmented(param) {
-      this.segmented_type = param.id//1=我的客户,2=资源分配
-
-      //重置筛选抽屉中的表单数据
-      this.showDrawerForm.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-      this.showDrawerForm.phone_number = ''//客户资源表-手机号
-      this.showDrawerForm.name = ''//客户资源表-用户姓名
-
-      if(this.segmented_type == 1){
-        this.filteredData_1.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-        this.filteredData_1.phone_number = ''//客户资源表-手机号
-        this.filteredData_1.name = ''//客户资源表-用户姓名
-
-        //我的客户
-        //重置为第一页
-        await this.resetFilteredData_1()
-        await this.getList_1()
-      }else{
-        this.filteredData_2.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-        this.filteredData_2.phone_number = ''//客户资源表-手机号
-        this.filteredData_2.name = ''//客户资源表-用户姓名
-        //资源分配
-        //重置为第一页
-        await this.resetFilteredData_2()
-        await this.getList_2()
-      }
-
-    },
-
-    //跳转页面-我的消息
-    openViewMyMessage(item) {
-      let from_id = this.userInfo.id//发送者的id
-      let to_id = item.customerResource.id//接收者ID
-      this.$navigateTo({
-        url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
-      })
-    },
-
-    //拨打电话
-    async dialTel(item) {
-
-      let tel = item.customerResource.phone_number
-
-      if (!tel) {
-        uni.showToast({
-          title: '电话号码为空',
-          icon: 'none'
-        });
-        return;
-      }
-
-
-      let param = {
-        staff_id: this.userInfo.id,//员工id
-        resource_id: item.customerResource.id,//资源ID
-        resource_type: '',//资源类型（如设备、文件、系统等）
-        communication_type: 'phone',//沟通类型: phone-电话, email-邮件, meeting-会议, other-其他
-        communication_result: 'success',//沟通结果: success-成功, failure-失败, pending-待定
-        remarks: null,//备注
-        tag: null,//标签
-      }
-
-      let res = await apiRoute.xs_communicationRecordsAdd(param)//添加通过记录
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-
-      uni.makePhoneCall({
-        phoneNumber: tel
-      })
-
-
-
-    },
-
-    //客户详情
-    clue_info(item) {
-      let resource_sharing_id = item.id///共享资源表id
-      this.$navigateTo({
-        url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}`
-      })
-    },
-
-    //公海-分配客户给员工相关
-    //打开分配列表
-    openAssign(item) {
-      this.select_item = item
-      this.select_show = true
-    },
-    //关闭分配列表
-    closeAssign(item) {
-      this.select_item = {}
-      this.select_show = false
-      this.select_options = this.select_options.map(v => ({ ...v, checked: false }));
-    },
-    //公海-分配客户给员工
-    async getSales(e){
-      let select_item = {...this.select_item}
-      console.log('选中',e,select_item)
-      this.closeAssign()//关闭选择窗
-      let param = {
-        resource_sharing_id: select_item.id,//共享资源表id
-        shared_by: e.options.value,//分给员工的id
-      }
-      let res = await apiRoute.xs_resourceSharingAssign(param)
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      uni.showToast({
-        title: res.msg,
-        icon: 'success'
-      })
-      //延迟1s执行
-      setTimeout(() => {
-        let param = {
-          id: 2,
-          index: 1,
-          name: "资源分配",
-        }
-        this.segmented(param)
-      }, 1000)
-    },
-
-    //时间选择器相关
-    //监听-时间选择器结果
-    changeDatePicker(e){
-      console.log('时间',e)
-      let shared_at_str = `${e.startDate.result} ~ ${e.endDate.result}`
-      this.showDrawerForm.shared_at_str = shared_at_str
-      this.cancelDatePicker()
-    },
-    //打开时间选择器
-    openDatePicker(){
-      this.date_picker_show = true
-    },
-    //关闭时间选择
-    cancelDatePicker(){
-      this.date_picker_show = false
-    },
-
-    //检索数据
-    async searchData(){
-      if(this.segmented_type == 1){
-        this.filteredData_1.shared_at_str = this.showDrawerForm.shared_at_str//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-        this.filteredData_1.phone_number = this.showDrawerForm.phone_number//客户资源表-手机号
-        this.filteredData_1.name = this.showDrawerForm.name//客户资源表-用户姓名
-        //我的客户
-        await this.resetFilteredData_1()
-        await this.getList_1()
-      }else{
-        this.filteredData_2.shared_at_str = this.showDrawerForm.shared_at_str//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-        this.filteredData_2.phone_number = this.showDrawerForm.phone_number//客户资源表-手机号
-        this.filteredData_2.name = this.showDrawerForm.name//客户资源表-用户姓名
-        //资源分配
-        await this.resetFilteredData_2()
-        await this.getList_2()
-      }
-      this.closeShowDrawer()
-    },
-
-    //打开抽屉筛选弹窗
-    openShowDrawer(){
-      this.showDrawer = true
-    },
-    //关闭抽屉筛选弹窗
-    closeShowDrawer(){
-      this.showDrawer = false
-    }
-  }
-}
+	import AQTabber from "@/components/AQ/AQTabber.vue"
+	import apiRoute from '@/api/apiRoute.js';
+	import marketApi from '@/api/market.js';
+
+	export default {
+		components: {
+			AQTabber,
+		},
+		data() {
+			return {
+				loading: false, //加载状态
+				lowerThreshold: 100, //距离底部多远触发
+				isReachedBottom: false, //防止重复加载|true=不可加载|false=可加载
+				selectedDate: this.getCurrentDate(), // 初始化当前日期
+				//筛选条件
+				filteredData: {
+					page: 1, //当前页码
+					limit: 10, //每页返回数据条数
+					total: 10, //数据总条数
+					type: '0', //0=全部,1=待跟进,2=7天,3=30天
+					is_gh: '2', //1=资源分配,2=我的客户
+				},
+
+				//顶部Tab栏
+				values: [{
+						id: 1,
+						name: '我的客户'
+					},
+					// {
+					//   id: 2,
+					//   name: '资源分配'
+					// }
+				],
+				segmented_type: 1, //当前选中的Tab栏目|1=我的客户,2=资源分配
+
+				userInfo: {}, //用户信息
+				//我的客户列表相关
+				//筛选条件
+				filteredData_1: {
+					page: 1, //当前页码
+					limit: 10, //每页返回数据条数
+					total: 10, //数据总条数
+					shared_by: '', //共享人ID|0=未分配
+					shared_at_str: '', //共享时间|开始时间(Y-m-d)-结束时间(Y-m-d)
+					phone_number: '', //客户资源表-手机号
+					name: '', //客户资源表-用户姓名
+				},
+				//数据列表
+				tableList_1: [], //表格数据
+
+				//资源分配列表相关
+				//筛选条件
+				filteredData_2: {
+					page: 1, //当前页码
+					limit: 10, //每页返回数据条数
+					total: 10, //数据总条数
+					shared_by: '0', //共享人ID|0=未分配
+					shared_at_str: '', //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+					phone_number: '', //客户资源表-手机号
+					name: '', //客户资源表-用户姓名
+				},
+				//数据列表
+				tableList_2: [], //表格数据
+
+				//员工select选择器
+				select_show: false, //是否展示选择器
+				select_item: {}, //当前选中的选项
+				select_options: [
+					// {
+					//   text: '张三',
+					//   value: '1',
+					// }
+				], //选择器可选项
+
+				//时间选择器相关
+				date_picker_show: false, //是否展示时间选择器
+
+				//抽屉搜索条件展示窗相关
+				showDrawer: false, //是否展示|false=否
+				showDrawerForm: {
+					shared_at_str: '', //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+					phone_number: '', //客户资源表-手机号
+					name: '', //客户资源表-用户姓名
+				},
+
+
+			}
+		},
+		onLoad(options) {},
+		onShow() {
+			this.init() //初始化
+		},
+		//下拉刷新
+		async onPullDownRefresh() {
+			//重置为第一页
+			if (this.segmented_type == 1) {
+				//我的客户
+				await this.resetFilteredData_1()
+				await this.getList_1()
+			} else {
+				//资源分配
+				await this.resetFilteredData_2()
+				await this.getList_2()
+			}
+
+
+		},
+		methods: {
+			getCurrentDate() {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = String(now.getMonth() + 1).padStart(2, '0');
+				const day = String(now.getDate()).padStart(2, '0');
+				return `${year}-${month}-${day}`; // 示例：2024-04-15
+			},
+			//初始化
+			async init() {
+				await this.getUserInfo();
+				if (this.segmented_type == 1) {
+					await this.getList_1();
+				} else {
+					await this.getList_2();
+				}
+			},
+
+			//获取用户信息
+			async getUserInfo() {
+				let res = await apiRoute.getPersonnelInfo({})
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				this.userInfo = res.data
+
+				this.filteredData_1.shared_by = this.userInfo.id //共享人ID始终是当前登录的员工
+
+				//判断用户是不是销售经理,是就展示"资源分配"
+				if (this.userInfo.role_key_arr.includes('market_manager')) {
+					this.values = [{
+							id: 1,
+							name: '我的客户'
+						},
+						{
+							id: 2,
+							name: '资源分配'
+						}
+					]
+					//是经理的情况下,获取这个校区的全部用户(身份是销售的)
+					await this.getPersonnelAll();
+				} else {
+					this.values = [{
+						id: 1,
+						name: '我的客户'
+					}, ]
+				}
+			},
+
+
+			//获取全部员工
+			async getPersonnelAll() {
+				let res = await apiRoute.common_getPersonnelAll({
+					personnel_id: this.userInfo.id, //客户id
+					account_type: 'market', //账号类型|teacher=老师,market=销售
+				})
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				let arr = []
+				res.data.forEach((v, k) => {
+					arr.push({
+						text: v.name,
+						value: v.id,
+					})
+				})
+				this.select_options = arr
+				console.log('员工', this.select_options)
+			},
+
+			//获取列表-我的客户相关
+			//加载更多(下一页)
+			loadMoreData_1() {
+				//判断是否加载
+				if (!this.isReachedBottom) {
+					this.isReachedBottom = true; //设置为不可请求状态
+					this.getList_1();
+				}
+			},
+			//重置为第一页
+			async resetFilteredData_1() {
+				this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
+
+				this.filteredData_1.page = 1 //当前页码
+				this.filteredData_1.limit = 10 //每页返回数据条数
+				this.filteredData_1.total = 10 //数据总条数
+			},
+			//获取列表-我的客户
+			async getList_1() {
+				this.loading = true
+
+				let data = {
+					...this.filteredData_1
+				}
+
+				//判断是否还有数据
+				if (this.filteredData_1.page * this.filteredData_1.limit > this.filteredData_1.total) {
+					this.loading = false
+					uni.showToast({
+						title: '暂无更多',
+						icon: 'none'
+					})
+					return
+				}
+
+				this.filteredData_1.shared_by = this.userInfo.id //共享人ID始终是当前登录的员工
+
+				if (data.page == 1) {
+					this.tableList_1 = []
+				}
+
+				let res = await apiRoute.xs_resourceSharingIndex(data)
+				this.loading = false
+				this.isReachedBottom = false;
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				this.tableList_1 = this.tableList_1.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
+
+				console.log('列表1', this.tableList_1)
+				this.filteredData_1.total = res.data.total
+				this.filteredData_1.page++
+
+			},
+
+			//获取列表-资源分配相关
+			//加载更多(下一页)
+			loadMoreData_2() {
+				//判断是否加载
+				if (!this.isReachedBottom) {
+					this.isReachedBottom = true; //设置为不可请求状态
+					this.getList_2();
+				}
+			},
+			//重置为第一页
+			async resetFilteredData_2() {
+				this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
+				this.filteredData_2.page = 1 //当前页码
+				this.filteredData_2.limit = 10 //每页返回数据条数
+				this.filteredData_2.total = 10 //数据总条数
+			},
+			//获取列表-资源分配
+			async getList_2() {
+				this.loading = true
+
+				let data = {
+					...this.filteredData_2
+				}
+
+				//判断是否还有数据
+				if (this.filteredData_2.page * this.filteredData_2.limit > this.filteredData_2.total) {
+					this.loading = false
+					uni.showToast({
+						title: '暂无更多',
+						icon: 'none'
+					})
+					return
+				}
+
+				if (data.page == 1) {
+					this.tableList_2 = []
+				}
+
+				let res = await apiRoute.xs_resourceSharingIndex(data)
+				this.loading = false
+				this.isReachedBottom = false;
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+				console.log(123123, res)
+
+				this.tableList_2 = this.tableList_2.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
+
+				console.log('列表2', this.tableList_2)
+				this.filteredData_2.total = res.data.total
+				this.filteredData_2.page++
+			},
+
+
+			//切换tag列表
+			async segmented(param) {
+				this.segmented_type = param.id //1=我的客户,2=资源分配
+
+				//重置筛选抽屉中的表单数据
+				this.showDrawerForm.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+				this.showDrawerForm.phone_number = '' //客户资源表-手机号
+				this.showDrawerForm.name = '' //客户资源表-用户姓名
+
+				if (this.segmented_type == 1) {
+					this.filteredData_1.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+					this.filteredData_1.phone_number = '' //客户资源表-手机号
+					this.filteredData_1.name = '' //客户资源表-用户姓名
+
+					//我的客户
+					//重置为第一页
+					await this.resetFilteredData_1()
+					await this.getList_1()
+				} else {
+					this.filteredData_2.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+					this.filteredData_2.phone_number = '' //客户资源表-手机号
+					this.filteredData_2.name = '' //客户资源表-用户姓名
+					//资源分配
+					//重置为第一页
+					await this.resetFilteredData_2()
+					await this.getList_2()
+				}
+
+			},
+
+			//跳转页面-我的消息
+			openViewMyMessage(item) {
+				let from_id = this.userInfo.id //发送者的id
+				let to_id = item.customerResource.id //接收者ID
+				this.$navigateTo({
+					url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
+				})
+			},
+
+			//拨打电话
+			async dialTel(item) {
+
+				let tel = item.customerResource.phone_number
+
+				if (!tel) {
+					uni.showToast({
+						title: '电话号码为空',
+						icon: 'none'
+					});
+					return;
+				}
+
+
+				let param = {
+					staff_id: this.userInfo.id, //员工id
+					resource_id: item.customerResource.id, //资源ID
+					resource_type: '', //资源类型（如设备、文件、系统等）
+					communication_type: 'phone', //沟通类型: phone-电话, email-邮件, meeting-会议, other-其他
+					communication_result: 'success', //沟通结果: success-成功, failure-失败, pending-待定
+					remarks: null, //备注
+					tag: null, //标签
+				}
+
+				let res = await apiRoute.xs_communicationRecordsAdd(param) //添加通过记录
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+
+				uni.makePhoneCall({
+					phoneNumber: tel
+				})
+
+
+
+			},
+
+			//客户详情
+			clue_info(item) {
+				let resource_sharing_id = item.id ///共享资源表id
+				this.$navigateTo({
+					url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}`
+				})
+			},
+
+			//公海-分配客户给员工相关
+			//打开分配列表
+			openAssign(item) {
+				this.select_item = item
+				this.select_show = true
+			},
+			//关闭分配列表
+			closeAssign(item) {
+				this.select_item = {}
+				this.select_show = false
+				this.select_options = this.select_options.map(v => ({
+					...v,
+					checked: false
+				}));
+			},
+			//公海-分配客户给员工
+			async getSales(e) {
+				let select_item = {
+					...this.select_item
+				}
+				console.log('选中', e, select_item)
+				this.closeAssign() //关闭选择窗
+				let param = {
+					resource_sharing_id: select_item.id, //共享资源表id
+					shared_by: e.options.value, //分给员工的id
+				}
+				let res = await apiRoute.xs_resourceSharingAssign(param)
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+				uni.showToast({
+					title: res.msg,
+					icon: 'success'
+				})
+				//延迟1s执行
+				setTimeout(() => {
+					let param = {
+						id: 2,
+						index: 1,
+						name: "资源分配",
+					}
+					this.segmented(param)
+				}, 1000)
+			},
+
+			//时间选择器相关
+			//监听-时间选择器结果
+			changeDatePicker(e) {
+				console.log('时间', e)
+				let shared_at_str = `${e.startDate.result} ~ ${e.endDate.result}`
+				this.showDrawerForm.shared_at_str = shared_at_str
+				this.cancelDatePicker()
+			},
+			//打开时间选择器
+			openDatePicker() {
+				this.date_picker_show = true
+			},
+			//关闭时间选择
+			cancelDatePicker() {
+				this.date_picker_show = false
+			},
+
+			//检索数据
+			async searchData() {
+				if (this.segmented_type == 1) {
+					this.filteredData_1.shared_at_str = this.showDrawerForm
+						.shared_at_str //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+					this.filteredData_1.phone_number = this.showDrawerForm.phone_number //客户资源表-手机号
+					this.filteredData_1.name = this.showDrawerForm.name //客户资源表-用户姓名
+					//我的客户
+					await this.resetFilteredData_1()
+					await this.getList_1()
+				} else {
+					this.filteredData_2.shared_at_str = this.showDrawerForm
+						.shared_at_str //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+					this.filteredData_2.phone_number = this.showDrawerForm.phone_number //客户资源表-手机号
+					this.filteredData_2.name = this.showDrawerForm.name //客户资源表-用户姓名
+					//资源分配
+					await this.resetFilteredData_2()
+					await this.getList_2()
+				}
+				this.closeShowDrawer()
+			},
+
+			//打开抽屉筛选弹窗
+			openShowDrawer() {
+				this.showDrawer = true
+			},
+			//关闭抽屉筛选弹窗
+			closeShowDrawer() {
+				this.showDrawer = false
+			}
+		}
+	}
 </script>
 
 <style lang="less" scoped>
-	.assemble{
+	.assemble {
 		width: 100%;
 		height: 100vh;
 		background-color: #292929;
 		overflow: auto;
-    .search_section{
-      margin-top: 20rpx;
-      padding: 10rpx 20rpx;
-      display: flex;
-      flex-direction: column;
-      .item {
-        height: 60rpx;
-        display: flex;
-        justify-content: center;
-        .input_box {
-          width: 75%;
-          .input_box_text{
-            height: 60rpx;
-            line-height: 60rpx;
-            background-color: #fff;
-            padding-left: 20rpx;
-            color: #cccccc;
-            font-size: 28rpx;
-          }
-        }
-        .button{
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          border-radius: 5rpx;
-          font-size: 24rpx;
-          color: #fff;
-          background-color: #29d3b4;
-          width: 20%;
-          height: 100%;
-        }
-      }
-    }
+
+		.search_section {
+			margin-top: 20rpx;
+			padding: 10rpx 20rpx;
+			display: flex;
+			flex-direction: column;
+
+			.item {
+				height: 60rpx;
+				display: flex;
+				justify-content: center;
+
+				.input_box {
+					width: 75%;
+
+					.input_box_text {
+						height: 60rpx;
+						line-height: 60rpx;
+						background-color: #fff;
+						padding-left: 20rpx;
+						color: #cccccc;
+						font-size: 28rpx;
+					}
+				}
+			}
+		}
 	}
-	.search{
+
+	.search {
 		width: 92%;
 		margin: auto;
 		display: flex;
 		margin-top: 20rpx;
 	}
-	.selected{
+
+	.selected {
 		background: #294e48;
 		border-radius: 16rpx;
 		padding: 12rpx 8rpx;
@@ -722,7 +723,8 @@ export default {
 		color: #29d3b4;
 		margin-left: 5rpx;
 	}
-	.not-selected{
+
+	.not-selected {
 		margin-left: 5rpx;
 		background: #ffffff;
 		border: 4rpx #959595 solid;
@@ -730,7 +732,8 @@ export default {
 		padding: 12rpx 8rpx;
 		text-align: center;
 	}
-	.card{
+
+	.card {
 		width: 92%;
 		margin: 20rpx auto;
 		background: #434544;
@@ -738,16 +741,19 @@ export default {
 		display: flex;
 		align-items: center;
 	}
-	.card-image{
+
+	.card-image {
 		width: 60rpx;
 		height: 60rpx;
 	}
-	.card-text{
+
+	.card-text {
 		font-size: 32rpx;
 		padding-left: 16rpx;
 		color: #fff;
 	}
-	.card-label{
+
+	.card-label {
 		margin-left: 30rpx;
 		background: #76575a;
 		width: 130rpx;
@@ -756,35 +762,42 @@ export default {
 		text-align: center;
 		border-radius: 0 50rpx 50rpx 40rpx;
 	}
-	.card-con{
+
+	.card-con {
 		font-size: 30rpx;
 		padding: 20rpx 10rpx 20rpx 16rpx;
 		color: #fff;
 	}
-	.card-con-span{
+
+	.card-con-span {
 		font-size: 24rpx;
 		color: #a47332;
 		padding-left: 12rpx;
 	}
+
 	.drop-image-x {
 		width: 20rpx;
 		height: 20rpx;
 	}
+
 	.title-x {
 		font-size: 28rpx;
 		color: #fff;
 		padding-left: 10rpx;
 	}
-	.card-date{
+
+	.card-date {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.image{
+
+	.image {
 		width: 70rpx;
 		height: 70rpx;
 	}
-	.neck{
+
+	.neck {
 		width: 60rpx;
 		height: 60rpx;
 		border-radius: 50%;
@@ -793,59 +806,82 @@ export default {
 		line-height: 60rpx;
 		text-align: center;
 	}
-  //领取按钮
-  .ling{
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius:50%;
-    color: #fff;
-    width: 50rpx;
-    height: 50rpx;
-    background-color: #F59A23;
-  }
-
-  //抽屉搜索栏
-  .fui-scroll__view {
-    margin-top: 60rpx;
-    width: 520rpx;
-    flex: 1;
-    overflow: hidden;
-    .fui-title {
-      padding: 40rpx 32rpx;
-      padding-bottom: 20rpx;
-      box-sizing: border-box;
-      font-weight: bold;
-    }
-    .drawer_box{
-      border: 1px solid red;
-      .item{
-        display: flex;
-        flex-direction: column;
-        gap: 15rpx;
-        .title{}
-        .input_box {
-          border: 1px solid #292929;
-          width: 450rpx;
-          ::v-deep .fui-input__wrap{
-            padding: 10rpx !important;
-            height: 100%;
-          }
-        }
-      }
-    }
-    .fui-btn__box {
-      padding: 40rpx 0;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      gap: 30rpx;
-    }
-  }
-
-
-
-
-
-</style>
+
+	//领取按钮
+	.ling {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 50%;
+		color: #fff;
+		width: 50rpx;
+		height: 50rpx;
+		background-color: #F59A23;
+	}
+
+	//抽屉搜索栏
+	.fui-scroll__view {
+		margin-top: 60rpx;
+		width: 520rpx;
+		flex: 1;
+		overflow: hidden;
+
+		.fui-title {
+			padding: 40rpx 32rpx;
+			padding-bottom: 20rpx;
+			box-sizing: border-box;
+			font-weight: bold;
+		}
+
+		.drawer_box {
+			.item {
+				display: flex;
+				flex-direction: column;
+				gap: 15rpx;
+
+				.title {}
+
+				.input_box {
+					border: 1px solid #292929;
+					width: 450rpx;
+
+					::v-deep .fui-input__wrap {
+						padding: 10rpx !important;
+						height: 100%;
+					}
+				}
+			}
+		}
+
+		.fui-btn__box {
+			padding: 40rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			gap: 30rpx;
+		}
+
+	}
+
+	.button {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 5rpx;
+		font-size: 24rpx;
+		color: #fff;
+		background-color: #29d3b4;
+		width: 20%;
+		height: 100%;
+
+
+	}
+
+	.clientbtn {
+		width: 200px;
+		height: 40px;
+		font-size: 16px;
+		border-radius: 5px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/market/index/index.vue b/pages/market/index/index.vue
index 4ec9e2a..5834d2a 100644
--- a/pages/market/index/index.vue
+++ b/pages/market/index/index.vue
@@ -118,7 +118,7 @@
 					<view>
 						<image :src="$util.img('/uniapp_src/static/images/index/danlv.png')" class="drop-image"></image>
 					</view>
-					<view class="title">上月业绩</view>
+					<view class="title">个人业绩</view>
 				</view>
 
 				<view class="coach-message">
@@ -130,9 +130,9 @@
 										<image :src="$util.img('/uniapp_src/static/images/index/danlv.png')"
 											class="drop-image-x"></image>
 									</view>
-									<view class="title-x">资源总数</view>
+									<view class="title-x">今日新增资源</view>
 								</view>
-								<view class="title-x1">{{infoData.last_month.new_total}}人</view>
+								<view class="title-x1">{{infoData.last_month.xzzy}}人</view>
 							</view>
 
 							<view style="width: 48%;">
@@ -141,9 +141,9 @@
 										<image :src="$util.img('/uniapp_src/static/images/index/danlv.png')"
 											class="drop-image-x"></image>
 									</view>
-									<view class="title-x">业绩收入</view>
+									<view class="title-x">今日业绩收入</view>
 								</view>
-								<view class="title-x1">{{infoData.last_month.assigned_sales}}人</view>
+								<view class="title-x1">{{infoData.last_month.yjsr}}人</view>
 							</view>
 						</view>
 
@@ -154,21 +154,21 @@
 										<image :src="$util.img('/uniapp_src/static/images/index/danlv.png')"
 											class="drop-image-x"></image>
 									</view>
-									<view class="title-x">关单数量</view>
+									<view class="title-x">历史关单数量</view>
 								</view>
-								<view class="title-x1">{{infoData.last_month.yesterday_new}}人</view>
+								<view class="title-x1">{{infoData.last_month.gdsl}}人</view>
 							</view>
 
-							<!-- <view style="width: 48%;">
+							<view style="width: 48%;">
 								<view style="display: flex;align-items: center;">
 									<view style="padding: 12rpx;">
 										<image :src="$util.img('/uniapp_src/static/images/index/danlv.png')"
 											class="drop-image-x"></image>
 									</view>
-									<view class="title-x">今日拉新</view>
+									<view class="title-x">资源未分配数量</view>
 								</view>
-								<view class="title-x1">{{infoData.last_month.today_new}}人</view>
-							</view> -->
+								<view class="title-x1">{{infoData.last_month.wfpsl}}人</view>
+							</view>
 						</view>
 					</view>
 				</view>
diff --git a/pages/student/login/login.vue b/pages/student/login/login.vue
index d7bfb92..8a15451 100644
--- a/pages/student/login/login.vue
+++ b/pages/student/login/login.vue
@@ -309,7 +309,10 @@ export default {
 
         // 使用 redirectTo 替代 navigateTo，避免页面栈堆积
         uni.redirectTo({
-          url: openPath
+          url: openPath,
+		  complete(e) {
+		  	console.log(e)
+		  }
         });
         return
       }
diff --git a/uni.scss b/uni.scss
index 423d10c..d3e583e 100644
--- a/uni.scss
+++ b/uni.scss
@@ -92,4 +92,13 @@ $font-size-paragraph: 30rpx;
 /* coolc-coupon 插件 */
 $font-sm: 20rpx;
 $font-color-999: #999;
-$bgcolor_white: #fff;
\ No newline at end of file
+$bgcolor_white: #fff;
+
+	$uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
+	$uni-border-color: #EDEDED;
+	$uni-text-color: #333;
+	$uni-bg-color-hover:#f1f1f1;
+	$uni-font-size-base:14px;
+	$uni-text-color-placeholder: #808080;
+	$uni-color-subtitle: #555555;
+	$uni-text-color-grey:#999;
\ No newline at end of file
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
index 0beebfb..5c0e578 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -367,14 +367,6 @@
 </script>
 
 <style lang="scss" scoped>
-	$uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
-	$uni-border-color: #EDEDED;
-	$uni-text-color: #333;
-	$uni-bg-color-hover:#f1f1f1;
-	$uni-font-size-base:14px;
-	$uni-text-color-placeholder: #808080;
-	$uni-color-subtitle: #555555;
-	$uni-text-color-grey:#999;
 	.uni-calendar {
 		/* #ifndef APP-NVUE */
 		display: flex;