会员过期提醒

@@ -507,7 +507,7 @@ function payTheFees() {
     height: 100%;
     height: 100%;
     top: 0;
     top: 0;
     left: 0;
     left: 0;
-    background: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.7));
+    // background: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.7));
   }
   }
   
   
   text {
   text {

@@ -234,43 +234,62 @@ function checkImgExist() {
 }
 }
 
 
 function handleAccountStatus() {
 function handleAccountStatus() {
-  console.log('handleAccountStatus22',userType.value , app.globalData.authenticationStatus)
-  if (userType.value != '1' && app.globalData.authenticationStatus != '2' && app.globalData.authenticationStatus != '4') {
+  const authStatus = String(app.globalData.authenticationStatus)
+  const memberInfoData = app.globalData.memberInfo || {}
+  const activeStatus = memberInfoData.activeStatus
+
+  if (!app.globalData.authenticationStatus || authStatus === 'undefined' || authStatus === '0' || authStatus === '3') {
     uni.navigateTo({ url: '/pages/index/perfect' })
     uni.navigateTo({ url: '/pages/index/perfect' })
     return
     return
   }
   }
 
 
-  if (app.globalData.authenticationStatus == '5') {
-    const content = app.globalData.genFlag == 1 ? '您的会员已过期' : '会员已过期，请及时续费'
-    uni.showModal({
-      title: '提示',
-      content,
-      success: (res) => {
-        if (res.confirm && app.globalData.genFlag != 1) {
-          uni.navigateTo({ url: '/myCenter/auth' })
+  if (authStatus === '1') {
+    if (!memberInfoData.memCode) {
+      uni.navigateTo({ url: '/pages/index/perfect' })
     }
     }
+    return
+  }
+
+  if (authStatus === '2') {
+    if (activeStatus == 0) {
+      showMemberStatusDialog('你的会员未激活,请前去激活！', true)
     }
     }
-    })
     return
     return
   }
   }
 
 
-  if (app.globalData.authenticationStatus == '4') {
-    uni.showModal({
-      title: '提示',
-      content: '你的会员即将过期,将会影响你的业务，请及时续费'
-    })
+  if (authStatus === '4') {
+    if (activeStatus == 0) {
+      showMemberStatusDialog('你的会员未激活,请前去激活！', true)
+      return
+    }
+    showMemberStatusDialog('你的会员即将过期,将会影响你的业务，请及时续费！', false)
+    return
   }
   }
 
 
-  if (app.globalData.memberInfo?.activeStatus == 0) {
-    uni.showModal({
-      content: '账号未激活，请前去激活',
-      success: (res) => {
-        if (res.confirm) {
+  if (authStatus === '5') {
+    if (activeStatus == 0) {
+      showMemberStatusDialog('你的会员未激活,请前去激活！', true)
+      return
+    }
+    const content = app.globalData.genFlag != 1
+      ? '您的会员已过期，将会影响你的业务办理，请及时续费！'
+      : '您的会员已过期！'
+    showMemberStatusDialog(content, app.globalData.genFlag != 1)
+  }
+}
+
+function showMemberStatusDialog(content, shouldGoAuth) {
+  showModal({
+    title: '提示',
+    content,
+    showCancel: false,
+    confirmText: '确定',
+    onConfirm: () => {
+      if (shouldGoAuth) {
         uni.navigateTo({ url: '/myCenter/auth' })
         uni.navigateTo({ url: '/myCenter/auth' })
       }
       }
     }
     }
   })
   })
-  }
 }
 }
 
 
 function goPath(path) {
 function goPath(path) {
@@ -404,14 +423,11 @@ function checkDialogs() {
 }
 }
 
 
 async function checkExamPointDialog() {
 async function checkExamPointDialog() {
-  console.log('checkExamPointDialog', app.globalData.userInfo.hintFlag )
   const [err, res] = await to(api.getMyRecentExam())
   const [err, res] = await to(api.getMyRecentExam())
   if (err) return
   if (err) return
   const examData = res?.data
   const examData = res?.data
   const status = examData?.auditStatus
   const status = examData?.auditStatus
   const canShowByExamStatus = examData == null || status == 0 || status == 3
   const canShowByExamStatus = examData == null || status == 0 || status == 3
-  // (status == 0 || status == 3) &&
-  console.log('122', app.globalData.memberInfo?.activeStatus,app.globalData.authenticationStatus,app.globalData.deptType,app.globalData.userInfo.hintFlag, app.globalData.memberInfo?.isPoints)
  if (canShowByExamStatus &&
  if (canShowByExamStatus &&
     app.globalData.memberInfo?.activeStatus == 1 &&
     app.globalData.memberInfo?.activeStatus == 1 &&
     app.globalData.authenticationStatus == 2 &&
     app.globalData.authenticationStatus == 2 &&

@@ -592,12 +592,10 @@ onUnmounted(() => {
   align-items: center;
   align-items: center;
   margin-top: 14rpx;
   margin-top: 14rpx;
   padding: 16rpx 0 0;
   padding: 16rpx 0 0;
-  // border-top: 1rpx dashed #f0f0f0;
   margin-bottom: 10rpx;
   margin-bottom: 10rpx;
   padding-bottom: 14rpx;
   padding-bottom: 14rpx;
-  // border-bottom: 1rpx dashed #f0f0f0;
   border: 20rpx;
   border: 20rpx;
-  background-color: #f0f0f0;
+  background-color: #f4f9fd;
 }
 }
 
 
 .summary-item {
 .summary-item {
@@ -631,10 +629,10 @@ onUnmounted(() => {
   .btn {
   .btn {
     width: 108rpx;
     width: 108rpx;
     height: 48rpx;
     height: 48rpx;
-    line-height: 48rpx;
+    line-height: 46rpx;
     padding: 0;
     padding: 0;
     border-radius: 10rpx;
     border-radius: 10rpx;
-    font-size: 24rpx;
+    font-size: 22rpx;
     white-space: nowrap;
     white-space: nowrap;
     font-weight: bold;
     font-weight: bold;
     border: none;
     border: none;