From 15b85addcadbd231ddf83d21b470f5e9f052d3bc Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 17 Apr 2025 15:19:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(student):=20=E6=B7=BB=E5=8A=A0=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD-=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=90=88=E5=90=8C=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E3=80=81=E5=86=85=E5=AE=B9=E5=92=8C=E6=97=B6=E9=97=B4=20-=20?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E5=92=8C?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD=20-=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20-=20=E5=9C=A8=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=20-=20=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     | 110 +++++++++-------
 pages/common/contract_list.vue | 225 +++++++++++++++++++++++++++++++++
 pages/student/my/my.vue        |  10 +-
 3 files changed, 296 insertions(+), 49 deletions(-)
 create mode 100644 pages/common/contract_list.vue

diff --git a/pages.json b/pages.json
index a2d92d2..43de999 100644
--- a/pages.json
+++ b/pages.json
@@ -91,14 +91,64 @@
 		}
 	},
 	{
-		"path" : "pages/common/privacy_agreement", 
+		"path" : "pages/student/my/update_pass", 
 		"style": {
-		  "navigationBarTitleText": "隐私协议", 
+		  "navigationBarTitleText": "修改密码", 
 		  "navigationStyle": "default",
 		  "navigationBarBackgroundColor": "#fff",
 		  "navigationBarTextStyle": "black"
 		}
 	},
