Merge branch 'master' of https://code.itechtop.cn/yangyang/ztx_wx_gzt

 // dev
 // dev
 // const baseUrl_api = 'http://192.168.1.125:8787'
 // const baseUrl_api = 'http://192.168.1.125:8787'
 const baseUrl_api = 'https://tk001.wxjylt.com/stage-api/'
 const baseUrl_api = 'https://tk001.wxjylt.com/stage-api/'
-const loginImage_api = 'http://tk001.wxjylt.com/stage-api'
+const loginImage_api = 'https://tk001.wxjylt.com/stage-api'
 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
 
 
 // prod
 // prod

 <template>
 <template>
   <view class="container">
   <view class="container">
     <!-- 自定义弹窗 -->
     <!-- 自定义弹窗 -->
-    <custom-modal ref="customModalRef" :title="modalConfig.title" :content="modalConfig.content" :showCancel="modalConfig.showCancel" :cancelText="modalConfig.cancelText" :confirmText="modalConfig.confirmText" @confirm="onModalConfirm" />
+    <custom-modal ref="customModalRef" :cancelText="modalConfig.cancelText" :confirmText="modalConfig.confirmText"
+                  :content="modalConfig.content" :showCancel="modalConfig.showCancel"
+                  :title="modalConfig.title" @confirm="onModalConfirm"/>
     
     
     <!-- 考官选择类型 -->
     <!-- 考官选择类型 -->
     <!-- <view class="radio-section">
     <!-- <view class="radio-section">
@@ -19,12 +21,17 @@
     
     
     <!-- 温馨提示 -->
     <!-- 温馨提示 -->
     <view v-if="form.selfSelect == '1'" class="tip-box">
     <view v-if="form.selfSelect == '1'" class="tip-box">
-      <text class="tip-text">温馨提示: 您可以自行录入考官信息,如果暂时没有合适的考官，也可以选择由省跆协指派（支持多选）进行考点申报，同时请尽快完成考点考官的认证。</text>
+      <text class="tip-text">温馨提示:
+        您可以自行录入考官信息,如果暂时没有合适的考官，也可以选择由省跆协指派（支持多选）进行考点申报，同时请尽快完成考点考官的认证。
+      </text>
     </view>
     </view>
     
     
     <!-- 省跆协指派提示 -->
     <!-- 省跆协指派提示 -->
     <view v-if="form.selfSelect == '0'" class="tip-box">
     <view v-if="form.selfSelect == '0'" class="tip-box">
-      <text class="tip-text">温馨提示：关于考官指派，请联系{{ shenForm.baseName || '' }}，联系电话：{{ shenForm.phone || '' }}</text>
+      <text class="tip-text">温馨提示：关于考官指派，请联系{{ shenForm.baseName || '' }}，联系电话：{{
+          shenForm.phone || ''
+        }}
+      </text>
     </view>
     </view>
     
     
     <view class="section">
     <view class="section">
@@ -56,6 +63,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 customModal from '@/components/custom-modal.vue'
 import customModal from '@/components/custom-modal.vue'
+
 const app = getApp();
 const app = getApp();
 const form = ref({
 const form = ref({
   selfSelect: '1' // 1:自行录入 0:省跆协指派
   selfSelect: '1' // 1:自行录入 0:省跆协指派
@@ -187,7 +195,7 @@ async function onModalConfirm() {
   } else if (modalAction === 'submitSuccess') {
   } else if (modalAction === 'submitSuccess') {
     uni.navigateBack()
     uni.navigateBack()
   }
   }
-  modalAction = ''
+  // modalAction = ''
 }
 }
 
 
 function confirmApply() {
 function confirmApply() {

@@ -2,7 +2,9 @@
   <view class="exam-point-list">
   <view class="exam-point-list">
     <!-- 顶部申请按钮 -->
     <!-- 顶部申请按钮 -->
     <view class="apply-btn-box">
     <view class="apply-btn-box">
-			<button class="apply-btn" :disabled="memberInfo.isPoints==0||formInfo.auditStatus==2||formInfo.auditStatus==1" @click="goApply">申请考点</button>
+      <button :disabled="memberInfo.isPoints==0||formInfo.auditStatus==2||formInfo.auditStatus==1" class="apply-btn"
+              @click="goApply">申请考点
+      </button>
     </view>
     </view>
     
     
     <!-- 列表 -->
     <!-- 列表 -->
@@ -14,8 +16,8 @@
       <view
       <view
         v-for="(item, index) in list"
         v-for="(item, index) in list"
         :key="index"
         :key="index"
-				class="list-item"
         :class="{ 'success-row': item.shenAuditStatus == 2 }"
         :class="{ 'success-row': item.shenAuditStatus == 2 }"
+        class="list-item"
       >
       >
         <view class="item-row">
         <view class="item-row">
           <text class="item-label">审核协会</text>
           <text class="item-label">审核协会</text>
@@ -27,8 +29,8 @@
         </view>
         </view>
         <view class="item-row">
         <view class="item-row">
           <text class="item-label">审核状态</text>
           <text class="item-label">审核状态</text>
-					<text class="item-status" :class="getStatusClass(item.auditResult)">
-						{{ item.auditResult == 0 ? '审核未通过' : '审核通过' }}
+          <text :class="getStatusClass(item.auditResult)" class="item-status">
+            {{ item.auditResult == 1 ? '审核通过' : item.auditResult == 0 ? '审核拒绝' : '待审核' }}
           </text>
           </text>
         </view>
         </view>
         <view class="item-row">
         <view class="item-row">
@@ -49,9 +51,11 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import { ref } from 'vue'
-import { onLoad, onReachBottom } from '@dcloudio/uni-app'
-import { getMyRecentExam } from '@/common/api'
+import {ref} from 'vue'
+import {onLoad, onReachBottom} from '@dcloudio/uni-app'
+import {getMyRecentExam} from '@/common/api'
+import {onShow} from "@/unpackage/dist/dev/mp-weixin/common/vendor";
+
 const app = getApp()
 const app = getApp()
 const list = ref([])
 const list = ref([])
 const loading = ref(false)
 const loading = ref(false)
@@ -60,6 +64,11 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 const pageSize = ref(10)
 const memberInfo = app.globalData.memberInfo
 const memberInfo = app.globalData.memberInfo
 const formInfo = ref({})
 const formInfo = ref({})
+
+onShow(() => {
+  loadData()
+})
+
 onLoad(() => {
 onLoad(() => {
   loadData()
   loadData()
 })
 })
@@ -100,8 +109,8 @@ function goApply() {
 
 
 function getStatusClass(status) {
 function getStatusClass(status) {
   return {
   return {
+    'status-2': status == 1,
     'status-1': status == 0,
     'status-1': status == 0,
-		'status-2': status != 0,
   }
   }
 }
 }
 
 
@@ -146,6 +155,7 @@ function formatDate(dateStr) {
     opacity: 1;
     opacity: 1;
   }
   }
 }
 }
+
 .list-content {
 .list-content {
   padding: 0 20rpx 20rpx;
   padding: 0 20rpx 20rpx;
 }
 }