考点

@@ -100,13 +100,14 @@ const handleClick = (index, url) => {
 }
 }
 
 
 .dg-tab-icon {
 .dg-tab-icon {
-  width: 50rpx;
-  height: 50rpx;
-  margin-bottom: 4rpx;
+  width: 40rpx;
+  height: 40rpx;
+  margin-bottom: 10rpx;
 }
 }
 
 
 .dg-tab-text {
 .dg-tab-text {
-  font-size: 20rpx;
+  font-size: 22rpx;
+  // margin-top: 10rpx;
   color: #666;
   color: #666;
 }
 }
 
 

@@ -40,7 +40,7 @@
         <button class="add-btn" @click="addExaminer">+ 添加考官</button>
         <button class="add-btn" @click="addExaminer">+ 添加考官</button>
       </view>
       </view>
         <view v-else class="section examiner-section">
         <view v-else class="section examiner-section">
-        <button class="add-btn" @click="addExaminer">+ 选择考官</button>
+        <button class="add-btn" @click="handelAddExamine">+ 选择考官</button>
       </view>
       </view>
       
       
       <view class="examiner-list">
       <view class="examiner-list">
@@ -161,6 +161,12 @@ async function getShenMemberInfoFn() {
   const res = await api.getShenMemberInfo()
   const res = await api.getShenMemberInfo()
   shenForm.value = res.data ?? {}
   shenForm.value = res.data ?? {}
 }
 }
+function handelAddExamine() {
+  const chosenStr = JSON.stringify(list.value)
+  uni.navigateTo({
+    url: `/myCenter/chooseExaminer?memId=${memId.value}&chosen=${chosenStr}`
+  })
+}
 
 
 // 删除考官：打开自定义弹窗
 // 删除考官：打开自定义弹窗
 function handleDel(row) {
 function handleDel(row) {

@@ -2,7 +2,7 @@
   <view class="exam-point-list">
   <view class="exam-point-list">
     <!-- 顶部申请按钮 -->
     <!-- 顶部申请按钮 -->
     <view v-if="status==0" class="apply-btn-box">
     <view v-if="status==0" class="apply-btn-box">
-      <button :disabled="memberInfo.isPoints==0&&(formInfo.auditStatus==2||formInfo.auditStatus==1)" class="apply-btn"
+      <button :disabled="memberInfo.isPoints==0 || formInfo.auditStatus==1" class="apply-btn"
               @click="goApply">申请考点
               @click="goApply">申请考点
       </button>
       </button>
     </view>
     </view>

@@ -398,11 +398,18 @@ function checkDialogs() {
       passwordTipPopup.value?.open()
       passwordTipPopup.value?.open()
     }
     }
   }
   }
-console.log('checkDialogs',app.globalData.memberInfo?.activeStatus,app.globalData.authenticationStatus,app.globalData.deptType,memberInfoData.isPoints)
-  if (app.globalData.memberInfo?.activeStatus == 1 &&
+  checkExamPointDialog()
+}
+
+async function checkExamPointDialog() {
+  const [err, res] = await to(api.getMyRecentExam())
+  if (err || !res?.data) return
+  const status = res.data?.auditStatus
+  if ((status == 0 || status == 3) &&
+    app.globalData.memberInfo?.activeStatus == 1 &&
     app.globalData.authenticationStatus == 2 &&
     app.globalData.authenticationStatus == 2 &&
     app.globalData.deptType == 6 &&
     app.globalData.deptType == 6 &&
-    memberInfoData.isPoints == 1 ) {
+    app.globalData.memberInfo?.isPoints == 1) {
     examPointPopup.value?.open()
     examPointPopup.value?.open()
   }
   }
 }
 }