From 611457d5bedd5386999dbbbee55048dc1e1ee624 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 06 九月 2024 14:43:44 +0800
Subject: [PATCH] test

---
 pages/personalCenter/index.js |   95 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 0d20c2e..45fbc34 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -1,4 +1,5 @@
 const app = getApp();
+import moment from 'moment'
 import {
   loginInfo
 } from '../../assets/js/login';
@@ -17,7 +18,8 @@
   {
     title: '鎴戠殑璇佷功',
     icon: '/static/images/personal/certificate.png',
-    url: '',
+    // url: '',
+    url: '/pages/personalCenter/certificate/index',
     type: 'certificate',
   },
   {
@@ -41,12 +43,14 @@
   {
     title: '鎴戠殑涓婁紶',
     icon: '/static/images/personal/upload.png',
-    url: '',
+    // url: '',
+    url: '/pages/personalCenter/myUpload/index',
     type: 'upload',
   },
   {
     title: '鍑轰功鐢宠',
     icon: '/static/images/personal/chushu.png',
+    // url: '',
     url: '/packagePersonal/pages/publishBooks/index',
     type: 'publishBooks',
   }
@@ -102,6 +106,7 @@
   data: {
     barHeight: '',
     navBarHeight: '',
+    scoll: false,
     isWhite: false,
     userInfo: {},
     currAuthStep: 1,
@@ -120,7 +125,7 @@
       value: false
     },
     loadingProps: {
-      size: '50rpx',
+      size: '10rpx',
     },
     scrollTop: 0,
   },
@@ -135,6 +140,14 @@
       barHeight: systInfo.statusBarHeight,
       navBarHeight: navBarHeight,
     });
+
+  },
+  onShow() {
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().setData({
+        active: 4
+      })
+    }
     // 妫�鏌ョ櫥褰曠姸鎬�
     const token = wx.getStorageSync(app.config.tokenKey)
     if (!token) {
@@ -144,20 +157,15 @@
             currAuthStep: 2,
           });
           this.getUserInfo()
+          this.getIntegral()
         }
       })
     } else {
       this.setData({
-        currAuthStep: 1,
+        currAuthStep: 3,
       });
       this.getUserInfo()
-    }
-  },
-  onShow() {
-    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-      this.getTabBar().setData({
-        active: 4
-      })
+      this.getIntegral()
     }
   },
   /**
@@ -168,6 +176,8 @@
       'baseRefresh.value': true,
     })
     this.getUserInfo()
+    this.getIntegral()
+    wx.stopPullDownRefresh()
   },
   /**
    * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
@@ -185,7 +195,7 @@
           this.setData({
             userTypeActive: JSON.parse(userTypeData.data).userType,
           });
-          type = userTypeList.find((item) => item.value === this.data.userTypeActive)?.lable;
+          type = this.data.userTypeList.find((item) => item.value === this.data.userTypeActive)?.lable;
         } else {
           type = ''
         }
@@ -194,11 +204,12 @@
         let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
         let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
         let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
+        let secretData = res.secretList.find(i => i.type == 'LoginNameAndPassword')
         if (teacherRole && teacherInfos) {
           defaultUser = {
             ...teacherInfos,
-            nickName: teacherInfos.name,
-            icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
+            nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo ? WeChatInfo.name : '',
+            icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
             userId: res.userId,
             role: 'Teacher',
             roleId: teacherRole.role.id,
@@ -211,11 +222,22 @@
         } else if (WeChatInfo) {
           defaultUser = {
             ...WeChatInfo,
-            nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
-            icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+            nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
+            icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
             userId: res.userId,
             userType: type,
             role: 'Student',
+          }
+          this.setData({
+            currAuthStep: 3,
+          });
+        } else if (secretData) {
+          defaultUser = {
+            nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : secretData.credential,
+            icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : "",
+            userId: res.userId,
+            role: "Student",
+            userType: type,
           }
           this.setData({
             currAuthStep: 3,
@@ -316,6 +338,25 @@
     });
   },
 
+  getIntegral() {
+    app.MG.store
+      .getUserWallet({
+        type: 'integral'
+      })
+      .then((res) => {
+        this.setData({
+          integral: res.balance,
+        });
+      })
+  },
+  getIntegralList() {
+    wx.navigateTo({
+      url: `/pages/personalCenter/pointsRecord/index`,
+    });
+
+  },
+
+
   //鐐瑰嚮鐩綍
   toPages(item) {
     let info = item.currentTarget.dataset.info
@@ -333,15 +374,23 @@
   },
 
   onScroll(e) {
+    if (this.data.scoll) {
+      if (e.detail.scrollTop < 20) {
+        this.data.scoll = false
+        this.isChange(false);
+      }
+    } else {
+      if (e.detail.scrollTop > 20) {
+        this.data.scoll = true
+        this.isChange(true);
+      }
+    }
+  },
+
+  isChange(data) {
     this.setData({
-      isWhite: e.detail.scrollTop > 10 ? true : false
+      isWhite: data
     })
-    const {
-      scrollTop
-    } = e.detail;
-    this.setData({
-      scrollTop
-    });
   },
 
 

--
Gitblit v1.9.1