证书查询调整

pages/certificateDetail/certificateDetail.css

@@ -45,6 +45,14 @@
 	border: 1px solid #DEDEDE;
 }
 
+.border-left {
+	border-left: 1px solid #DEDEDE;
+}
+
+.border-left-none {
+	border-left: none;
+}
+
 .border-right {
 	border-right: 1px solid #DEDEDE;
 }
@@ -61,6 +69,9 @@
 	border-bottom: none;
 }
 
+.border-top {
+	border-top: 1px solid #DEDEDE;
+}
 .border-top-none {
 	border-top: none;
 }

pages/certificateDetail/certificateDetail.vue

@@ -8,11 +8,11 @@
 		<view class="project-content ddflex">
 			<!-- 成绩区域 -->
 			<view class="test-box">
-				<view class="test-title">{{info.cateName}}证书查询结果</view>
+				<view class="test-title">证书查询结果</view>
 				<!-- 表格 -->
 				<view class="ddflex border table" style="">
 					<!-- 左边 -->
-					<view>
+					<!-- <view>
 						<view class="height56 ddflex-jc width140 bg-color border-bottom">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</view>
 						<view class="height56 ddflex-jc width140 bg-color border-bottom">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别</view>
 						<view class="height56 ddflex-jc width140 bg-color border-bottom">身份证号</view>
@@ -22,27 +22,26 @@
 						<view class="height56 ddflex-jc width140 bg-color border-bottom">证书编号</view>
 						<view class="height56 ddflex-jc width140 bg-color border-bottom">培训结论</view>
 						<view class="height56 ddflex-jc width140 bg-color">发证日期</view>
-					</view>
+					</view> -->
 					<!-- 右边 -->
 					<view class="fflex">
+						<view class="height56 ddflex padding-left" style="color: #fff;background-color: #2e68d8;">● 基本信息</view>
 						<view class="dflex" style="align-items: stretch;">
 							<view>
-								<view class="height56 ddflex padding-left border border-right-none border-top-none">{{info.userName?info.userName:'*'}}</view>
 								<view>
 									<view class="ddflex">
-										<view class="height56 ddflex padding-left width200 border border-bottom-none border-right-none border-top-none">{{info.sex==1?'男':info.sex==2?'女':'*'}}</view>
-										<view class="height56 ddflex-jc width140 bg-color border border-bottom-none border-right-none border-top-none">出生日期</view>
-										<view class="height56 ddflex-jc width140 border border-bottom-none border-right-none border-top-none">{{info.birthday?info.birthday:'*'}}</view>
+										<view class="height56 ddflex-jc width140 bg-color border-bottom border-top-none">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</view>
+										<view class="height56 ddflex padding-left width200 border border-right-none border-top-none">{{info.userName?info.userName:'*'}}</view>
+										<view class="height56 ddflex-jc width140 bg-color border-bottom border-left">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别</view>
+										<view class="height56 ddflex padding-left width200 border border-right-none border-top-none">{{info.sex==1?'男':info.sex==2?'女':'*'}}</view>
 									</view>
 									<view class="ddflex">
-										<view class="height56 ddflex-jc width200 border border-bottom-none border-right-none">{{info.idNumber?info.idNumber:'*'}}</view>
-										<view class="height56 ddflex-jc width140 bg-color border border-bottom-none border-right-none">培训时间</view>
-										<view class="height56 ddflex-jc width140 border border-bottom-none border-right-none">{{info.trainingDate?info.trainingDate:'*'}}</view>
+										<view class="height56 ddflex-jc width140 bg-color">身份证号</view>
+										<view class="height56 ddflex fflex padding-left border border-bottom-none border-right-none border-top-none">{{info.idNumber?info.idNumber:'*'}}</view>
 									</view>
 									<view class="ddflex">
-										<view class="height56 ddflex padding-left width200 border border-right-none">{{info.cateName?info.cateName:'*'}}</view>
-										<view class="height56 ddflex-jc width140 bg-color border border-right-none">培训等级</view>
-										<view class="height56 ddflex padding-left width140 border border-right-none">{{info.trainingLevel?info.trainingLevel:'*'}}</view>
+										<view class="height56 ddflex-jc width140 bg-color border border-right-none border-left-none">培训时间</view>
+										<view class="height56 ddflex fflex padding-left border border-right-none">{{info.trainingDate?dateYM(info.trainingDate):'*'}}</view>
 									</view>
 								</view>
 							</view>
@@ -50,20 +49,21 @@
 								<image style="width: 100%;" :src="info.avatar" mode="widthFix"></image>
 							</view>
 						</view>
-						<view class="height56 border ddflex border-top-none border-right-none padding-left">
-							湖南现代职业培训学校
-						</view>
-						<view class="height56 border ddflex border-top-none border-right-none padding-left">
-							{{info.schoolNo?info.schoolNo:'*'}}
+						
+						<view class="height56 ddflex padding-left" style="color: #fff;background-color: #2e68d8;">● 证书信息</view>
+						<view class="ddflex">
+							<view class="height56 ddflex-jc width140 bg-color border-top-none">职业名称</view>
+							<view class="height56 ddflex padding-left width200 border border-right-none border-top-none border-bottom-none">{{info.cateName?info.cateName:'*'}}</view>
+							<view class="height56 ddflex-jc width140 bg-color border-left">培训等级</view>
+							<view class="height56 ddflex padding-left width200 border border-right-none border-top-none border-bottom-none">{{info.trainingLevel?info.trainingLevel:'*'}}</view>
 						</view>
-						<view class="height56 border ddflex border-top-none border-right-none padding-left">
-							{{info.certificateNo?info.certificateNo:'*'}}
+						<view class="ddflex">
+							<view class="height56 ddflex-jc width140 bg-color border-bottom border-top">发证单位</view>
+							<view class="height56 ddflex fflex padding-left border border-right-none">湖南现代职业培训学校</view>
 						</view>
-						<view class="height56 border ddflex border-top-none border-right-none padding-left">
-							{{info.conclusion==0?'培训中':info.conclusion==1?'成绩不合格':info.conclusion==2?'成绩合格':'*'}}
-						</view>
-						<view class="height56 border ddflex border-top-none border-right-none padding-left border-bottom-none">
-							{{info.issueDate?info.issueDate:'*'}}
+						<view class="ddflex">
+							<view class="height56 ddflex-jc width140 bg-color border-bottom border-top-none border-bottom-none">发证日期</view>
+							<view class="height56 ddflex fflex padding-left border border-right-none border-top-none border-bottom-none">{{info.issueDate?info.issueDate:'*'}}</view>
 						</view>
 					</view>
 				</view>
@@ -77,7 +77,7 @@
 				</view>
 			</view>
 			<!-- 答题卡区域 -->
-			<view class="test-info ddflex">
+			<view class="test-info ddflex" v-if="false">
 				<view class="note-box">
 					<view class="note-title ddflex">
 						<image class="note-title-icon" src="/static/images/wzgg.png"></image>
@@ -198,6 +198,11 @@
 					this.cjwtList = res
 				})
 			},
+			
+			// 时间格式化
+			dateYM(date){
+				return req.dateFormat(date).v6
+			}
 		}
 	}
 

utils/request.js

@@ -790,6 +790,7 @@ const dateFormat = (dat)=>{
 		v3:year +"/"+ mon +"/"+ data,
 		v4:year +"年"+ mon +"月"+ data +"日",
 		v5:year +"-"+ mon +"-"+ data,
+		v6:year +"-"+ mon,
 		week:str,
 		text:text
 	};