Merge remote-tracking branch 'origin/master'

@@ -16,7 +16,7 @@ page {
 .w80{width: 80%!important;}
 .w80{width: 80%!important;}
 .w100{width: 100%!important;}
 .w100{width: 100%!important;}
 .mt0{margin-top: 0 !important;}
 .mt0{margin-top: 0 !important;}
-.mt10{margin-top: 10px !important;}
+.mt10{margin-top: 10rpx !important;}
 .mt20{margin-top: 20px !important;}
 .mt20{margin-top: 20px !important;}
 .must{color: #AD181F;font-size: 24rpx;}
 .must{color: #AD181F;font-size: 24rpx;}
 .vipData .w50{width: 45%;}
 .vipData .w50{width: 45%;}

@@ -9,20 +9,17 @@
     <view class="appList">
     <view class="appList">
       <view v-for="(item,index) in list" :key="item.examId || index" class="appItem">
       <view v-for="(item,index) in list" :key="item.examId || index" class="appItem">
         <view class="status" @click="goDetail(item)">
         <view class="status" @click="goDetail(item)">
-          <text v-if="item.status=='0'" class="text-primary">{{ item.statusStr }}</text>
-          <text v-if="item.status=='1'" class="text-primary">{{ item.statusStr }}</text>
-          <text v-if="item.status=='2'" class="text-success">{{ item.statusStr }}</text>
-          <text v-if="item.status=='3'" class="text-danger">{{ item.statusStr }}</text>
-          <text v-if="item.status=='4'" class="text-warning">{{ item.statusStr }}</text>
+          <text v-if="item.status=='0'" class="text-primary-bg">{{ item.statusStr }}</text>
+          <text v-if="item.status=='1'" class="text-primary-bg">{{ item.statusStr }}</text>
+          <text v-if="item.status=='2'" class="text-success-bg">{{ item.statusStr }}</text>
+          <text v-if="item.status=='3'" class="text-danger-bg">{{ item.statusStr }}</text>
+          <text v-if="item.status=='4'" class="text-warning-bg">{{ item.statusStr }}</text>
         </view>
         </view>
         <view v-if="item.status!='0'&&item.submitTime" class="date">提交时间:{{ item.submitTime }}</view>
         <view v-if="item.status!='0'&&item.submitTime" class="date">提交时间:{{ item.submitTime }}</view>
         <view class="mt0" @click="goDetail(item)">
         <view class="mt0" @click="goDetail(item)">
           <text class="text-primary">{{ item.examCode }}</text>
           <text class="text-primary">{{ item.examCode }}</text>
         </view>
         </view>
-        <view class="name mt0" @click="goDetail(item)">{{ item.name }}</view>
-        <view class="pp esp">申请单位：{{ item.memberName }}</view>
-        <view class="pp esp">考级日期：{{ item.startTime?.substring(0, 16) }} 至 {{ item.endTime?.substring(0, 16) }}
-        </view>
+        <view class="name mt10" @click="goDetail(item)">{{ item.name }}</view>
         <view class="flexbox" @click="goDetail(item)">
         <view class="flexbox" @click="goDetail(item)">
           <view>
           <view>
             申请日期
             申请日期
@@ -38,6 +35,10 @@
             <view>{{ item.pass }}</view>
             <view>{{ item.pass }}</view>
           </view>
           </view>
         </view>
         </view>
+        <view class="pp esp">申请单位：{{ item.memberName }}</view>
+        <view class="pp esp">考级日期：{{ item.startTime?.substring(0, 16) }} 至 {{ item.endTime?.substring(0, 16) }}
+        </view>
+   
         <view v-if="item.status=='0'||item.status=='3'||item.status=='4'||item.status=='9'" class="func">
         <view v-if="item.status=='0'||item.status=='3'||item.status=='4'||item.status=='9'" class="func">
           <button :disabled="item.status=='1'||item.status=='2'||item.status=='3'"
           <button :disabled="item.status=='1'||item.status=='2'||item.status=='3'"
                   @click="handleDelete(item)">删除
                   @click="handleDelete(item)">删除

@@ -370,7 +370,8 @@ const showConfirm = ref(false)
 	};
 	};
 
 
 	const goToWebView = (type) => {
 	const goToWebView = (type) => {
-		const url = "https://member.taekwondo.org.cn/#/authAccurate?type=" + type
+		// const url = "https://member.taekwondo.org.cn/#/authAccurate?type=" + type
+		const url = "http://tk001.wxjylt.com/pc.html#/authAccurate?type=" + type
 		uni.navigateTo({
 		uni.navigateTo({
 			url: "/pages/webview/webview?url=" + encodeURIComponent(url)
 			url: "/pages/webview/webview?url=" + encodeURIComponent(url)
 		});
 		});