Merge remote-tracking branch 'origin/master'

@@ -299,7 +299,7 @@ function selectFN(ec) {
     }
     }
   })
   })
   const arr = encodeURIComponent(JSON.stringify(chosen))
   const arr = encodeURIComponent(JSON.stringify(chosen))
-  let path = `/level/chooseExaminer?type=${form.value.type}&chosen=${arr}&ec=${ec}`
+  let path = `/level/chooseExaminer?pageType=2&type=${form.value.type}&chosen=${arr}&ec=${ec}`
   uni.navigateTo({
   uni.navigateTo({
     url: path
     url: path
   });
   });

@@ -5,7 +5,11 @@
 
 
     <!-- 顶部添加考官按钮 -->
     <!-- 顶部添加考官按钮 -->
     <view class="add-btn-box">
     <view class="add-btn-box">
-      <button class="btn-red-kx mini" @click="openAddExaminer">
+	<!-- <button class="btn-red-kx mini" @click="openAddExaminer">
+        <uni-icons type="personadd" size="14" color="#AD181F"></uni-icons>
+        选择考官
+      </button> -->
+      <button class="btn-red-kx mini" @click="addExaminer">
         <uni-icons type="personadd" size="14" color="#AD181F"></uni-icons>
         <uni-icons type="personadd" size="14" color="#AD181F"></uni-icons>
         添加考官
         添加考官
       </button>
       </button>
@@ -113,7 +117,6 @@
 		  ec = option.ec
 		  ec = option.ec
     }
     }
    
    
-		console.log('pageType.value',pageType.value)
 		getList()
 		getList()
 	})
 	})
 	onShow(()=> {
 	onShow(()=> {
@@ -235,14 +238,16 @@
 			modalAction = ''
 			modalAction = ''
 		}
 		}
 	}
 	}
-
+function addExaminer(){
+    addForm.value.name = ''
+    addForm.value.certCode = ''
+    searchResult.value = null
+    searchNoData.value = false
+    addPopup.value.open()
+}
   // 打开添加考官弹窗
   // 打开添加考官弹窗
   function openAddExaminer() {
   function openAddExaminer() {
-    // addForm.value.name = ''
-    // addForm.value.certCode = ''
-    // searchResult.value = null
-    // searchNoData.value = false
-    // addPopup.value.open()
+  
 	const chosenStr = JSON.stringify(list.value)
 	const chosenStr = JSON.stringify(list.value)
 	uni.navigateTo({
 	uni.navigateTo({
 		url: `/myCenter/chooseExaminer?memId=${app.globalData.memberInfo.memId}&chosen=${chosenStr}`
 		url: `/myCenter/chooseExaminer?memId=${app.globalData.memberInfo.memId}&chosen=${chosenStr}`
@@ -284,6 +289,15 @@
   // 执行添加考官
   // 执行添加考官
   let pendingAddRow = null
   let pendingAddRow = null
   function doAddExaminer(row) {
   function doAddExaminer(row) {
+	
+	if(row.canChoose != 1 && pageType.value != 1){
+		uni.showToast({
+			title: '该考官资质已过期!',
+			duration: 3000,
+			icon: 'none'
+		})
+		return
+	}
     pendingAddRow = row
     pendingAddRow = row
     modalAction = 'add'
     modalAction = 'add'
     modalConfig.value = {
     modalConfig.value = {
@@ -304,6 +318,8 @@
 
 
   .add-btn-box {
   .add-btn-box {
     padding: 20rpx 30rpx;
     padding: 20rpx 30rpx;
+	display: flex;
+	justify-content: space-between;
 
 
     .btn-red-kx {
     .btn-red-kx {
       width: 100%;
       width: 100%;

@@ -37,7 +37,7 @@ import {ref} from 'vue'
 import { onLoad ,onShow} from '@dcloudio/uni-app'
 import { onLoad ,onShow} from '@dcloudio/uni-app'
 import * as api from '@/common/api.js'
 import * as api from '@/common/api.js'
 import config from '@/config.js'
 import config from '@/config.js'
-
+	const app = getApp();
 const loading = ref(true)
 const loading = ref(true)
 const infoList = ref([])
 const infoList = ref([])
 const chosen = ref([])
 const chosen = ref([])
@@ -58,7 +58,7 @@ console.log('222',chosen.value)
 async function getList() {
 async function getList() {
   loading.value = true
   loading.value = true
   try {
   try {
-    const res = await api.listApi({chooseFlag: 1})
+    const res = await api.listApi({memId: app.globalData.memberInfo.memId})
     infoList.value = res.rows || []
     infoList.value = res.rows || []
   } catch (err) {
   } catch (err) {
     console.error('获取考官列表失败:', err)
     console.error('获取考官列表失败:', err)