diff --git a/api/apiRoute.js b/api/apiRoute.js
index d081b2e..94806c7 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -88,6 +88,13 @@ export default {
             return res;
         })
     },
+    //公共端-忘记密码-通过短信验证码进行密码重置(学生/员工通用)
+    common_forgetPassword(data = {}) {
+        let url = '/common/forgetPassword'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
 
 
 
@@ -241,6 +248,13 @@ export default {
             return res;
         })
     },
+    //销售端-查询客户资源全部列表
+    xs_getAllCustomerResources(data = {}) {
+        let url = '/customerResources/getAll'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
     //销售端-客户资源-获取修改日志列表
     xs_customerResourcesGetEditLogList(data = {}) {
         let url = '/customerResources/getEditLogList'
@@ -299,6 +313,14 @@ export default {
             return res;
         })
     },
+    //销售端-好友关系列表
+    xs_chatGetChatFriendsList(data = {}) {
+        let url = '/chat/getChatFriendsList'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+
 
 
 
diff --git a/components/AQ/AQUplodeImage.vue b/components/AQ/AQUplodeImage.vue
new file mode 100644
index 0000000..7d67ef8
--- /dev/null
+++ b/components/AQ/AQUplodeImage.vue
@@ -0,0 +1,56 @@
+<template>
+  <view @click="chooseImage">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    multiple: { type: Boolean, default: false },
+    limit: { type: Number, default: 1 },
+    uploadUrl: { type: String, default: '' },
+    extraData: { type: Object, default: () => ({}) }
+  },
+  methods: {
+    chooseImage() {
+      uni.chooseImage({
+        count: this.multiple ? this.limit : 1,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          const tempFilePath = res.tempFilePaths[0];
+          this.uploadFile(tempFilePath);
+        }
+      });
+    },
+    uploadFile(filePath) {
+      let token = uni.getStorageSync('token');
+      uni.uploadFile({
+        url: this.uploadUrl,
+        filePath: filePath,
+        name: 'file',
+        header: {
+          'token': token
+        },
+        formData: this.extraData.formData || {},
+        success: (e) => {
+          try {
+            let res = JSON.parse(e.data.replace(/\ufeff/g, "") || "{}");
+            if (res.code === 1) {
+              this.$emit('uplodeImageRes', res.data, this.extraData);
+            } else {
+              uni.showToast({ title: res.msg, icon: 'none' });
+            }
+          } catch (error) {
+            uni.showToast({ title: '解析失败', icon: 'none' });
+          }
+        },
+        fail: () => {
+          uni.showToast({ title: '上传失败', icon: 'none' });
+        }
+      });
+    }
+  }
+}
+</script>
diff --git a/pages/coach/class/info.vue b/pages/coach/class/info.vue
index 5b4bdb8..b98df59 100644
--- a/pages/coach/class/info.vue
+++ b/pages/coach/class/info.vue
@@ -276,7 +276,7 @@ export default {
       }
 
       //判断是否还有数据
