跟进测试

app.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-01-13 17:47:44
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-17 15:03:36
+ * @LastEditTime: 2022-07-06 09:00:14
  */
 // wx.setStorageSync('host', 'https://sdb.youchengzhang.cn/'); //正式环境
 // wx.setStorageSync('host', 'https://test.xiaobentiyu.cn'); //测试环境
@@ -37,7 +37,9 @@ App({
       }
     })
     wx.setStorageSync('appId', 'wx7d7fbc0e6746baf5');
-    
+    wx.setKeepScreenOn({
+      keepScreenOn: true
+    });
     plugins.configPlugin({
       // polyfill fetch function
       fetchFunc: fetchWechat.fetchFunc(),
@@ -49,6 +51,12 @@ App({
       canvas: wx.createOffscreenCanvas()
     }) 
   },
+  onShow:function(){
+    //小程序下常亮
+    wx.setKeepScreenOn({
+      keepScreenOn: true
+    })
+  },
   //强制更新
   autoUpdate:function(){
     var self=this

css/ai-common.wxss

@@ -299,7 +299,9 @@ page{
   text-align: center;
   z-index: 99;
 }
-
+.broadwise-c{
+  top: 40px !important;
+}
 .number{
   position: absolute;
   width: 220rpx;

pages/my/my.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-06 16:44:43
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-07-04 10:10:15
+ * @LastEditTime: 2022-07-05 10:54:24
  */
 var app = getApp();
 var API = require("../../utils/request.js");
@@ -130,7 +130,9 @@ Page({
           })
         break
         case 'call':  //客服电话
-
+          wx.makePhoneCall({
+            phoneNumber: '400-871-7080'
+          })
         break
         case 'order':  //体验课订购
           wx.navigateTo({

pages/organ-index/organ-index.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-06 14:15:22
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-07-01 10:14:24
+ * @LastEditTime: 2022-07-05 14:13:48
  */
 var API = require("../../utils/request");
 Page({
@@ -134,7 +134,6 @@ Page({
     }, (res) => {
       if(res && res.data && res.data.length){
         res.data.forEach(item => {
-          // item['_empNames'] = item.pxEmployeeList && item.pxEmployeeList.length && (item.pxEmployeeList.map(v => v.empName)).join('、') || ''
           item['_empNames'] = item.pxEmployeeList && item.pxEmployeeList.length && (item.pxEmployeeList.filter(v => v.empPosition == 'coach')).map(e => e.empName).join('、') || ''
         })
       }

project.private.config.json

@@ -44,6 +44,13 @@
           "name": "",
           "pathName": "subPages/sport/ai-fwc-sport/ai-fwc-sport",
           "query": "sportTime=60",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "subPages/login/login/index",
+          "query": "",
           "scene": null,
           "launchMode": "default"
         }

subPages/bluetooth/share/share.js

@@ -26,7 +26,7 @@ Page({
     isFlunk:false, //不及格
     isFlunkShare:false, //不及格分享
     imgSrc:'', //头像
-    stuName:'', //姓名
+    peopleName:'', //姓名
     score:'', //分数
     myTopP:'', //超越百分比
     sportValue:'', //运动个数
@@ -62,6 +62,9 @@ Page({
     p:'',//段位超越多少人
     sucNum:0,//段位多少人挑战成功
     dwRecordId:0,//段位分享id
+
+    //默认头像，小本体育那边是后端返回，现在前端写死
+    defaultImage:'https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132'
   },
   onLoad(optinos){
     console.log('分享页面落地参数：',optinos)
@@ -449,7 +452,7 @@ Page({
       that.setData({
         status:res.data.peopleType,
         imgSrc:res.data.imgSrc, //头像
-        stuName:res.data.stuName, //姓名
+        peopleName:res.data.peopleName, //姓名
         score:res.data.score, //分数
         myTopP:(res.data.myTopP * 100).toFixed(2), //超越百分比
         sportValue:res.data.sportValue, //运动个数

subPages/bluetooth/share/share.wxml

@@ -10,8 +10,8 @@
           </view>
           <view class="share-user">
               <view class="user-info">
-                <image src="{{imgSrc || ''}}"></image>
-                <view class="name jg-name">{{stuName || '小奔体育'}}</view>
+                <image src="{{imgSrc || defaultImage}}"></image>
+                <view class="name jg-name">{{peopleName || '小奔体育'}}</view>
               </view>
               <view class="stand" bindtap="standerHtml">
                 <view class="text">国家标准</view>
@@ -33,8 +33,8 @@
           </view>
           <view class="share-user">
               <view class="user-info">
-                <image src="{{imgSrc}}"></image>
-                <view class="name jg-name">{{stuName || '小奔体育'}}</view>
+                <image src="{{imgSrc || defaultImage}}"></image>
+                <view class="name jg-name">{{peopleName || '小奔体育'}}</view>
               </view>
               <!-- <view class="stand" bindtap="standerHtml"> -->
               <view class="stand">
@@ -60,8 +60,8 @@
           <image src="https://ttxs01-10066525.file.myqcloud.com/sport/miniapp/mobile/skip/teacher.png" class="bg"></image>
           <view class="share-user">
               <view class="user-info">
-                <image src="{{imgSrc || ''}}"></image>
-                <view class="name jg-name">{{stuName || '小奔体育'}}</view>
+                <image src="{{imgSrc || defaultImage}}"></image>
+                <view class="name jg-name">{{peopleName || '小奔体育'}}</view>
               </view>
               <!-- <view class="stand" bindtap="standerHtml">
                 <view class="text">国家标准</view>
@@ -85,7 +85,7 @@
           <image src="{{imgSrc}}"></image>
         </view>
         <view class="share-ce">
-          <view class="name">{{stuName || '小奔体育'}}</view>
+          <view class="name">{{peopleName || '小奔体育'}}</view>
           <view class="share-time">{{createTime || 0}}</view>
         </view>
       </view> 

subPages/organ/destory-student/destory-student.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-22 15:55:26
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-30 11:15:41
+ * @LastEditTime: 2022-07-06 09:16:08
  */
 var API = require("../../../utils/request");
 Page({
@@ -29,17 +29,16 @@ Page({
   onShow: function () {
     let that = this 
     API.getData('/px/course/getXkCourseStuInfo', {stuId:this.options.stuId,schId:this.options.schId || ''},function(res){
-      //累计消课
-      let totalHours = 0
+     
       if(res.data && res.data.xkCourseStuVoList && res.data.xkCourseStuVoList.length){
         res.data.xkCourseStuVoList.forEach(v =>{
           v._check = false
-          totalHours += v.usedHour
         })
       }
       that.setData({
         detail:{
-          totalHours:totalHours,
+           //累计消课
+          totalHours:res.data && res.data.totalHour || 0,
           stuId:res.data.stuId,
           stuName:res.data.stuName
         },

subPages/organ/early-warning/early-warning.js

@@ -42,8 +42,12 @@ Page({
       this.getCommonSchool()
       this.queryCourseList()
     })
+    wx.stopPullDownRefresh()
 
   },
+  onPullDownRefresh: function () {
+    this.onShow()
+  },
   changeTypePopup(){
     this.setData({typeShow:!this.data.typeShow})
   },
@@ -136,13 +140,6 @@ Page({
   },
 
   /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {

subPages/organ/early-warning/early-warning.json

@@ -5,6 +5,6 @@
     "xb-icon":"/components/t-icon/t-icon",
     "empty":"/components/empty/empty"
   },
-  "enablePullDownRefresh": false,
+  "enablePullDownRefresh": true,
   "disableScroll":true
 }
\ No newline at end of file

subPages/sport/ai-fwc-sport/ai-fwc-sport.wxml

@@ -16,8 +16,8 @@
 
 <!-- 进行中 -->
 <view wx:if="{{aiState == 3}}">
-  <view class="time">{{downTimeStg}}</view>
-  <view class="number" style="{{levelfontsize}}">{{aiCount}}</view>
+  <view class="time broadwise-c">{{downTimeStg}}</view>
+  <view class="number broadwise-c" style="{{levelfontsize}}">{{aiCount}}</view>
 </view>
 
 <!-- 成绩提交失败 -->

subPages/sport/ai-ywqz-sport/ai-ywqz-sport.wxml

@@ -16,8 +16,8 @@
 
 <!-- 进行中 -->
 <view wx:if="{{aiState == 3}}">
-  <view class="time">{{downTimeStg}}</view>
-  <view class="number" style="{{levelfontsize}}">{{aiCount}}</view>
+  <view class="time broadwise-c">{{downTimeStg}}</view>
+  <view class="number broadwise-c" style="{{levelfontsize}}">{{aiCount}}</view>
 </view>
 
 <!-- 成绩提交失败 -->

subPages/sport/ordinDaka/ordinDaka.js

@@ -333,7 +333,7 @@ Page({
                                 success: (res) => {
                                   if(sportType == 1){
                                       wx.redirectTo({
-                                        url: '../share/share?ordin=1&id=' + uid + '&showMedal=1&sportTime=' + that.data.showTime,
+                                        url: '../../bluetooth/share/share?ordin=1&id=' + uid + '&showMedal=1&sportTime=' + that.data.showTime,
                                       })
                                   }else{
                                       wx.switchTab({

subPages/sport/share/share.js

@@ -22,7 +22,10 @@ Page({
     text:'',
     projectMap:{1:'跳绳',2:'仰卧起坐',3:'踢毽子',11:'开合跳',13:'深蹲',14:'俯卧撑',15:'高抬腿',16:'原地臀踢',17:'原地跑'},
     title:'',
-    user:0
+    user:0,
+
+
+    defaultImage:'https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132'
   },
 
   /**

subPages/sport/share/share.wxml

@@ -10,7 +10,7 @@
       <view class="score-unit">分</view>
     </view>
     <view class="user">
-      <image src="{{sportInfo.imgSrc}}"></image>
+      <image src="{{sportInfo.imgSrc || defaultImage}}"></image>
       <view class="name">{{sportInfo.peopleName}}</view>
     </view>
     <view class="text">{{text}}</view>
@@ -24,7 +24,7 @@
     <view class="bjg-score">{{sportInfo.score || 0}}</view>
     <view class="bjg-score-unit">分</view>
     <view class="user">
-      <image src="{{sportInfo.imgSrc}}"></image>
+      <image src="{{sportInfo.imgSrc || defaultImage}}"></image>
       <view class="name">{{sportInfo.peopleName}}</view>
     </view>
     <view class="text">成绩未达到“国家标准”，继续加油</view>