修改Bug

components/sport/stu-info-popup/stu-info-popup.js

@@ -90,7 +90,7 @@ Component({
       }
       API.requestAll("/px/user/bindStu",param,(res) => {
         if(res.code == 200){
-          wx.showToast({title: '保持成功',icon: 'none',});
+          wx.showToast({title: '保存成功',icon: 'none',});
           that.wxGetUserInfo()
           that.triggerEvent('closePopup')
         }

components/sport/stu-info-popup/stu-info-popup.wxml

@@ -31,7 +31,7 @@
   <view class="input-item">
     <view class="input-t">出生日期</view>
     <view class="input-bg">
-      <picker class="name" disabled="{{stuinfo.birthday}}" mode="date" bindchange="pinkerDate">
+      <picker class="name" disabled="{{stuinfo.stuId}}" mode="date" bindchange="pinkerDate">
         <view class="flex-s">
           <view class="sex {{!stuinfo.birthday ? 'placeholder-c':''}}">{{stuinfo.birthday || '请选择出孩子出生日期'}}</view>
           <xb-icon type="icon-icon_pull-down" class="change-icon" size="32" color="#000000"></xb-icon>

components/sport/stu-info-popup/stu-info-popup.wxss

 .flex-c{display: flex;align-items: center;}
 .popup-bg{
   position: relative;
-  padding: 44rpx 40rpx 112rpx 40rpx;
+  padding: 44rpx 40rpx calc(112rpx + env(safe-area-inset-bottom)) 40rpx;
   width: calc(100% - 80rpx);
   height: 974rpx;
   background: linear-gradient(180deg, #FFF2E8 0%, #FFFFFF 100%);

pages/index/index.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-06 14:11:05
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 10:20:56
+ * @LastEditTime: 2022-06-23 09:46:10
  */
 const app = getApp()
 var API = require("../../utils/request.js");
@@ -45,7 +45,7 @@ Page({
     //因为小程序会有个默认启动页/index/index，当初始化时,身份不同则需要重定向到指定配置的身份首页
     app.checkUserType()
     
-    // this.aiUrl()
+    this.aiUrl()
   },
 
   queryRecomdList(){

pages/my/my.wxml

@@ -3,13 +3,13 @@
         <image class="mine-bg" src="https://cdn.xiaobentiyu.cn/sport_minapp_img/home/mine_bg.png"></image>
         <view class="sport-main-bg"></view>
         <view class="mine-top-content">
-            <view class="user-info">
+            <view class="user-info" bindtap="handleTab" type="login">
                 <image class="user-avatar" wx:if="{{userInfo.gender == 1}}" src="https://ttxs01-10066525.cos.ap-shanghai.myqcloud.com/headImgs/boy_default.png"></image>
                 <image class="user-avatar" wx:elif="{{userInfo.gender == 2}}" src="https://ttxs01-10066525.cos.ap-shanghai.myqcloud.com/headImgs/girl_default.png"></image>
                 <image class="user-avatar" wx:else src="https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132"></image>
                 <view class="info-content">
                     <view class="info-name-msg">
-                        <view class="info-name">{{userInfo.name || '游客'}}
+                        <view class="info-name">{{userInfo.peopleType ? userInfo.name || '游客' : '请登录'}}
                         </view>
                         <!-- <view class="update-info" catchtap="setAvartar" id="edit" wx:if="{{!isManagement}}">编辑资料</view> -->
                     </view>

pages/organ-index/organ-index.wxml

@@ -23,7 +23,7 @@
         </view>
         <view class="tabs-item" data-link="3" bindtap="goJump">
           <image class="tabs-img" src="/images/organ/index-tab3.png"/>
-          <view class="tabs-text">教练消课</view>
+          <view class="tabs-text">教练销课</view>
         </view>
         <view class="tabs-item" data-link="4" bindtap="goJump">
           <image class="tabs-img" src="/images/organ/index-tab4.png"/>

pages/sport/sport.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-06 16:45:35
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 10:30:08
+ * @LastEditTime: 2022-06-23 10:28:50
  */
 var API = require("../../utils/request");
 var App = getApp();

pages/sport/sport.wxml

@@ -40,6 +40,6 @@
 
   <!-- 若登录者未绑定小孩 -->
   <t-popup show="{{popupShow}}" closeOnClickOverlay="{{false}}" type="bottom" bindclose="onClose">
-    <stu-info id="userInput" bindclosePopup="closePopup"></stu-info>
+    <stu-info id="userInput" wx:if="{{popupShow}}" bindclosePopup="closePopup"></stu-info>
   </t-popup>
 </view>
\ No newline at end of file

project.private.config.json

@@ -16,6 +16,13 @@
           "name": "",
           "pathName": "subPages/organ/destory-student/destory-student",
           "query": "stuId=16&schId=",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/sport/sport",
+          "query": "",
           "scene": null,
           "launchMode": "default"
         }

subPages/course/attempt-list/attempt-list.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-15 19:42:49
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 14:34:27
+ * @LastEditTime: 2022-06-24 11:10:39
  */
 var API = require("../../../utils/request.js");
 Page({
@@ -68,6 +68,12 @@ Page({
       })
     });
   },
+  gotoDetail(e){
+    let {id} = e.currentTarget.dataset
+    wx.navigateTo({
+      url: '/subPages/course/detail/detail?id=' + id,
+    })
+  },
   payCourse(e){
     let {data} = e.currentTarget.dataset
     let that = this

subPages/course/attempt-list/attempt-list.wxml

@@ -10,7 +10,7 @@
         <view class="course-state {{['red-c','gree-c','yell-c','grey-c','grey-c'][item.orderStatus]}}">{{['待支付','已订购','待退款','已退款','已关闭'][item.orderStatus]}}</view>
       </view>
 
-      <view class="course-ctn flex-c">
+      <view class="course-ctn flex-c" bindtap="gotoDetail" data-id="{{item.courseId}}">
         <view class="course-img">
           <image class="course-img" mode="aspectFill" src="{{item.poster}}" />
         </view>

subPages/course/collect-list/collect-list.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-15 19:42:49
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 14:37:13
+ * @LastEditTime: 2022-06-24 11:08:38
  */
 var API = require("../../../utils/request.js");
 Page({

subPages/course/collect-list/collect-list.wxml

@@ -3,9 +3,9 @@
 <view class="page-bg">
 
   <block wx:if="{{list && list.length}}">
-    <view class="course" wx:for="{{list}}" bindtap="gotoDetail" data-id="{{item.id}}">
+    <view class="course" wx:for="{{list}}">
       <van-swipe-cell right-width="{{ 80 }}">
-        <view class="course-ctn flex-c">
+        <view class="course-ctn flex-c" bindtap="gotoDetail" data-id="{{item.id}}">
           <view class="course-img">
             <view class="course-type {{item.type==1?'gree-c':'yell-c'}}">{{item.type==1?'正式班课':'体验课'}}</view>
             <image class="course-img" mode="aspectFill" src="{{item.poster}}" />

subPages/course/detail/detail.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-13 08:57:51
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 10:20:31
+ * @LastEditTime: 2022-06-23 16:36:25
  */
 var API = require("../../../utils/request.js");
 Page({
@@ -75,7 +75,7 @@ Page({
   },
   callSchool(){
     wx.makePhoneCall({
-      phoneNumber: this.data.detail.schoolList[schoolActive].tel
+      phoneNumber: this.data.detail.schoolList[this.data.schoolActive].tel
     })
   },
   gotoPay(){

subPages/course/join-list/join-list.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-15 19:42:49
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 14:35:45
+ * @LastEditTime: 2022-06-24 11:12:17
  */
 var API = require("../../../utils/request.js");
 Page({
@@ -68,6 +68,12 @@ Page({
       })
     });
   },
+  gotoDetail(e){
+    let {id} = e.currentTarget.dataset
+    wx.navigateTo({
+      url: '/subPages/course/detail/detail?id=' + id,
+    })
+  },
   cannalJoin(e){
     let {data} = e.currentTarget.dataset
     let that = this

subPages/course/join-list/join-list.wxml

@@ -10,7 +10,7 @@
         <view class="course-state {{['yell-c','gree-c','red-c','grey-c'][item.bmStatus]}}">{{['待确认','已报名','待取消','已取消'][item.bmStatus]}}</view>
       </view>
 
-      <view class="course-ctn flex-c">
+      <view class="course-ctn flex-c" bindtap="gotoDetail" data-id="{{item.courseId}}">
         <view class="course-img">
           <image class="course-img" mode="aspectFill" src="{{item.poster}}" />
         </view>

subPages/course/list/list.wxss

@@ -114,6 +114,7 @@
 }
 
 .waterfall-flex{
+  width: 100%;
   display: flex;
   justify-content: space-between;
 }

subPages/course/sales-list/sales-list.json

@@ -2,6 +2,6 @@
   "usingComponents": {
     "empty":"/components/empty/empty"
   },
-  "navigationBarTitleText": "消课记录",
+  "navigationBarTitleText": "销课记录",
   "enablePullDownRefresh":true
 }
\ No newline at end of file

subPages/organ/destory-student/destory-student.wxml

@@ -18,7 +18,7 @@
       <view class="course-info">
         <view class="course-title">{{item.courseName}}</view>
         <view class="course-hour">课时：{{item.classHour || 0}}</view>
-        <view class="course-use">已消课： {{item.usedHour || 0}}课时</view>
+        <view class="course-use">已销课： {{item.usedHour || 0}}课时</view>
       </view>
     </view>
 

subPages/organ/destroy-list/destroy-list.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-20 11:16:04
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 16:46:44
+ * @LastEditTime: 2022-06-23 08:31:11
  */
 var API = require("../../../utils/request");
 var tool = require("../../../utils/util.js")
@@ -50,7 +50,7 @@ Page({
   gotoDetails(e){
     let {data} = e.currentTarget.dataset
     wx.navigateTo({
-       url: '/subPages/organ/early-warning/early-warning?courseId=' + data.courseId+ '&peopleNum=' + data.peopleNum+'&schId=' + (this.data.areaActive != 0 ? this.data.areaList[this.data.areaActive].value : '')
+       url: '/subPages/organ/destory-course/destory-course?courseId=' + data.courseId+ '&peopleNum=' + data.peopleNum+'&schId=' + (this.data.areaActive != 0 ? this.data.areaList[this.data.areaActive].value : '')
     });
   },
   gotoSudDetail(e){

subPages/sport/myData/myData.wxss

@@ -11,7 +11,6 @@ page{
   margin-right: 23rpx;
   display: inline-block;
   margin-left: 10px;
-  background-color: blue;
   text-align: center;
   font-size: 24rpx;
   color: #333;