+	{
+	  "path" : "pages/student/my/lesson_consumption",
+	  "style": {
+	    "navigationBarTitleText": "课时消耗",
+	    "navigationStyle": "default",
+	    "navigationBarBackgroundColor": "#333333",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
+	{
+	  "path" : "pages/student/my/my_members",
+	  "style": {
+	    "navigationBarTitleText": "我的成员",
+	    "navigationStyle": "default",
+	    "navigationBarBackgroundColor": "#333333",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
+	{
+	  "path" : "pages/student/my/personal_data",
+	  "style": {
+	    "navigationBarTitleText": "个人资料",
+	    "navigationStyle": "default",
+	    "navigationBarBackgroundColor": "#333333",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
+	{
+	  "path" : "pages/student/index/job_list",
+	  "style": {
+	    "navigationBarTitleText": "作业列表",
+	    "navigationStyle": "default",
+	    "navigationBarBackgroundColor": "#29d3b4",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
+
+
+
+
+
+    {
+      "path" : "pages/common/privacy_agreement",
+      "style": {
+        "navigationBarTitleText": "隐私协议",
+        "navigationStyle": "default",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTextStyle": "black"
+      }
+    },
     {
       "path" : "pages/common/my_message",
       "style": {
@@ -126,15 +176,6 @@
         "navigationBarTextStyle": "white"
       }
     },
-	{
-		"path" : "pages/student/my/update_pass", 
-		"style": {
-		  "navigationBarTitleText": "修改密码", 
-		  "navigationStyle": "default",
-		  "navigationBarBackgroundColor": "#fff",
-		  "navigationBarTextStyle": "black"
-		}
-	},
     {
       "path" : "pages/common/article_info",
       "style": {
@@ -153,43 +194,16 @@
         "navigationBarTextStyle": "white"
       }
     },
-	{
-	  "path" : "pages/student/my/lesson_consumption",
-	  "style": {
-	    "navigationBarTitleText": "课时消耗",
-	    "navigationStyle": "default",
-	    "navigationBarBackgroundColor": "#333333",
-	    "navigationBarTextStyle": "white"
-	  }
-	},
-	{
-	  "path" : "pages/student/my/my_members",
-	  "style": {
-	    "navigationBarTitleText": "我的成员",
-	    "navigationStyle": "default",
-	    "navigationBarBackgroundColor": "#333333",
-	    "navigationBarTextStyle": "white"
-	  }
-	},
-	{
-	  "path" : "pages/student/my/personal_data",
-	  "style": {
-	    "navigationBarTitleText": "个人资料",
-	    "navigationStyle": "default",
-	    "navigationBarBackgroundColor": "#333333",
-	    "navigationBarTextStyle": "white"
-	  }
-	},
-	{
-	  "path" : "pages/student/index/job_list",
-	  "style": {
-	    "navigationBarTitleText": "作业列表",
-	    "navigationStyle": "default",
-	    "navigationBarBackgroundColor": "#29d3b4",
-	    "navigationBarTextStyle": "white"
-	  }
-	},
-	
+    {
+      "path" : "pages/common/contract_list",
+      "style": {
+        "navigationBarTitleText": "合同列表",
+        "navigationStyle": "default",
+        "navigationBarBackgroundColor": "#292929",
+        "navigationBarTextStyle": "white"
+      }
+    },
+
 
 
 
diff --git a/pages/common/contract_list.vue b/pages/common/contract_list.vue
new file mode 100644
index 0000000..f117194
--- /dev/null
+++ b/pages/common/contract_list.vue
@@ -0,0 +1,225 @@
+<!--合同列表-列表-->
+<template>
+  <view class="main_box">
+
+    <view class="main_section">
+      <scroll-view
+          class="section_1"
+          scroll-y="true"
+          :lower-threshold="lowerThreshold"
+          @scrolltolower="loadMoreData"
+          style="height: 90vh;"
+      >
+        <view
+            class="item"
+            v-for="(v,k) in tableList"
+            :key="k"
+            @click="openViewArticleInfo(v)"
+        >
+          <view class="title">{{v.title}}</view>
+<!--          <image-->
+<!--              class="img_box"-->
+<!--              :src="$util.img('/upload/attachment/image/202504/02/1743562333d1bb6666f969da1b7170381d0845153e_local.png')"-->
+<!--              model="aspectFit"-->
+<!--          ></image>-->
+
+          <view class="content" v-html="v.content"></view>
+
+          <view class="time">{{v.show_time}}</view>
+        </view>
+
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+import commonApi from '@/api/common.js';
+
+
+
+export default {
+  components: {
+  },
+  data() {
+    return {
+      loading:false,//加载状态
+      lowerThreshold: 100,//距离底部多远触发
+      isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
+
+      //筛选条件
+      filteredData:{
+        page:1,//当前页码
+        limit:10,//每页返回数据条数
+        total:10,//数据总条数
+        hair_staff_id: '',//发信人id
+      },
+      tableList:[],//聊天数据列表
+    }
+  },
+  onLoad(options) {
+    this.filteredData.hair_staff_id = options.hair_staff_id//发信人id
+  },
+  onShow(){
+    this.init()
+  },
+  //下拉刷新
+  async onPullDownRefresh() {
+    //重置为第一页
+    await this.resetFilteredData()
+    await this.getList()
+  },
+  methods: {
+//初始化
+    async init(){
+      await this.getList();
+    },
+    //加载更多(下一页)
+    loadMoreData() {
+      //判断是否加载
+      if (!this.isReachedBottom) {
+        this.isReachedBottom = true;//设置为不可请求状态
+        this.getList();
+      }
+    },
+    //重置为第一页
+    async resetFilteredData() {
+      this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
+
+      this.filteredData.page = 1//当前页码
+      this.filteredData.limit = 10//每页返回数据条数
+      this.filteredData.total = 10//数据总条数
+    },
+
+    //获取列表
+    async getList(){
+      this.loading = true
+
+      let data = {...this.filteredData}
+
+      //判断是否还有数据
+      if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+        this.loading = false
+        uni.showToast({
+          title: '暂无更多',
+          icon: 'none'
+        })
+        return
+      }
+
+      if(data.page == 1){
+        this.tableList = []
+      }
+
+      let res = await commonApi.getContactMessage(data)//获取消息列表
+      this.loading = false
+      this.isReachedBottom = false;
+      if (res.code != 1){
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        return
+      }
+
+      this.tableList = this.tableList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
+      // this.tableList.unshift(...res.data.data); // 将新数据插入到数组头部
+
+      console.log('列表',this.tableList)
+      this.filteredData.total = res.data.total
+      this.filteredData.page++
+    },
+
+    //跳转文章详情
+    openViewArticleInfo(item) {
+      let id = item.id
+      let redirect = item.redirect//重定向地址
+      uni.navigateTo({
+        url: `/pages/common/article_info?id=${id}`
+      })
+    },
+
+  }
+}
+</script>
+
+<style lang="less" scoped>
+	.main_box {
+		background: #292929;
+	}
+
+	//自定义导航栏
+	.navbar_section {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #29d3b4;
+
+		.title {
+			padding: 20rpx 0;
+			font-size: 30rpx;
+			color: #315d55;
+		}
+	}
+
+	.main_section {
+		min-height: 100vh;
+		background: #292929 100%;
+		padding: 0 0rpx;
+		padding-top: 32rpx;
+		padding-bottom: 150rpx;
+		font-size: 28rpx;
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+
+		.section {
+			background-color: #434544;
+			padding: 40rpx 40rpx;
+		}
+
+    .section_1{
+      padding: 0 24rpx;
+      display: flex;
+      flex-direction: column;
+
+      .item{
+        margin-bottom: 38rpx;
+        display: flex;
+        flex-direction: column;
+
+        padding: 32rpx 24rpx;
+        border-radius: 14rpx;
+        background-color: rgba(255,255,255,1);
+        border: 2rpx solid rgba(187,187,187,1);
+
+        color: #4F4F4F;
+        font-size: 32rpx;
+
+        .title{
+        }
+        .img_box{
+          margin-top: 30rpx;
+          width: 100%;
+        }
+        .content{
+          margin-top: 30rpx;
+        }
+        .time{
+          display: flex;
+          justify-content: flex-end;
+          margin-top: 36rpx;
+        }
+      }
+    }
+
+
+
+
+	}
+
+	.describe {
+		color: #999999;
+		padding-left: 30rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/student/my/my.vue b/pages/student/my/my.vue
index 0433c46..2cbf112 100644
--- a/pages/student/my/my.vue
+++ b/pages/student/my/my.vue
@@ -56,7 +56,7 @@
 <!--					<view></view>-->
 <!--				</view>-->
 
-				<view class="item">
+				<view class="item" @click="openViewContractList()">
 					<view>我的合同</view>
 					<view></view>
 				</view>
@@ -143,6 +143,14 @@
 					url: '/pages/student/my/personal_data'
 				})
 			},
+
+      //跳转页面-合同列表
+      openViewContractList(item) {
+        uni.navigateTo({
+          url: `/pages/common/contract_list`
+        })
+      },
+
       //跳转页面-我的消息
       openViewMyMessage(item) {
         uni.navigateTo({