-      if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) {
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/coach/class/list.vue b/pages/coach/class/list.vue
index 27da062..7b12d2b 100644
--- a/pages/coach/class/list.vue
+++ b/pages/coach/class/list.vue
@@ -116,7 +116,7 @@ export default {
       console.log(111,(this.filteredData.page * this.filteredData.limit) ,(this.filteredData.total))
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/coach/job/list.vue b/pages/coach/job/list.vue
index dfd5d73..8f31169 100644
--- a/pages/coach/job/list.vue
+++ b/pages/coach/job/list.vue
@@ -96,7 +96,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/coach/my/arrival_statistics.vue b/pages/coach/my/arrival_statistics.vue
index a582a8c..9c903f1 100644
--- a/pages/coach/my/arrival_statistics.vue
+++ b/pages/coach/my/arrival_statistics.vue
@@ -114,7 +114,7 @@ export default {
       }
 
       //判断是否还有数据
-      if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) {
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/coach/my/my_attendance.vue b/pages/coach/my/my_attendance.vue
index 84511c4..b892593 100644
--- a/pages/coach/my/my_attendance.vue
+++ b/pages/coach/my/my_attendance.vue
@@ -355,7 +355,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/coach/student/info.vue b/pages/coach/student/info.vue
index c2171bd..904152f 100644
--- a/pages/coach/student/info.vue
+++ b/pages/coach/student/info.vue
@@ -239,7 +239,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/common/contract_list.vue b/pages/common/contract_list.vue
index 481375c..b20a320 100644
--- a/pages/common/contract_list.vue
+++ b/pages/common/contract_list.vue
@@ -101,7 +101,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/common/im_chat_info.vue b/pages/common/im_chat_info.vue
index bc709d3..c302319 100644
--- a/pages/common/im_chat_info.vue
+++ b/pages/common/im_chat_info.vue
@@ -6,56 +6,106 @@
       <scroll-view
           class="section_1"
           scroll-y="true"
+          :scroll-top="scrollTop"
           :lower-threshold="lowerThreshold"
-          style="height: 80vh;"
+          style="height: 78vh;"
       >
         <view class="ul">
           <view class="item_box" v-for="(v,k) in tableList" :key="k" :id="'item_' + v.id">
             <view class="time_section" v-if="v.created_at">{{v.created_at}}</view>
 
             <view class="li" v-if="v.direction == `left`">
-              <view class="item left_item">
-                <view class="text_box">{{v.content}}</view>
+              <view class="item left_item" :style="{ backgroundColor: v.message_type === 'text' ? '#f4f6f9' : '' }">
+                <!--文本内容-->
+                <view class="text_box" v-if="v.message_type == 'text'">{{v.content}}</view>
+                <!-- 图片内容 -->
+                <view class="img_box" v-if="v.message_type == 'img'" @click="previewImage(v.content)">
+                  <image class="chat_img" :src="v.content" mode="aspectFill"></image>
+                </view>
               </view>
               <view class="item"></view>
             </view>
 
             <view class="li" v-if="v.direction == `right`">
               <view class="item"></view>
-              <view class="item right_item">
-                <view class="text_box">{{v.content}}</view>
+              <view class="item right_item" :style="{ backgroundColor: v.message_type === 'text' ? '#1684fc' : '' }">
+                <view class="text_box" v-if="v.message_type == 'text'">{{v.content}}</view>
+                <!-- 图片内容 -->
+                <view class="img_box" v-if="v.message_type == 'img'" @click="previewImage(v.content)">
+                  <image class="chat_img" :src="v.content" mode="aspectFill"></image>
+                </view>
               </view>
             </view>
           </view>
         </view>
       </scroll-view>
     </view>
+
     <view class="input_section">
       <view class="left_box">
         <input class="input" v-model="formData.content" type="text" placeholder="请输入">
       </view>
       <view class="right_box">
-        <image @click="submitForm()" class="send_img" src="@/static/images/common/fa_song.png"></image>
+        <!--发送-->
+        <view class="img_box">
+          <image @click="submitTextForm()" class="send_img" src="@/static/images/common/fa_song.png"></image>
+        </view>
+
+        <!--更多选择-->
+        <view class="img_box">
+          <image @click="openMore()" class="send_img" src="@/static/images/common/jia_hao.png"></image>
+        </view>
       </view>
     </view>
+
+    <!--更多选择-->
+    <fui-bottom-popup :show="moreShow" @close="closeMore">
+      <view class="more_section">
+        <view class="fui-scroll__wrap">
+          <scroll-view scroll-y class="fui-scroll__view">
+            <view class="ul">
+              <view class="li" @click="">
+                  <AQUplodeImage
+                      :uploadUrl=uploadUrl
+                      :extraData="{ input_name: 'img_uplode', formData:{} }"
+                      @uplodeImageRes="uplodeImageRes"
+                  >
+                    <view class="icon_box">
+                      <fui-icon name="picture-fill" :size="80"></fui-icon>
+                    </view>
+                    <view class="title">相册</view>
+                  </AQUplodeImage>
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+      </view>
+    </fui-bottom-popup>
+
   </view>
 </template>
 
 <script>
 import apiRoute from '@/api/apiRoute.js';
-import memberApi from '@/api/member.js';
-import commonApi from '@/api/common.js';
-import AQUplodeImgMulti from '@/components/AQ/AQUplodeImgMulti';
+
+import {
+  Api_url
+} from "@/common/config.js";
+import AQUplodeImage from '@/components/AQ/AQUplodeImage';//单图上传组件
 import AQTabber from "@/components/AQ/AQTabber"
 
 
 export default {
   components: {
     AQTabber,
-    AQUplodeImgMulti,
+    AQUplodeImage,
   },
   data() {
     return {
+      uploadUrl:  `${Api_url}/uploadImage`,
+
+
+      scrollTop:'',//滚动条位置,用于加载第一页后滚动到底部
       loading:false,//加载状态
       lowerThreshold: 100,//距离底部多远触发
       isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
@@ -90,7 +140,8 @@ export default {
         content: '',//文本内容（JSON 格式扩展字段）,文本类型=纯文字,图片类型=绝对路径
       },
 
-      lastItemId: null,
+      //更多选项相关
+      moreShow:false,
     }
   },
   onLoad(options) {
@@ -137,16 +188,10 @@ export default {
       //获取聊天记录列表
       await this.getList();
 
-      // 更新最后一个 item 的 ID
-      this.lastItemId = 'item_' + (this.tableList.length - 1);
-
-      // 滚动到底部
-      this.$nextTick(() => {
-        this.$refs.scrollView.scrollTo({ top: this.scrollViewHeight });
-      });
-
-      // 或者直接使用 scroll-into-view
-      this.scrollIntoView = this.lastItemId;
+      // 首次加载后滚动到底部
+      if (this.filteredData.page == 2) {
+        this.scrollToBottom()
+      }
     },
 
     //获取好友关系详情
@@ -265,6 +310,12 @@ export default {
       // console.log('接收AQ上传回调xxx2',this.formData.member_store_certification_arr)
     },
 
+
+    //发送文本信息
+    submitTextForm(){
+      this.formData.message_type = 'text'
+      this.submitForm()
+    },
     //发送站内信
     async submitForm() {
       let data = {...this.formData}
@@ -285,24 +336,60 @@ export default {
       } else {
         let content = this.formData.content
         this.formData.content = ''//清空输入框
+
+
+
         let msgData = {
-          "id": '',
-          "hair_staff_id": this.filteredData.hair_staff_id,
-          "closed_staff_id": '',
-          "content": content,
-          "status": 1,
-          "type": 2,
-          "create_time": "",
-          "redirect": null,
-          "title": null,
-          "direction": "right",
-          "show_time": ""
+          id:'',
+          from_type:data.from_type,//发送者类型|personnel=员工,customer=学生(客户)
+          from_id:data.from_id,//发送者ID
+          to_id:data.to_id,//接收者ID
+          friend_id:data.friend_id,//关联chat_friends表id
+          message_type: data.message_type,//消息类型|text=文本,img=图片
+          content: data.content,//文本内容（JSON 格式扩展字段）,文本类型=纯文字,图片类型=绝对路径
+          direction:'right'
         }
         //将发送的消息放在最下方
         this.tableList = this.tableList.concat(msgData);
       }
     },
 
+    //页面滚动到底部
+    scrollToBottom() {
+      this.$nextTick(() => {
+        this.scrollTop = 999999 // 足够大的值确保滚动到底部
+      })
+    },
+
+    //打开更多选择弹窗
+    openMore(){
+      this.moreShow = true
+    },
+    //关闭更多选择弹窗
+    closeMore(){
+      this.moreShow = false
+    },
+
+    //但文件上传回调
+    uplodeImageRes(resData,extraData){
+      console.log('上传成功回调',resData,extraData)
+      //判断是不是上传相册图片
+      if(extraData.input_name == 'img_uplode'){
+        this.closeMore()//关闭更多选择弹窗
+        this.formData.content = resData.url
+        this.formData.message_type = 'img'
+        this.submitForm()
+      }
+    },
+
+    //图片预览
+    previewImage(url){
+      uni.previewImage({
+        current: url, // 当前图片地址
+        urls: [url]   // 所有图片列表（可以是多个）
+      });
+    },
+
   }
 }
 </script>
@@ -330,8 +417,8 @@ export default {
 		min-height: 100vh;
 		background: #292929 100%;
 		padding: 0 0rpx;
-		padding-top: 32rpx;
-		padding-bottom: 150rpx;
+		padding-top: 120rpx;
+		padding-bottom: 120rpx;
 		font-size: 28rpx;
 		display: flex;
 		flex-direction: column;
@@ -366,13 +453,20 @@ export default {
             word-wrap: break-word; /* 允许长单词或 URL 换行 */
             word-break: break-all; /* 强制所有字符换行 */
             .text_box{}
+            .img_box {
+              .chat_img {
+                width: 200rpx;
+                height: 200rpx;
+                border-radius: 16rpx;
+              }
+            }
           }
           .left_item{
-            background-color: #f4f6f9;
+            //background-color: #f4f6f9;
             color: #343434;
           }
           .right_item{
-            background-color: #1684fc;
+            //background-color: #1684fc;
             color: #fff;
           }
         }
@@ -387,12 +481,13 @@ export default {
     position: fixed;
     bottom: 0;
 
-    padding: 50rpx 50rpx;
+    padding: 30rpx;
+    padding-bottom: 50rpx;
     display: flex;
     justify-content:space-between;
     align-items: center;
+    gap: 20rpx;
     .left_box{
-      width: 70%;
       .input{
         background-color: #f4f6f9;
         height: 88rpx;
@@ -400,22 +495,28 @@ export default {
         font-size: 28rpx;
         border-radius: 32rpx;
 
-        width: 532rpx;
+        width: 480rpx;
         color: #292929;
         font-size: 28rpx;
       }
     }
     .right_box{
-      border-radius: 50%;
-      background-color: #a2cefe;
-      width: 88rpx;
-      height: 88rpx;
+      width: 100%;
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       align-items: center;
-      .send_img{
-        width: 36rpx;
-        height: 36rpx;
+      .img_box{
+        width: 88rpx;
+        height: 88rpx;
+        border-radius: 50%;
+        background-color: #a2cefe;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        .send_img{
+          width: 36rpx;
+          height: 36rpx;
+        }
       }
     }
 
@@ -425,4 +526,44 @@ export default {
 		color: #999999;
 		padding-left: 30rpx;
 	}
+
+
+  /* 更多选项相关 自定义内容区样式需自行控制 */
+  .more_section{
+    .fui-scroll__wrap {
+      padding-top: 30rpx;
+      position: relative;
+    }
+    .fui-title {
+      font-size: 30rpx;
+      font-weight: bold;
+      text-align: center;
+      padding-bottom: 24rpx;
+    }
+    .fui-icon__close {
+      position: absolute;
+      top: 24rpx;
+      left: 24rpx;
+    }
+    .fui-scroll__view {
+      width: 100%;
+      height: 350rpx;
+    }
+
+    .ul{
+      padding: 10rpx 40rpx;
+      display: flex;
+      .li{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        .icon_box{
+        }
+        .title{
+          font-size: 28rpx;
+          text-align: center;
+        }
+      }
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue
index 8e79839..7b36c0e 100644
--- a/pages/common/my_attendance.vue
+++ b/pages/common/my_attendance.vue
@@ -469,7 +469,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/common/my_message.vue b/pages/common/my_message.vue
index 6e9b765..a8729e2 100644
--- a/pages/common/my_message.vue
+++ b/pages/common/my_message.vue
@@ -24,9 +24,9 @@
         >
           <view class="left">
             <image
-                v-if="v.type==2"
+                v-if="(['1','2','3'].includes(String(userType)))"
                 class="pic"
-                :src="(v.header ? $util.img(v.header) : `@/static/images/common/yong_hu.png`)"
+                src="@/static/images/common/yong_hu.png"
                 model="aspectFit"
             ></image>
 
@@ -46,19 +46,27 @@
 </template>
 
 <script>
+import apiRoute from '@/api/apiRoute.js';
 import memberApi from '@/api/member.js';
 import commonApi from '@/api/common.js';
-import AQUplodeImgMulti from '@/components/AQ/AQUplodeImgMulti';
 import AQTabber from "@/components/AQ/AQTabber"
 
 
 export default {
   components: {
     AQTabber,
-    AQUplodeImgMulti,
   },
   data() {
     return {
+      //筛选条件
+      filteredData:{
+        page:1,//当前页码
+        limit:10,//每页返回数据条数
+        total:10,//数据总条数
+        personnel_id:'',//员工人力资源表id(两个参数2选1)
+        customer_resources_id:'',//学生资源表id(两个参数2选1)
+      },
+
       formData: {
         images_arr: [],
         images: '',
@@ -68,6 +76,8 @@ export default {
 
       //联系人列表
       contactList:[],
+      userType:'',//获取用户类型|1=教练,2=销售,3=学员
+      from_type: '',//发送者类型|personnel=员工,customer=学生(客户)
     }
   },
   onLoad() {
@@ -75,16 +85,72 @@ export default {
   onShow() {
     this.init();
   },
+  //下拉刷新
+  async onPullDownRefresh() {
+    //重置为第一页
+    await this.resetFilteredData()
+    await this.getList()
+  },
   methods: {
     //初始化
     async init(){
+      //获取用户类型
+      this.userType = uni.getStorageSync('userType')
+      //1=教练,2=销售,3=学员
+      if (['1', '2'].includes(String(this.userType))) {
+        this.from_type = 'personnel'//员工
+        await this.getPersonnelUserInfo()
+      }else{
+        //获取学生用户详情
+        this.from_type = 'customer'//学生
+      }
       this.getContactList()
     },
 
+    //获取用户详情
+    async getPersonnelUserInfo(){
+      let data = {}
+      let res = await apiRoute.getPersonnelInfo(data);
+      if (res.code != 1){
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        return
+      }
+
+      res.data.cameus_dept_arr.forEach((v,k)=>{
+        let d_arr = []
+        v.dept_arr.forEach((dv,dk)=>{
+          d_arr.push(dv.dept_name)
+        })
+        //数组转字符串
+        v.dept_name_str = d_arr.join('，')
+      })
+      this.filteredData.personnel_id = res.data.id
+    },
+
     //获取联系人列表
     async getContactList(){
-      let res = await commonApi.getContactList()
-      console.log('获取联系人列表', res)
+      let params = {...this.filteredData}
+      //判断是否还有数据
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
+        this.loading = false
+        uni.showToast({
+          title: '暂无更多',
+          icon: 'none'
+        })
+        return
+      }
+
+      if(params.page == 1){
+        this.contactList = []
+      }
+
+      let res = await apiRoute.xs_chatGetChatFriendsList(params)
+
+      this.loading = false
+      this.isReachedBottom = false;
       if (res.code != 1) {
         uni.showToast({
           title: res.msg,
@@ -92,7 +158,23 @@ export default {
         })
         return
       }
-      this.contactList = res.data
+
+      res.data.data.forEach((v,k)=>{
+        v.name = ''
+        v.count = '0'
+        if(this.from_type == 'personnel'){
+          v.name = v.personnel_id_name
+          v.count = v.unread_count_personnel
+        }else{
+          v.name = v.customer_resources_id_name
+          v.count = v.unread_count_customer_resources
+        }
+      })
+      console.log('列表',res.data.data)
+
+      this.contactList = this.contactList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
+      this.filteredData.total = res.data.total
+      this.filteredData.page++
     },
 
     //######AQ上传文件组件相关######
@@ -153,10 +235,19 @@ export default {
         //系统消息
         this.openViewSysMsgList(e)
       }else{
+        let from_id = ''//发送者的id
+        let to_id = ''//接收者ID
         //站内信
-        let hair_staff_id = e.hair_staff_id//发信人id
+        if (this.from_type == 'personnel') {
+          from_id = e.personnel_id
+          to_id = e.customer_resources_id
+        } else {
+          from_id = e.customer_resources_id
+          to_id = e.personnel_id
+        }
+
         uni.navigateTo({
-          url: `/pages/common/im_chat_info?hair_staff_id=${hair_staff_id}`
+          url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
         })
       }
 
diff --git a/pages/common/sys_msg_list.vue b/pages/common/sys_msg_list.vue
index 10e61ad..8e24630 100644
--- a/pages/common/sys_msg_list.vue
+++ b/pages/common/sys_msg_list.vue
@@ -98,7 +98,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/market/clue/add_clues.vue b/pages/market/clue/add_clues.vue
index 7eeb4e4..ba2aa88 100644
--- a/pages/market/clue/add_clues.vue
+++ b/pages/market/clue/add_clues.vue
@@ -14,12 +14,12 @@
 
 <!--    添加客户-->
     <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="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">
@@ -416,7 +416,7 @@
 
 
     <!-- 年月日-选择时间 -->
-    <fui-date-picker :show="date_picker_show" type="5" @change="change_date" @cancel="cancel_date"></fui-date-picker>
+    <fui-date-picker :show="date_picker_show" type="3" @change="change_date" @cancel="cancel_date"></fui-date-picker>
 
     <!-- 选择器 -->
     <fui-picker
@@ -454,28 +454,34 @@
                   <image
                       class="img"
                       src="@/static/images/index/myk.png"></image>
-                  <view class="name">{{v.student_name}}</view>
-                  <view class="tag">{{ v.is_status == 1 ? '试听' : '成交' }}</view>
+                  <view class="name">{{v.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="name">首选联系人：{{v.decision_maker}}</view>
 <!--                    <view class="call">妈妈</view>-->
                   </view>
                 </view>
+                <view class="box_2">
+                  <view class="left">
+                    <view class="name">联系电话：{{v.phone_number || ''}}</view>
+                  </view>
+                </view>
+
                 <view class="box_3">
                   <view class="left">
-                    {{ $util.formatToDateTime((v.follow && v.follow.follow_up_time || ''), 'm-d H:i') }} 跟进
+                    {{ $util.formatToDateTime((v.updated_at || ''), 'm-d H:i') }} 跟进
                   </view>
                   <view class="right">
 
                     <image
-                        v-if="['A+','A','A-'].includes(v.follow && v.follow.initial_customer_intent || '')"
+                        v-if="v.initial_intent = 'high'"
                         src="@/static/images/index/intention3.png"
                         class="img"
                     ></image>
                     <image
-                        v-else-if="['B+','B','B-'].includes(v.follow && v.follow.initial_customer_intent || '')"
+                        v-else-if="v.initial_intent == 'medium'"
                         src="@/static/images/index/intention2.png"
                         class="img"
                     ></image>
@@ -485,13 +491,13 @@
                         class="img"
                     ></image>
 
-                    <view>意向：{{ v.follow && v.follow.initial_customer_intent || '' }}</view>
+                    <view>意向：{{ v.initial_intent_name || '' }}</view>
                   </view>
                 </view>
               </view>
               <view class="right_box">
-                <image class="img" src="@/static/images/index/message.png" @click="openViewMyMessage(v)"></image>
-                <image class="img" src="@/static/images/index/phone.png" @click="dialTel(v)"></image>
+                <image v-if="v.member_id" class="img" src="@/static/images/index/message.png" @click="openViewMyMessage(v)"></image>
+                <image v-if="v.phone_number" class="img" src="@/static/images/index/phone.png" @click="dialTel(v)"></image>
               </view>
             </view>
           </view>
@@ -907,9 +913,9 @@ export default {
       this.clientUserList = []
 
       let param = {
-        student_name:this.student_name
+        name:this.student_name
       }
-      let res = await marketApi.clientList(param)
+      let res = await apiRoute.xs_getAllCustomerResources(param)
       if(res.code != 1){
         uni.showToast({
           title: res.msg,
@@ -933,23 +939,37 @@ export default {
 
     //跳转页面-客户详情
     openViewClueInfo(item) {
-      let id = item.id
+      let resource_sharing_id = '';
+      if (item.resourceSharingHasMany && item.resourceSharingHasMany.length > 0) {
+        resource_sharing_id = item.resourceSharingHasMany[0].id; // 共享资源表id
+      }
+
+      if (!resource_sharing_id) {
+        uni.showToast({
+          title: '暂时无法查看',
+          icon: 'none'
+        });
+        return;
+      }
+
       uni.navigateTo({
-        url: `/pages/market/clue/clue_info?id=${id}`
+        url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}`
       })
     },
 
     //跳转页面-我的消息
     openViewMyMessage(item) {
-      let hair_staff_id = item.hair_staff_id
+      let from_id = this.userInfo.id//发送者的id
+      let to_id = item.customerResource.id//接收者ID
       uni.navigateTo({
-        url: `/pages/common/im_chat_info?hair_staff_id=${hair_staff_id}`
+        url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
       })
     },
 
     //拨打电话
     async dialTel(item) {
-      let tel = item.student_phone
+
+      let tel = item.phone_number
 
       if (!tel) {
         uni.showToast({
@@ -959,10 +979,18 @@ export default {
         return;
       }
 
+
       let param = {
-        sales_id: item.id//线索id
+        staff_id: this.userInfo.id,//员工id
+        resource_id: item.id,//资源ID
+        resource_type: '',//资源类型（如设备、文件、系统等）
+        communication_type: 'phone',//沟通类型: phone-电话, email-邮件, meeting-会议, other-其他
+        communication_result: 'success',//沟通结果: success-成功, failure-失败, pending-待定
+        remarks: null,//备注
+        tag: null,//标签
       }
-      let res = await marketApi.setCallUp(param)//添加通过记录
+
+      let res = await apiRoute.xs_communicationRecordsAdd(param)//添加通过记录
       if (res.code != 1) {
         uni.showToast({
           title: res.msg,
@@ -1103,7 +1131,7 @@ export default {
       //跟进时间
       let val = (e.result ?? '')
       if(val){
-        val = val + ':00'
+        val = val
       }
 
       let input_name = this.data_picker_input_name
diff --git a/pages/market/clue/edit_clues.vue b/pages/market/clue/edit_clues.vue
index 663475b..54a399a 100644
--- a/pages/market/clue/edit_clues.vue
+++ b/pages/market/clue/edit_clues.vue
@@ -233,44 +233,7 @@
                   ></fui-input>
                 </view>
               </fui-form-item>
-              <!--客户初步意向度-->
-              <fui-form-item
-                  label="客户初步意向度"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop=""
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'
-              >
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view
-                      class="input-title"
-                      style="margin-right:14rpx;"
-                      @click="openCicker(`initial_intent`)">
-                    {{ (formData.initial_intent) ? picker_config.initial_intent.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-              <!--客户状态-->
-              <fui-form-item
-                  label="客户状态"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop=""
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'
-              >
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view
-                      class="input-title"
-                      style="margin-right:14rpx;"
-                      @click="openCicker(`status`)">
-                    {{ (formData.status) ? picker_config.status.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
+
             </view>
           </fui-form>
         </view>
@@ -287,6 +250,44 @@
 
           <view class="title" style="margin-top: 20rpx;">六要素信息</view>
           <view class="input-style">
+            <!--客户初步意向度-->
+            <fui-form-item
+                label="客户初步意向度"
+                asterisk asteriskPosition="right"
+                labelSize='26'
+                prop=""
+                background='#434544'
+                labelColor='#fff'
+                :bottomBorder='false'
+            >
+              <view class="input-title" style="margin-right:14rpx;">
+                <view
+                    class="input-title"
+                    style="margin-right:14rpx;"
+                    @click="openCicker(`initial_intent`)">
+                  {{ (formData.initial_intent) ? picker_config.initial_intent.text : '点击选择' }}
+                </view>
+              </view>
+            </fui-form-item>
+            <!--客户状态-->
+            <fui-form-item
+                label="客户状态"
+                asterisk asteriskPosition="right"
+                labelSize='26'
+                prop=""
+                background='#434544'
+                labelColor='#fff'
+                :bottomBorder='false'
+            >
+              <view class="input-title" style="margin-right:14rpx;">
+                <view
+                    class="input-title"
+                    style="margin-right:14rpx;"
+                    @click="openCicker(`status`)">
+                  {{ (formData.status) ? picker_config.status.text : '点击选择' }}
+                </view>
+              </view>
+            </fui-form-item>
             <!--购买力-->
             <fui-form-item
                 label="购买力"
@@ -405,6 +406,51 @@
                 ></fui-input>
               </view>
             </fui-form-item>
+            <!--一访情况-->
+            <fui-form-item
+                label="一访情况"
+                asteriskPosition="right"
+                labelSize='26'
+                prop="title"
+                background='#434544'
+                labelColor='#fff'
+                :bottomBorder='false'>
+              <view class="input-title" style="margin-right:14rpx;">
+                <fui-textarea placeholder="点击填写" style="text-align: left;" v-model="formData.first_visit_status" ></fui-textarea>
+
+<!--                <fui-input-->
+<!--                    :borderBottom="false"-->
+<!--                    :padding="[0]"-->
+<!--                    placeholder="点击填写"-->
+<!--                    v-model="formData.first_visit_status"-->
+<!--                    backgroundColor="#434544"-->
+<!--                    size="26"-->
+<!--                    color="#fff"-->
+<!--                ></fui-input>-->
+              </view>
+            </fui-form-item>
+            <!--二访情况-->
+            <fui-form-item
+                label="二访情况"
+                asteriskPosition="right"
+                labelSize='26'
+                prop="title"
+                background='#434544'
+                labelColor='#fff'
+                :bottomBorder='false'>
+              <view class="input-title" style="margin-right:14rpx;">
+                <fui-textarea placeholder="点击填写" borderColor="#292929" style="text-align: left;" v-model="formData.second_visit_status"></fui-textarea>
+<!--                <fui-input-->
+<!--                    :borderBottom="false"-->
+<!--                    :padding="[0]"-->
+<!--                    placeholder="点击填写"-->
+<!--                    v-model="formData.second_visit_status"-->
+<!--                    backgroundColor="#434544"-->
+<!--                    size="26"-->
+<!--                    color="#fff"-->
+<!--                ></fui-input>-->
+              </view>
+            </fui-form-item>
           </view>
         </fui-form>
       </view>
@@ -416,7 +462,7 @@
 
 
     <!-- 年月日-选择时间 -->
-    <fui-date-picker :show="date_picker_show" type="5" @change="change_date" @cancel="cancel_date"></fui-date-picker>
+    <fui-date-picker :show="date_picker_show" type="3" @change="change_date" @cancel="cancel_date"></fui-date-picker>
 
     <!-- 选择器 -->
     <fui-picker
@@ -610,6 +656,8 @@ export default {
         staff_id:'',//人员ID
         distance:'',//距离
         optional_class_time:'',//可选上课时间
+        first_visit_status:'',//一访情况
+        second_visit_status:'',//二访情况
       },
 
       //下拉选择器相关
@@ -740,6 +788,7 @@ export default {
 
       let customerResource = res.data.customerResource || {}//客户资源详情
       let sixSpeed = res.data.customerResource.sixSpeed || {}//六要素详情
+      console.log('12313',sixSpeed)
       console.log('详情',res.data)
 
 
@@ -765,11 +814,13 @@ export default {
         staff_id: sixSpeed.staff_id || '',//人员ID
         distance: sixSpeed.distance || '',//距离
         promised_visit_time: sixSpeed.promised_visit_time || '',//承诺到访时间
-        optional_class_time: sixSpeed.preferred_class_time || ''//可选上课时间
+        optional_class_time: sixSpeed.preferred_class_time || '',//可选上课时间
+        first_visit_status:sixSpeed.first_visit_status || '',//一访情况
+        second_visit_status:sixSpeed.second_visit_status || '',//二访情况
       }
 
-      this.formData.promised_visit_time =  this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d H:i');//格式化时间(Y-m-d H:i)
-      this.formData.optional_class_time =  this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d H:i');//格式化时间(Y-m-d H:i)
+      this.formData.promised_visit_time =  this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');//格式化时间(Y-m-d H:i)
+      this.formData.optional_class_time =  this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');//格式化时间(Y-m-d H:i)
 
       //下拉窗文本回显
       this.picker_config.source_channel.text = customerResource.source_channel_name || '点击选择'//来源渠道
@@ -1150,7 +1201,7 @@ export default {
       //跟进时间
       let val = (e.result ?? '')
       if(val){
-        val = val + ':00'
+        val = val
       }
 
       let input_name = this.data_picker_input_name
diff --git a/pages/market/clue/edit_clues_log.vue b/pages/market/clue/edit_clues_log.vue
index 0dc0d53..76f1f00 100644
--- a/pages/market/clue/edit_clues_log.vue
+++ b/pages/market/clue/edit_clues_log.vue
@@ -227,7 +227,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue
index 162e1b8..497b4ef 100644
--- a/pages/market/clue/index.vue
+++ b/pages/market/clue/index.vue
@@ -59,8 +59,9 @@
             </view>
           </view>
         </view>
+        <!--只有注册了member表的账号才可操作IM对话-->
         <view style="width: 15%;">
-          <image src="@/static/images/index/message.png" class="image" @click="openViewMyMessage(v)"></image>
+          <image v-if="v.customerResource.member_id" 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="@/static/images/index/phone.png" class="image" @click="dialTel(v)"></image>
@@ -266,8 +267,8 @@ export default {
 
       this.filteredData_1.shared_by = this.userInfo.id//共享人ID始终是当前登录的员工
 
-      //判断用户是不是经理,是就展示"资源分配"
-      if(this.userInfo.role_key_arr.includes('manager')){
+      //判断用户是不是销售经理,是就展示"资源分配"
+      if(this.userInfo.role_key_arr.includes('market_manager')){
         this.values = [
           {
             id: 1,
diff --git a/pages/market/my/index.vue b/pages/market/my/index.vue
index ce3bf73..2439434 100644
--- a/pages/market/my/index.vue
+++ b/pages/market/my/index.vue
@@ -34,32 +34,32 @@
       </view>
 
       <!--统计信息-->
-      <view class="count_section">
-        <view class="main">
-          <view class="course_box">
-            <view class="top">
-              <view class="item">
-                <view class="num">{{userInfo.yjds}}</view>
-                <view class="intro">业绩单数/人</view>
-              </view>
-              <view class="item">
-                <view class="num">{{userInfo.yqds}}</view>
-                <view class="intro">已签单数/人</view>
-              </view>
-              <view class="item">
-                <view class="num">1234</view>
-                <view class="intro">新课签到数/人</view>
-              </view>
-            </view>
-            <view class="bottom">
-              较上月
-              <text class="reduce">-5</text>
-            </view>
-          </view>
-        </view>
-        <view class="bg_box bg_top"></view>
-        <view class="bg_box bg_bottom"></view>
-      </view>
+<!--      <view class="count_section">-->
+<!--        <view class="main">-->
+<!--          <view class="course_box">-->
+<!--            <view class="top">-->
+<!--              <view class="item">-->
+<!--                <view class="num">{{userInfo.yjds}}</view>-->
+<!--                <view class="intro">业绩单数/人</view>-->
+<!--              </view>-->
+<!--              <view class="item">-->
+<!--                <view class="num">{{userInfo.yqds}}</view>-->
+<!--                <view class="intro">已签单数/人</view>-->
+<!--              </view>-->
+<!--              <view class="item">-->
+<!--                <view class="num">1234</view>-->
+<!--                <view class="intro">新课签到数/人</view>-->
+<!--              </view>-->
+<!--            </view>-->
+<!--            <view class="bottom">-->
+<!--              较上月-->
+<!--              <text class="reduce">-5</text>-->
+<!--            </view>-->
+<!--          </view>-->
+<!--        </view>-->
+<!--        <view class="bg_box bg_top"></view>-->
+<!--        <view class="bg_box bg_bottom"></view>-->
+<!--      </view>-->
     </view>
 
 
diff --git a/pages/market/my/signed_client_list.vue b/pages/market/my/signed_client_list.vue
index e98dca9..5972794 100644
--- a/pages/market/my/signed_client_list.vue
+++ b/pages/market/my/signed_client_list.vue
@@ -113,7 +113,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/pages/student/index/job_list.vue b/pages/student/index/job_list.vue
index 86b52f9..08b9009 100644
--- a/pages/student/index/job_list.vue
+++ b/pages/student/index/job_list.vue
@@ -104,7 +104,7 @@ import memberApi from '@/api/member.js';
         let data = {...this.filteredData}
 
         //判断是否还有数据
-        if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+        if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
           this.loading = false
           uni.showToast({
             title: '暂无更多',
diff --git a/pages/student/index/physical_examination.vue b/pages/student/index/physical_examination.vue
index ed96bc3..2dfd81c 100644
--- a/pages/student/index/physical_examination.vue
+++ b/pages/student/index/physical_examination.vue
@@ -102,7 +102,7 @@ import memberApi from '@/api/member.js';
         let data = {...this.filteredData}
 
         //判断是否还有数据
-        if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+        if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
           this.loading = false
           uni.showToast({
             title: '暂无更多',
diff --git a/pages/student/login/forgot.vue b/pages/student/login/forgot.vue
index d91ac04..f26877b 100644
--- a/pages/student/login/forgot.vue
+++ b/pages/student/login/forgot.vue
@@ -1,55 +1,99 @@
 <template>
 	<view>
 		<view class="title">
-			<view :class="{'green-text': tset_style === 1}">1.验证手机号码</view>
-			<view :class="{'green-text': tset_style === 2}">2.设置新密码</view>
+			<view :class="{'green-text': titleIndex === 1}" @click="changeTitle(1)">1.验证手机号码</view>
+			<view :class="{'green-text': titleIndex === 2}" @click="changeTitle(2)">2.设置新密码</view>
 		</view>
 		<view :style="{'background-color':'#fff','width':'100%','height':'100vh' }">
-			<view style="width: 95%;height: 30rpx;"></view>
-			<view v-if="tset_style == 1">
-				<view style="width: 95%;margin:30rpx auto;">
-					<fui-input borderTop placeholder="请输入手机号" v-model="user" @input="input"
-						backgroundColor="#f2f2f2"></fui-input>
-				</view>
-				<view style="width: 95%;margin: auto;">
-					<fui-input borderTop :padding="['20rpx','32rpx']" v-model="code" placeholder="请输入短信验证码" @input="input"
-						backgroundColor="#f2f2f2">
-						<fui-countdown-verify ref="fui_cdv" @send="sendCode"></fui-countdown-verify>
-					</fui-input>
-				</view>
-			</view>
-			<view v-if="tset_style == 2">
-				<view style="width: 95%;margin:30rpx auto;">
-					<fui-input borderTop placeholder="请设置6-20位新的登录密码" v-model="user" @input="input"
-						backgroundColor="#f2f2f2"></fui-input>
-				</view>
-				<view style="width: 95%;margin: auto;">
-					<fui-input borderTop :padding="['20rpx','32rpx']" v-model="code" placeholder="请再次输入新的登录密码" @input="input"
-						backgroundColor="#f2f2f2">
-					</fui-input>
-				</view>
-			</view>
-			<view style="width: 95%;margin:60rpx auto;">
-				<fui-button background="#00be8c" radius="5rpx" @click="nextStep" v-if="tset_style == 1">下一步</fui-button>
-				<fui-button background="#00be8c" radius="5rpx" @click="submit" v-if="tset_style == 2">提交</fui-button>
-			</view>
+      <view style="width: 95%;height: 30rpx;"></view>
+      <view v-if="titleIndex == 1">
+        <view style="width: 95%;margin:30rpx auto;">
+          <fui-input borderTop placeholder="请输入手机号" v-model="formData.phone" @input="input"
+                     backgroundColor="#f2f2f2"></fui-input>
+        </view>
+        <view style="width: 95%;margin: auto;">
+          <fui-input borderTop :padding="['20rpx','32rpx']" v-model="formData.code" placeholder="请输入短信验证码" @input="input"
+                     backgroundColor="#f2f2f2">
+            <fui-countdown-verify ref="fui_cdv" @send="sendCode"></fui-countdown-verify>
+          </fui-input>
+        </view>
+        <view style="width: 95%;margin: auto; margin-top: 30rpx;" @click="openPicker()">
+          <fui-form-item label="" arrow highlight background="#f2f2f2">
+            <input class="fui-page__input" v-model="formData.user_type_name" placeholder="请选择用户类型" placeholder-style="color:#ccc;" disabled/>
+          </fui-form-item>
+        </view>
+      </view>
+
+      <view v-if="titleIndex == 2">
+        <view style="width: 95%;margin:30rpx auto;">
+          <fui-input borderTop placeholder="请设置6-20位新的登录密码" v-model="formData.password" @input="input"
+                     backgroundColor="#f2f2f2"></fui-input>
+        </view>
+        <view style="width: 95%;margin: auto;">
+          <fui-input borderTop :padding="['20rpx','32rpx']" v-model="formData.password_2" placeholder="请再次输入新的登录密码" @input="input"
+                     backgroundColor="#f2f2f2">
+          </fui-input>
+        </view>
+      </view>
+      <view style="width: 95%;margin:60rpx auto;">
+        <fui-button background="#00be8c" radius="5rpx" @click="nextStep" v-if="titleIndex == 1">下一步</fui-button>
+        <fui-button background="#00be8c" radius="5rpx" @click="submit" v-if="titleIndex == 2">提交</fui-button>
+      </view>
 		</view>
+
+
+    <!-- 选择器 -->
+    <fui-picker
+        :linkage="true"
+        :options="picker_options"
+        :layer="1"
+        :show="picker_show"
+        @change="changeCicker"
+        @cancel="cancelCicker">
+    </fui-picker>
 	</view>
 </template>
 
 <script>
+import apiRoute from '@/api/apiRoute.js';
+
+
 	export default {
 		data() {
 			return {
-				code: '',
-				user: '',
-				tset_style: 1,
-			}
-		},
-		onLoad() {
+			  //下拉选择器相关
+        picker_show:false,//是否展示选择器
+        picker_options:[
+          {
+            text:'学员',
+            value:'customer',
+          },
+          {
+            text:'员工',
+            value:'personnel',
+          }
+        ],//下拉选择器数据
+
+			  //重置密码-表单数据
+        formData: {
+          phone: '',//手机号
+
+          code: '',//短信验证码
+          code_type: 'editPassword',//短信验证码类型(发送/验证 短信验证码的类型)|修改密码=editPassword
+
+          password: '',//第一次密码
+          password_2: '',//第二次密码
 
+          user_type: '',//用户类型|customer=学生|personnel=员工(销售/教师)
+          user_type_name: '',//用户类型名称|customer=学生|personnel=员工(销售/教师)
+        },
+
+        titleIndex:1,//状态栏类型|1=验证手机号码|2=设置密码
+			}
 		},
+		onLoad() {},
 		methods: {
+		  //发送手机验证码
 			sendCode() {
 				//延时为了效果展示
 				setTimeout(() => {
@@ -59,9 +103,119 @@
 					this.$refs.fui_cdv && this.$refs.fui_cdv.success()
 				}, 800)
 			},
-			nextStep(){
-				this.tset_style = 2
-			}
+
+      //监听-选择器-选择项改变
+      changeCicker(e){
+        this.formData.user_type = e.value
+        this.formData.user_type_name = e.text
+        this.cancelCicker()
+      },
+      //打开选择器
+      openPicker(){
+			  this.picker_show = true
+      },
+      //取消选择器
+      cancelCicker(){
+			  this.picker_show = false
+      },
+
+      //下一步
+			async nextStep(){
+			  //验证验证码和手机号是否填写
+        if(!this.formData.code){
+          uni.showToast({
+            title: '请输入短信验证码',
+            icon: 'none'
+          })
+          return
+        }
+        if(!this.formData.phone){
+          uni.showToast({
+            title: '请输入手机号',
+            icon: 'none'
+          })
+          return
+        }
+        if(!this.formData.user_type){
+          uni.showToast({
+            title: '请选择用户类型',
+            icon: 'none'
+          })
+          return
+        }
+				this.titleIndex = 2
+			},
+
+      //表单验证
+      async validateForm(formData) {
+      	// 遍历表单对象的每个属性，检查是否有空值
+        if(!formData.phone){
+          uni.showToast({
+            title: `请填写手机号`,
+            icon: 'none'
+          });
+          this.changeTitle(1)
+          return false
+        }
+        if(!formData.user_type){
+          uni.showToast({
+            title: `请选择用户类型`,
+            icon: 'none'
+          });
+          this.changeTitle(1)
+          return false
+        }
+        if(!formData.code){
+          uni.showToast({
+            title: `请填写短信验证码`,
+            icon: 'none'
+          });
+          this.changeTitle(1)
+          return false
+        }
+        if(!formData.password || formData.password != formData.password_2){
+          uni.showToast({
+            title: `两次密码不一致`,
+            icon: 'none'
+          });
+          this.changeTitle(2)
+          return false
+        }
+      	return true;
+      },
+      //提交
+      async submit(){
+			  let params = {...this.formData}
+        let res_validateForm = await this.validateForm(params);//表单验证
+			  if(!res_validateForm){
+			    return
+        }
+
+        let res = await apiRoute.common_forgetPassword(params);//重置密码
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+        uni.showToast({
+          title: res.msg,
+          icon: 'success'
+        })
+        //延迟1s执行
+        setTimeout(() => {
+          //跳转页面-登陆页
+          uni.navigateTo({
+            url: `/pages/student/login/login`
+          })
+        }, 1000)
+			},
+
+      //切换标题
+      changeTitle(index){
+        this.titleIndex = index
+      },
 		}
 	}
 </script>
diff --git a/pages/student/my/lesson_consumption.vue b/pages/student/my/lesson_consumption.vue
index 6fc2ea2..6dca018 100644
--- a/pages/student/my/lesson_consumption.vue
+++ b/pages/student/my/lesson_consumption.vue
@@ -92,7 +92,7 @@ import memberApi from '@/api/member.js';
         let data = {...this.filteredData}
 
         //判断是否还有数据
-        if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+        if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
           this.loading = false
           uni.showToast({
             title: '暂无更多',
diff --git a/pages/student/timetable/index.vue b/pages/student/timetable/index.vue
index 12cd2ca..a01020a 100644
--- a/pages/student/timetable/index.vue
+++ b/pages/student/timetable/index.vue
@@ -232,7 +232,7 @@ export default {
       let data = {...this.filteredData}
 
       //判断是否还有数据
-      if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) {
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
diff --git a/static/images/common/jia_hao.png b/static/images/common/jia_hao.png
new file mode 100644
index 0000000..4416a11
Binary files /dev/null and b/static/images/common/jia_hao.png differ