Browse Source

'完成学生详情和老师详情跳转传参'

machinecat520 2 years ago
parent
commit
834ac43a3b

+ 1 - 1
app.json

@@ -3,11 +3,11 @@
     "pages": [
         "pages/stuList/stuList",
         "pages/teacherList/teacherList",
+        "pages/myInfo/myInfo",
         "pages/stuNeed/stuNeed",
         "pages/coursePublish/coursePublish",
         "pages/teachAuthentication/teachAuthentication",
         "pages/stuDetail/stuDetail",
-        "pages/myInfo/myInfo",
         "pages/teachDetail/teachDetail",
         "pages/stuCollectionTeach/stuCollectionTeach",
         "pages/teachCollectionStu/teachCollectionStu",

+ 1 - 0
pages/myInfo/myInfo.wxml

@@ -24,5 +24,6 @@
     <view class="recommendMoney">
         <text bindtap="cashBack">推荐返现</text>
     </view>
+    <button class="suggest" open-type="feedback">反馈建议</button>
 
 </view>

+ 8 - 0
pages/myInfo/myInfo.wxss

@@ -38,6 +38,7 @@
     color: #c0b0b0;
 }
 
+/* 主页容器 */
 .infoList{
     position: relative;
     display: flex;
@@ -45,6 +46,7 @@
     width: 100%;
 }
 
+/* 主页内容区 */
 .infoList-text{
     width: 47%;
     height: 100rpx;
@@ -54,6 +56,7 @@
     margin: 10rpx 10rpx 0 10rpx;
 }
 
+/* 推荐返现 */
 .recommendMoney{
     /* position: relative;
     display: flex; */
@@ -65,4 +68,9 @@
     font-weight: bold;
     background-color: rgb(241, 241, 235);
     color: red;
+}
+
+/* 反馈建议 */
+.suggest{
+    margin-top: 20rpx;
 }

+ 16 - 2
pages/stuDetail/stuDetail.js

