fix

components/activitybar/index.wxml

@@ -13,7 +13,7 @@
     <view class="przdailog-box {{plan}}"      wx:if="{{receivePrzShow}}">
         <view class="content animation"     >
             <image class="close-icon" src="{{imageRoot}}activityindex/close-icon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" bindtap="closeAc"></image>
-            <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"></button>
+            <button class="btn-hidden" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"></button>
             <image class="adimg" src="{{imageRoot}}activityindex/{{schoolname}}/getprzdia.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
             <image class="getprzbtn" src="{{imageRoot}}activityindex/{{schoolname}}/getprzbtn.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
         </view>

components/activitybar/index.wxss

@@ -98,7 +98,7 @@ to {transform: scale(1,1);}
     margin-left: -140rpx;
     /* transform: translateX(-50%); */
 }
-.przdailog-box .content button{
+.przdailog-box .content .btn-hidden{
     position: absolute;
     height: 100rpx;
     width: 100%;

src/pages/scoretasklist/index.js

 
-import {
-  studentTasks
-} from '../../../service/customer/circleindex.js';
+import { mixedthemeList } from "../../../service/customer/circleindex.js";
 import {
   wxPreviewImage 
 } from '../../../utilities/wxApi.js';
@@ -76,7 +74,8 @@ Page({
       source_id: this.data.sid,
       source_type: 10,
     }).then(() => {
-      this.getClassList();
+      this.getStudentTasks('init');
+      this.clockListGet('init');
       wx.hideShareMenu();
       const visitor = LocalStorage.getItem('visitor');
       activityLog({
@@ -220,39 +219,39 @@ Page({
       path: shareObj.path,
     }
   },
-  getClassList() {
-    const visitor = LocalStorage.getItem('visitor');
-    mineClassList({
-      page: this.data.page,
-      perPage: 100,
-      school_id: this.data.sid
-      // consumer_id: visitor && visitor.id,
-    }).then((res) => {
-      const { code, data } = res;
-      if (code != 200) { // 失败的处理
+  // getClassList() {
+  //   const visitor = LocalStorage.getItem('visitor');
+  //   mineClassList({
+  //     page: this.data.page,
+  //     perPage: 100,
+  //     school_id: this.data.sid
+  //     // consumer_id: visitor && visitor.id,
+  //   }).then((res) => {
+  //     const { code, data } = res;
+  //     if (code != 200) { // 失败的处理
 
-      } else {
-        this.setData({
-          classList: data.list,
-          classTotal: data.total
-        })
-        if (this.data.classList.length > 0) {
-          this.setData({
-            selectedClass: this.data.classList[0],
-            id: this.data.classList[0].id,
-            hasmore: true,
-            clockhasmore: true,
-            clockGetting: false,
-          })
-          this.data.page = 1;
-          this.data.clockPage = 1;
-          this.getStudentTasks('init');
-          this.clockListGet('init');
-        }
-      }
-    }).catch((e) => {
-    })
-  },
+  //     } else {
+  //       this.setData({
+  //         classList: data.list,
+  //         classTotal: data.total
+  //       })
+  //       if (this.data.classList.length > 0) {
+  //         this.setData({
+  //           selectedClass: this.data.classList[0],
+  //           id: this.data.classList[0].id,
+  //           hasmore: true,
+  //           clockhasmore: true,
+  //           clockGetting: false,
+  //         })
+  //         this.data.page = 1;
+  //         this.data.clockPage = 1;
+  //         this.getStudentTasks('init');
+  //         this.clockListGet('init');
+  //       }
+  //     }
+  //   }).catch((e) => {
+  //   })
+  // },
   getStudentTasks(type) {
     if (!this.data.hasmore) {
       return;
@@ -266,11 +265,18 @@ Page({
     // wx.showLoading({
     //   title: '数据加载中'
     // })
-    studentTasks({
-      class_id: this.data.id,
-      school_id: this.data.sid,
+    // studentTasks({
+    //   class_id: this.data.id,
+    //   school_id: this.data.sid,
+    //   page: this.data.page,
+    //   perPage: this.data.perPage,
+    // })
+    mixedthemeList({
       page: this.data.page,
       perPage: this.data.perPage,
+      type: 1,
+      sort_type: 1,
+      school_id: this.data.sid
     }).then((res) => {
       const {
         code,
@@ -388,8 +394,9 @@ Page({
     clockList({
       page: this.data.clockPage,
       perPage: this.data.clockPerPage,
-      class_id: this.data.id,
+      // class_id: this.data.id,
       // exclude_self: true,
+      school_id: this.data.sid,
       student_id: that.data.queryCustomerId,
       now_student_id: app.globalData.currentSchoolStudentId
     }).then((res) => {

src/pages/scoretasklist/index.wxml

 <!--business/pages/mytask/index.wxml-->
 <wxs src="./../../../filter/index.wxs" module="filter" />
-<view class="container {{classesShow ? 'containerDisabledScroll' : ''}}" style="{{classTotal > 1?'padding-top: 88rpx': ''}} ">
-    <view class="select-class" bindtap="selectClass" wx:if="{{classTotal > 1}}">
+<view class="container" style="{{classTotal > 1?'padding-top: 88rpx': ''}} ">
+    <!-- <view class="select-class" bindtap="selectClass" wx:if="{{classTotal > 1}}">
         <view class="class-name">{{selectedClass.title}}</view>
         <image class="arrowwhite {{classesShow ? 'up' : 'down'}}" src="{{imageRoot}}2b/common/arrowblack.png?{{imageVersion}}" ></image>
     </view>
@@ -14,7 +14,7 @@
                 <image class="selecticon" wx:if="{{item.id == id}}" src="{{imageRoot}}2b/circleindex/rightblack.png?{{imageVersion}}" ></image>   
             </view>
         </view>
-    </view>
+    </view> -->
 
     <view class="taskbox" wx:if="{{!taskemptyPage}}">
         <view class="task-list">

ucenter/index.js

@@ -201,6 +201,7 @@ Page({
       .then(res => {
         const { data, code } = res;
         if (code == 200 && data) {
+          console.log(data, 'data');
           this.setData({
             noUserinfo: data.is_visitor,
             userInfo: data.student,

ucenter/index.json

 {
   "navigationBarTitleText": "",
-  "navigationBarBackgroundColor": "#FFD146",
   "navigationStyle": "custom",
   "usingComponents": {
     "btabbar": "../../components/ctabbar",