diff --git a/pages/student/index/job_list.vue b/pages/student/index/job_list.vue
index e46ba6e..c334388 100644
--- a/pages/student/index/job_list.vue
+++ b/pages/student/index/job_list.vue
@@ -13,24 +13,25 @@
     >
 
       <view class="con-list" v-for="(v,k) in tableList" :key="k" @click="openViewWorkDetails(v)">
-        <view class="con-list-img" v-if="v.student_file">
-          <video v-if="v.student_file_type == 2" class="pic" style="width: 100%;border-radius: 15rpx;" :src="$util.img(v.student_file)"></video>
-          <image v-else style="width: 100%;border-radius: 15rpx;" :src="$util.img(v.student_file)" mode="aspectFit"></image>
+        <view class="con-list-img" v-if="v.content_text">
+          <video v-if="v.content_type == 2" class="pic" style="width: 100%;border-radius: 15rpx;" :src="$util.img(v.content_text)"></video>
+          <image v-else-if="v.content_type == 1" style="width: 100%;border-radius: 15rpx;" :src="$util.img(v.content_text)" mode="aspectFit"></image>
+          <view class="text" v-else>{{v.content_text}}</view>
         </view>
 
         <view class="date_box">
           <view class="describe" style="margin-top: 20rpx;">
-            时间：{{v.create_time}}
+            时间：{{v.created_at}}
           </view>
           <!--是否已经完成作业-->
-          <view class="mark" v-if="v.status == 2">
+          <view class="mark" v-if="v.status == 3">
             <image class="check_mark" :src="$util.img('/uniapp_src/static/images/index/check_mark.png')"></image>
           </view>
         </view>
 
 
         <!--作业描述-->
-        <view class="con" style="margin-bottom: 20rpx; color:#fff;" v-html="v.content_text"></view>
+        <view class="con" style="margin-bottom: 20rpx; color:#fff;" v-html="v.description"></view>
 
         <view class="assignment">
           <view>{{v.type == 1 ? '班级作业' : '个人作业'}}</view>
@@ -44,6 +45,7 @@
 </template>
 
 <script>
+import apiRoute from '@/api/apiRoute.js';
 import memberApi from '@/api/member.js';
 
 	export default {
@@ -58,11 +60,14 @@ import memberApi from '@/api/member.js';
           page:1,//当前页码
           limit:10,//每页返回数据条数
           total:10,//数据总条数
-          status: '',//1=未提交,2=已提交,3=已批改
+          resources_id: '',//学生资源id
+          status: '',//状态 1待批改 2未提交 3已提交
         },
 
         tableList:[],//表格数据
 
+        member_info:{},//学生信息
+
 			}
 		},
     onShow(){
@@ -77,9 +82,25 @@ import memberApi from '@/api/member.js';
 		methods: {
       //初始化
       async init(){
+        await this.memberInit()
         await this.getList();
       },
 
+      //获取学员信息
+      async memberInit() {
+        let res = await apiRoute.xy_memberInfo({})
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+        this.member_info = res.data
+        this.filteredData.resources_id = this.member_info.id,//学生资源id
+        console.log('xxxx',this.member_info)
+      },
+
       //加载更多(下一页)
       loadMoreData() {
         //判断是否加载
@@ -117,7 +138,7 @@ import memberApi from '@/api/member.js';
           this.tableList = []
         }
 
-        let res = await memberApi.assignmentsList(data)
+        let res = await apiRoute.xy_assignment(data)
         this.loading = false
         this.isReachedBottom = false;
         if (res.code != 1){
@@ -192,7 +213,6 @@ import memberApi from '@/api/member.js';
 	}
 	.con-list-img{
 		width: 100%;
-		height: 280rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -205,6 +225,13 @@ import memberApi from '@/api/member.js';
       width: 100%;
       height: 280rpx;
     }
+    .text{
+      width: 100%;
+      font-size: 28rpx;
+      color:#fff;
+      white-space: pre-wrap;
+      word-wrap: break-word;
+    }
 
 	}
 	.pic{