更新代码

pages/index/index.wxss

@@ -133,7 +133,9 @@
 .flex-item:nth-child(2n){
   margin-left: 22rpx;
 }
-
+.flex-item .w-course:first-child{
+  margin-top: 20rpx !important;
+}
 .w-course{
   position: relative;
   width: 100%;

pages/my/my.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-06 16:44:43
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 14:31:33
+ * @LastEditTime: 2022-06-28 10:57:46
  */
 var app = getApp();
 var API = require("../../utils/request.js");
@@ -103,6 +103,7 @@ Page({
                   title: '切换成功',
                   icon: 'none'
               })
+              that.wxGetUserInfo()
           } else {
               wx.showToast({
                   icon: "none",
@@ -178,6 +179,21 @@ Page({
         break
       }
     },
+    wxGetUserInfo(){
+      let that = this
+      API.getData('/px/user/getUserInfo', { }, function (res) {
+        if(res.code == 200){
+          if(res.data.birthday && res.data.birthday.length){
+            res.data.birthday = res.data.birthday.slice(0,10)
+          }
+          wx.setStorageSync('peopleType',res.data.peopleType)
+          wx.setStorageSync('userInfo',res.data)
+          that.setData({userInfo:res.data || {}})
+        }
+      }, function () {
+        // wx.hideLoading()
+      });
+    },
     queryPeopleList(){
       API.getData('/px/user/getUserPeopleList', {}, (res) => {
         let list = []

pages/organ-index/organ-index.wxml

@@ -32,15 +32,15 @@
       </view>
       <!-- 统计数据 -->
       <view class="count-flex">
-        <view class="count-item">
+        <view class="count-item" data-link="1" bindtap="goJump">
           <view class="count-title">体验课订购</view>
           <view class="count-value">{{courseNums.expNum || 0}}</view>
         </view>
-        <view class="count-item">
+        <view class="count-item" data-link="2" bindtap="goJump">
           <view class="count-title">班课报名</view>
           <view class="count-value">{{courseNums.normalNum || 0}}</view>
         </view>
-        <view class="count-item">
+        <view class="count-item" data-link="4" bindtap="goJump">
           <view class="count-title">预警学生</view>
           <view class="count-value">{{courseNums.warnNum || 0}}</view>
         </view>

pages/sport/sport.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-06 16:45:35
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-23 10:28:50
+ * @LastEditTime: 2022-06-28 10:49:54
  */
 var API = require("../../utils/request");
 var App = getApp();
@@ -145,11 +145,11 @@ nextType() {
         }
     }
 },
-
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    let that = this
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().upDateBar()
       this.getTabBar().setData({
@@ -159,10 +159,11 @@ nextType() {
     let userInfo = wx.getStorageSync("userInfo")
     //如果没有绑定小孩 或者 绑定了小孩没有填写身高体重
     if(userInfo && (!userInfo.stuId || !userInfo.height)){
-      this.setData({popupShow:true},() =>{
-        this.selectComponent("#userInput").checkUserChild()
+      that.setData({popupShow:true},() =>{
+        that.selectComponent("#userInput").checkUserChild()
       })
     }
+    
     this.setData({
       stuInfo:{
         name:userInfo.stuName || '',
@@ -233,14 +234,13 @@ nextType() {
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-
+    this.setData({popupShow:false})
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-
   },
 
   /**

project.private.config.json

@@ -23,6 +23,13 @@
           "name": "",
           "pathName": "pages/sport/sport",
           "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "subPages/course/detail/detail",
+          "query": "id=17118",
           "scene": null,
           "launchMode": "default"
         }

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

@@ -27,7 +27,7 @@
 
       <view class="btm-line flex-s">
         <view class="flex-c">
-          <text class="t1">支付金额：</text><text class="unit">¥</text><text class="course-price">{{item.orderAmt ? item.orderAmt / 100 : 0}}</text>
+          <text class="t1">{{item.orderStatus==3?'退款金额':'支付金额'}}：</text><text class="unit">¥</text><text class="course-price">{{item.orderAmt ? item.orderAmt / 100 : 0}}</text>
         </view>
         <view class="flex-c">
           <!-- orderStatus （0：待支付，1：已订购，2：待退款，3：已退款，4：已关闭） -->

subPages/course/detail/detail.wxml

@@ -12,7 +12,7 @@
       <view>
         <!-- <view class="detail-num">{{detail.peopleNum || 0}}人已体验</view> -->
         <view class="course-tag">
-          <view class="tag-item {{detail.courseStep==1?'xx-color':detail.courseStep==2?'cz-color':'gz-color'}}">{{detail.courseStep==1?'小学':item.courseStep==2?'初中':'高中'}}组</view>
+          <view class="tag-item {{detail.courseStep==1?'xx-color':detail.courseStep==2?'cz-color':'gz-color'}}">{{detail.courseStep==1?'小学':detail.courseStep==2?'初中':'高中'}}组</view>
           <view class="tag-item">{{detail.classHour}}课时</view>
           <view class="tag-item">{{['','基础班','提高班','精英班','赛事班'][detail.leveId]}}</view>
         </view>

subPages/course/detail/detail.wxss

@@ -106,6 +106,9 @@
   color: rgba(0, 0, 0, 0.5);
 }
 .call-bg{
+  display: flex;
+  justify-content: center;
+  align-items: center;
   padding-left: 24rpx;
   height: 48rpx;
   border-left: 1rpx solid rgba(0, 0, 0, 0.1);

subPages/login/role-list/role-list.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-14 08:36:57
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-22 09:26:57
+ * @LastEditTime: 2022-06-28 10:40:51
  */
 
 var API = require("../../../utils/request.js");
@@ -76,12 +76,7 @@ Page({
         }
         wx.setStorageSync('peopleType',res.data.peopleType)
         wx.setStorageSync('userInfo',res.data)
-        
-        if(res.data.peopleType == 'employ'){
-          wx.switchTab({url:'/pages/organ-index/organ-index'})
-        }else{
-          wx.switchTab({url:'/pages/index/index'})
-        }
+        wx.navigateBack()
       }
     }, function () {
       // wx.hideLoading()

subPages/organ/early-warning/early-warning.wxss

@@ -61,7 +61,10 @@
   color: #FF811E !important;
   border-color: #FF811E !important;
 }
-
+.active-c{
+  font-weight: bold;
+  color: #FF811E !important;
+}
 .search-ctn-bg{
   padding: 20rpx 30rpx 30rpx 30rpx;
   width: calc(100% - 60rpx);
@@ -95,6 +98,7 @@
   background: #FFFFFF;
   box-shadow: 0px 0px 16rpx 2rpx rgba(0, 0, 0, 0.12);
   border-radius: 16rpx;
+  z-index: 99;
 }
 .type-item{
   margin: 0rpx auto;