@@ -5,15 +5,29 @@ Page({
      * 页面的初始数据
      */
     data: {
-        sex:'男',
-        stuCollect:false
+        
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+        // console.log(options);
+        let stuDetail = this.data.stuDetail
+        stuDetail = JSON.parse(options.student)
+        this.setData({
+            stuDetail
+        })
+    },
 
+    // 收藏按钮功能
+    collectStu() {
+        let stuDetail = this.data.stuDetail
+        stuDetail[16].collected = true
+        this.setData({
+            stuDetail
+        })
+        // console.log(stuDetail[16].collected);
     },
 
     /**

+ 13 - 18
pages/stuDetail/stuDetail.wxml

@@ -3,32 +3,32 @@
     <!-- 学生需求 -->
     <view class="stuInfoBox">
         <text class="stuInfo">求教课程类别:</text>
-        <text class="needTitle">小学</text>
+        <text class="needTitle">{{stuDetail[4].courseNeed}}</text>
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">求教课程细分:</text>
-        <text class="needTitle">小学1-5数学</text>
+        <text class="needTitle">{{stuDetail[5].courseDetail}}</text>
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">辅导方式:</text>
-        <text class="needDetail">老师上门辅导</text>
+        <text class="needDetail">{{stuDetail[6].teachPosition}}</text>
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">学员性别:</text>
-        <text class="needDetail">{{sex}}</text>
+        <text class="needDetail">{{stuDetail[7].stuSex}}</text>
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">家教费用:</text>
-        <text class="needDetail">100/小时</text>
+        <text class="needDetail">{{stuDetail[8].salary}}/小时</text>
     </view>
 
     <view class="stuInfoBox">
         <text class="stuInfo">授课时间:</text>
-        <text class="needDetail">暑假周一三五的下午,二四上午,开学后周一到周五的晚上6:00到8:00</text>
+        <text class="needDetail">{{stuDetail[9].schoolTime}}</text>
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">学员需求详情:</text>
-        <text class="needDetail">辅导作业</text>
+        <text class="needDetail">{{stuDetail[10].except}}</text>
     </view>
     <!-- 对老师的要求 -->
     <view class="stuInfoBox">
@@ -36,29 +36,24 @@
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">教员资质:</text>
-        <text class="needDetail">大学生</text>
+        <text class="needDetail">{{stuDetail[11].teachId}}</text>
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">教员学历:</text>
-        <text class="needDetail">本科在读</text>
+        <text class="needDetail">{{stuDetail[12].teachEdu}}</text>
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">教员性别:</text>
-        <text class="needDetail">不限</text>
-    </view>
-
-    <view class="stuInfoBox">
-        <text class="stuInfo">教员性别:</text>
-        <text class="needDetail">女</text>
+        <text class="needDetail">{{stuDetail[13].teachSex}}</text>
     </view>
     <view class="stuInfoBox">
         <text class="stuInfo">对教员的其他要求:</text>
-        <text class="needDetail">可以长期带的老师</text>
+        <text class="needDetail">{{stuDetail[15].otherNeed}}</text>
     </view>
 </view>
 <view>
-    <view class="collect" wx:if="{{stuCollect}}">已收藏的学生</view>
-    <view class="collect" wx:else>加入收藏</view>
+    <view class="collect" wx:if="{{stuDetail[16].collected}}">已收藏的学生</view>
+    <view class="collect" wx:else bindtap="collectStu">加入收藏</view>
     <!-- 底部空白区域,为了增加间隔效果,避免提交按钮完全贴着底边 -->
     <view class="blank"></view>
 </view>

+ 31 - 2
pages/stuList/stuList.js

@@ -105,6 +105,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
             [{
@@ -154,6 +157,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
             [{
@@ -203,6 +209,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
             [{
@@ -252,6 +261,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
             [{
@@ -301,6 +313,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
             [{
@@ -350,6 +365,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
             [{
@@ -399,6 +417,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
             [{
@@ -448,6 +469,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
             [{
@@ -497,6 +521,9 @@ Page({
                 },
                 {
                     otherNeed: '无'
+                },
+                {
+                    collected: false
                 }
             ],
         ]
@@ -510,9 +537,11 @@ Page({
     },
 
     //跳转到学生详情页
-    toStuDetail() {
+    toStuDetail(event) {
+        // console.log(event);
+        let student = event.currentTarget.dataset.student
         wx.navigateTo({
-            url: '/pages/stuDetail/stuDetail',
+            url: '/pages/stuDetail/stuDetail?student='+JSON.stringify(student),
         })
     },
 

+ 5 - 5
pages/stuList/stuList.wxml

@@ -44,18 +44,18 @@
 </view>
 <!-- 搜索按钮和清除选择按钮 -->
 <view class="searchBtn-container" wx:if="{{toSearch}}">
-    <view class="searchBtn" bindtap="onSearch">搜索</view>
+    <view class="searchBtn" bindtap="handleSearch">搜索</view>
     <view class="clearBtn" bindtap="clearOptions">清除选择</view>
 </view>
 
 <!-- 学生列表区 -->
 <view wx:if="{{isSearch && !list.length}}">没有找到符合条件的信息</view>
 <view wx:if="{{isSearch}}" class="stuListContainer">
-    <view wx:for="{{list}}" wx:key="index" wx:for-index="index">
+    <view wx:for="{{list}}" data-student='{{item}}' bindtap="toStuDetail" wx:key="index" wx:for-index="index">
         <!-- 间隔区域 -->
         <view class="stuListInterval"></view>
         <!-- 学生列表区域 -->
-        <view class="stuListDetail" bindtap="toStuDetail">
+        <view class="stuListDetail">
             <view class="stuLeft">
                 <text class="stuTitle">科目:{{list[index][5].courseDetail}}</text>
                 <text class="stuDesc">{{list[index][10].except}}</text>
@@ -70,11 +70,11 @@
 </view>
 
 <view wx:else class="stuListContainer">
-    <view wx:for="{{stuLists}}" wx:key="index" wx:for-index="index">
+    <view wx:for="{{stuLists}}" data-student='{{item}}' bindtap="toStuDetail"  wx:key="index" wx:for-index="index">
         <!-- 间隔区域 -->
         <view class="stuListInterval"></view>
         <!-- 学生列表区域 -->
-        <view class="stuListDetail" bindtap="toStuDetail">
+        <view class="stuListDetail">
             <view class="stuLeft">
                 <text class="stuTitle">科目:{{stuLists[index][5].courseDetail}}</text>
                 <text class="stuDesc">{{stuLists[index][10].except}}</text>

+ 25 - 4
pages/teachDetail/teachDetail.js

@@ -5,21 +5,42 @@ Page({
      * 页面的初始数据
      */
     data: {
-        collect:true
+
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
+        // options:用于接收路由跳转的query参数
+        // console.log(typeof options);
+        // console.log(options);
+        // console.log(typeof options.teach);
+        // console.log(JSON.parse(options.teach));
+        let teachDetail = this.data.teachDetail
+        teachDetail = JSON.parse(options.teach)
+        this.setData({
+            teachDetail
+        })
+        // console.log(teachDetail);
+        // console.log(teachDetail[1]);
     },
 
     // 跳转到学生收藏的老师页
-    toStuCollectionTeach(){
+    toStuCollectionTeach() {
         wx.navigateTo({
-          url: '/pages/stuCollectionTeach/stuCollectionTeach',
+            url: '/pages/stuCollectionTeach/stuCollectionTeach',
+        })
+    },
+
+    // 收藏按钮功能
+    collectTeacher() {
+        let teachDetail = this.data.teachDetail
+        teachDetail[15].collection = true
+        this.setData({
+            teachDetail
         })
+        // console.log(teachDetail[15].collection);
     },
 
     /**

+ 15 - 22
pages/teachDetail/teachDetail.wxml

@@ -2,46 +2,39 @@
 
 <view class="teachDeatil">
     <view class="head">
-        <image class="teachImg" mode="widthFix" src="../../images/zly.jpeg"></image>
+        <image class="teachImg" mode="widthFix" src="{{teachDetail[0].imgUrl || (teachDetail[3].sex == '男' ? '../../images/boy.png' : '../../images/girl.png')}}"></image>
+        
         <view class="headDetail">
-            <text class="teachName">老师</text>
-            <text class="attribute">身份:专业老师</text>
-            <text class="settledDay">最近登录:2022-7-8</text>
-            <text>成交记录:6次</text>
+            <text class="teachName">{{teachDetail[1].firstName}}老师</text>
+            <text class="attribute">身份:{{teachDetail[4].id}}</text>
+            <text class="settledDay">最近登录:{{teachDetail[10].newDate}}</text>
+            <text>成交记录:{{teachDetail[9].suc}}次</text>
         </view>
     </view>
     <view class="midArea">
-        <text>高校:电子科技大学</text>
+        <text>高校:{{teachDetail[6].school}}</text>
         <text>专业:汉语言文学</text>
-        <text>学历:本科</text>
+        <text>学历:{{teachDetail[5].teachEdu}}</text>
         <text>籍贯:四川省成都市武侯区</text>
     </view>
     <view class="course">
         <text>可授科目:</text>
-        <view class="courseList">小学语文、初中语文</view>
+        <view class="courseList">{{teachDetail[12].cList}}</view>
     </view>
-    <!-- <view class="teachAera">
-        <text>可授课区域:</text>
-        <view class="teachAreaDetail">
-            <text>四川省成都市武侯区、锦江区、高新区</text>
-        </view>
-    </view> -->
-    <!-- <view class="introduceDetail">
-        <text class="introduce-title">自我介绍</text>
-        <textarea class="introduce-body" name="自我介绍" cols="30" rows="10" maxlength="140"></textarea>
-    </view> -->
     <view class="introduceDetail">
         <text class="introduce-title">成功案例</text>
-        <text class="introduce-body">XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖XX年XX月获得XX奖</text>
+        <text class="introduce-body">{{teachDetail[14].selfIntroduce}}</text>
     </view>
 </view>
+
+<!-- 底部功能区 -->
 <view class="bottomContainer">
     <view class="myCollect" bindtap="toStuCollectionTeach">我收藏的老师</view>
-    <view class="collection" wx:if="{{!collect}}">
+    <view class="collection" wx:if="{{!teachDetail[15].collection}}" bindtap="collectTeacher">
         加入收藏
     </view>
     <view class="collection" wx:else>
         已收藏
     </view>
-    <view class="inviteTeach">邀请老师</view>
-</view>
+    <view class="inviteTeach">预约老师</view>
+</view>

+ 31 - 4
pages/teacherList/teacherList.js

@@ -100,6 +100,9 @@ Page({
                 },
                 {
                     selfIntroduce: '第一位'
+                },
+                {
+                    collection: false
                 }
             ],
             [{
@@ -146,6 +149,9 @@ Page({
                 },
                 {
                     selfIntroduce: '第二位'
+                },
+                {
+                    collection: false
                 }
             ],
             [{
@@ -192,6 +198,9 @@ Page({
                 },
                 {
                     selfIntroduce: '第三位'
+                },
+                {
+                    collection: false
                 }
             ],
             [{
@@ -238,6 +247,9 @@ Page({
                 },
                 {
                     selfIntroduce: '第四位'
+                },
+                {
+                    collection: false
                 }
             ],
             [{
@@ -284,6 +296,9 @@ Page({
                 },
                 {
                     selfIntroduce: '第五位'
+                },
+                {
+                    collection: false
                 }
             ],
             [{
@@ -330,6 +345,9 @@ Page({
                 },
                 {
                     selfIntroduce: '第六位'
+                },
+                {
+                    collection: false
                 }
             ],
             [{
@@ -376,6 +394,9 @@ Page({
                 },
                 {
                     selfIntroduce: '第七位'
+                },
+                {
+                    collection: false
                 }
             ],
             [{
@@ -422,8 +443,11 @@ Page({
                 },
                 {
                     selfIntroduce: '第八位'
+                },
+                {
+                    collection: false
                 }
-            ],
+            ]
         ]
     },
 
@@ -476,9 +500,12 @@ Page({
     },
 
     // 跳转到老师详情页
-    toTeachDetail() {
-        wx.redirectTo({
-            url: '/pages/teachDetail/teachDetail',
+    toTeachDetail(event) {
+        // console.log(event);
+        let teach = event.currentTarget.dataset.teach
+        // 路由跳转传参:query参数
+        wx.navigateTo({
+            url: '/pages/teachDetail/teachDetail?teach='+JSON.stringify(teach),
         })
     },
 

+ 4 - 3
pages/teacherList/teacherList.wxml

@@ -5,6 +5,7 @@
         <image wx:if="{{toSearch}}" class="iconImg" src="../../images/up.png"></image>
         <image wx:else class="iconImg" src="../../images/down.png"></image>
     </view>
+    <!-- 搜索选项区 -->
     <view class="searchContainer" wx:if="{{toSearch}}">
         <view class="searchList">
             <view bindtap="chooseCourse">{{courseDetailChosed || '课程详情'}}</view>
@@ -37,6 +38,7 @@
             <image wx:else class="iconImg" src="../../images/down.png" bindtap="chooseTeachImg"></image>
         </view>
     </view>
+    <!-- 搜索按钮 -->
     <view class="searchBtn-container" wx:if="{{toSearch}}">
         <view class="searchBtn" bindtap="handleSearch">搜索</view>
         <view class="clearBtn" bindtap="clearOptions">清除选择</view>
@@ -46,7 +48,7 @@
     <!-- 老师列表区 -->
     <view wx:if="{{isSearch && !list.length}}">没有找到符合条件的信息</view>
     <view wx:if="{{isSearch}}">
-        <view class="teachInfo" bindtap="toTeachDetail" wx:for="{{list}}" wx:key="index" wx:for-index="teachIndex">
+        <view class="teachInfo" data-teach='{{item}}' bindtap="toTeachDetail" wx:for="{{list}}" wx:key="index" wx:for-index="teachIndex">
             <image class="teachImg" mode="widthFix" src="{{list[teachIndex][0].imgUrl || (list[teachIndex][3].sex == '男' ? '../../images/boy.png' : '../../images/girl.png')}}"></image>
             <view class="introduce">
                 <text class="teachName">{{list[teachIndex][1].firstName}}老师</text>
@@ -77,8 +79,7 @@
         </view>
     </view>
     <view wx:else>
-        <view class="teachInfo" bindtap="toTeachDetail" wx:for="{{teachLists}}" wx:key="index" wx:for-index="teachIndex">
-            <!-- <image class="teachImg" mode="widthFix" src="{{teachLists[teachIndex][0].imgUrl}}"></image> -->
+        <view class="teachInfo" data-teach='{{item}}' bindtap="toTeachDetail" wx:for="{{teachLists}}" wx:key="index" wx:for-index="teachIndex">
             <image class="teachImg" mode="widthFix" src="{{teachLists[teachIndex][0].imgUrl || (teachLists[teachIndex][3].sex == '男' ? '../../images/boy.png' : '../../images/girl.png')}}"></image>
             <view class="introduce">
                 <text class="teachName">{{teachLists[teachIndex][1].firstName}}老师</text>