证书部分添加证书等级字段

h5_web/pages/index/index.vue

@@ -9,7 +9,8 @@
 						class="header-top-usearch"></u-search>
 					<view class="header-top-notice" @tap="openPage('pages/notification/notification')">
 						<u-icon name="bell" color="#FFFFFF" size="48"></u-icon>
-						<u-badge size="mini" type="error" :count="unreadInfoNum" :absolute="false" class="header-top-notice-badge">
+						<u-badge size="mini" type="error" :count="unreadInfoNum" :absolute="false"
+							class="header-top-notice-badge">
 						</u-badge>
 					</view>
 					<view class="header-top-scan">
@@ -31,7 +32,6 @@
 		<!-- 宫格 -->
 		<view class="service">
 			<view class="service-body u-flex u-flex-wrap u-row-left">
-				<!-- <view class="service-item" @click="openPage('pages/policyNews/policyNews')"> -->
 				<view class="service-item" @click="openPage('pages/policyInfo/policyInfo')">
 					<image class="service-item-img" src="../../static/img/index-service-01.png" mode="aspectFill">
 					</image>
@@ -162,7 +162,7 @@
 			 */
 			getUnreadInfoNum() {
 				this.$u.api.indexApi.getUnreadInfoNumApi().then(res => {
-					if (res.code === 200) {
+					if (res?.code === 200) {
 						this.unreadInfoNum = res.data;
 					}
 				})
@@ -172,7 +172,7 @@
 			 */
 			getNewestInfo() {
 				this.$u.api.indexApi.getNewestInfoApi().then(res => {
-					if (res.code === 200) {
+					if (res?.code === 200) {
 						this.noticeList = res.data.map(item => {
 							return item.name
 						})
@@ -189,15 +189,8 @@
 					pageSize: 10
 				}
 				this.$u.api.indexApi.getIndexNewsListApi(params).then(res => {
-					if (!res) return;
 					if (res?.code == 200) {
 						this.newsList = res.rows;
-					} else {
-						uni.showToast({
-							icon: 'none',
-							type: 'error',
-							title: res.msg
-						})
 					}
 				})
 			},
@@ -206,7 +199,7 @@
 			 */
 			getBannerList() {
 				this.$u.api.indexApi.indexBannerListApi().then(res => {
-					if (res.code === 200) {
+					if (res?.code === 200) {
 						this.bannerList = res.data.map(item => {
 							return {
 								...item,
@@ -214,6 +207,8 @@
 								title: item.name
 							}
 						});
+					} else {
+
 					}
 				})
 			},

h5_web/pages/skillsTraining/achievementCertificate/achievementCertificate.scss

@@ -47,16 +47,18 @@
 				}
 			}
 			.bg1 {
-				background: url(../../../static/img/certificate-bg-1.png);
-				background-size: 100% 100%;
+				background-image: url(../../../static/img/certificate-bg-1.png);
+				background-size: contain;
 				background-position: center center;
 				background-repeat: no-repeat;
+				background-color: #FE5862;
 			}
 			.bg2 {
-				background: url(../../../static/img/certificate-bg-2.png);
-				background-size: 100% 100%;
+				background-image: url(../../../static/img/certificate-bg-2.png);
+				background-size: contain;
 				background-position: center center;
 				background-repeat: no-repeat;
+				background-color: #FE9C37;
 			}
 		}
 	}

h5_web/pages/skillsTraining/achievementCertificate/achievementCertificate.vue

@@ -25,6 +25,9 @@
 					<view class="time">
 						通过时间：{{ item.passDate }}
 					</view>
+					<view class="time">
+						证书等级：{{ getCertificateGradeName(item.grade) || '无' }}
+					</view>
 					<view class="con">
 						证书名称：{{ item.certificateName }}
 					</view>
@@ -49,7 +52,8 @@
 				id: '',
 				certificateList: [],
 				deleteTips: false,
-				curItem: ''
+				curItem: '',
+				gradeList: []
 			}
 		},
 		onLoad(page) {
@@ -58,11 +62,40 @@
 			}
 		},
 		onShow() {
+			this.getCertificateGrade();
 			if (this.id) {
 				this.getCertificateList(this.id);
 			}
 		},
 		methods: {
+			/**
+			 * 获取证书等级
+			 */
+			getCertificateGrade() {
+				this.$u.api.getDictdataUrl({ key:'certificate_grade' }).then(res=>{
+					if(res.code == 200){						
+						this.gradeList = res.data.map(item => {
+							return {
+								...item,
+								value: item.text
+							}
+						});
+					}
+				});
+			},
+			/**
+			 * 获取证书等级名称
+			 * @param {Object} value
+			 */
+			getCertificateGradeName(value) {
+				let name;
+				this.gradeList.forEach(item => {
+					if (item.value == value) {
+						name = item.label
+					}
+				})
+				return name;
+			},
 			/**
 			 * 获取证书列表
 			 */

h5_web/pages/skillsTraining/addAchievementCertificate/addAchievementCertificate.scss

@@ -1,6 +1,6 @@
 /*  录入成绩和证书  */
 .achievement {
-	padding: 20rpx 30rpx;
+	padding: 20rpx 30rpx 200rpx 30rpx;
 	
 	&-form {
 		
@@ -23,16 +23,17 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
+			position: relative;
 			&-icon {
 				width: 62rpx;
 				height: 64rpx;
 				margin: 46rpx auto 0;
 			}
-		}
-		.tips {
-			font-size: 20rpx;
-			color: #5F5F5F;
-			margin-top: 10rpx;
+			.tips {
+				font-size: 20rpx;
+				color: #5F5F5F;
+				margin-top: 10rpx;
+			}
 		}
 	}
 	

h5_web/pages/skillsTraining/addAchievementCertificate/addAchievementCertificate.vue

@@ -18,6 +18,11 @@
 			<u-form-item label="通过日期:" label-position="top" :required="true" prop="passDate">
 				<u-input v-model="form.passDate" placeholder="选择通过日期" type="select" @click="dateShow = true" border />
 			</u-form-item>
+			<u-form-item label="证书等级:" label-position="top" :required="true" prop="gradeName">
+				<u-input v-model="form.gradeName" placeholder="选择证书等级" type="select" @click="gradeShow = true" border />
+			</u-form-item>
+			<!-- 证书等级 -->
+			<u-select v-model="gradeShow" :list="gradeList" @confirm="gradeChange"></u-select>
 			<u-form-item label="上传证书:" label-position="top" :border-bottom="false">
 				<u-form-item label="证书名称" label-width="140" :border-bottom="false">
 					<u-input v-model="form.certificateName" placeholder="请输入内容" border />
@@ -30,9 +35,9 @@
 									height="64" />
 							</view>
 							<view>上传相片</view>
+							<view class="tips">支持jpg.png格式</view>
 						</view>
 					</u-upload>
-					<view class="tips">支持jpg.png格式</view>
 				</u-form-item>
 			</u-form-item>
 		</u-form>
@@ -56,8 +61,13 @@
 					passDate: '',
 					certificateName: '',
 					imgUrl: '',
-					picList: []
+					picList: [],
+					grade: '',
+					gradeName: ''
 				},
+				gradeShow: false,
+				// 证书等级
+				gradeList: [],
 				rules: {
 					examName: [
 						{ 
@@ -90,6 +100,14 @@
 							// 可以单个或者同时写两个触发验证方式 
 							trigger: ['change','blur'],
 						}
+					],
+					gradeName: [
+						{
+							required: true, 
+							message: '请选择证书等级', 
+							// 可以单个或者同时写两个触发验证方式 
+							trigger: [ 'change', 'blur' ]
+						}
 					]
 				},
 				dateShow: false,
@@ -103,7 +121,25 @@
 				this.form.skillTrainId = page.id
 			}
 		},
+		onShow() {
+			this.getCertificateGrade();
+		},
 		methods: {
+			/**
+			 * 获取证书等级
+			 */
+			getCertificateGrade() {
+				this.$u.api.getDictdataUrl({ key:'certificate_grade' }).then(res=>{
+					if(res.code == 200){						
+						this.gradeList = res.data.map(item => {
+							return {
+								...item,
+								value: item.text
+							}
+						});
+					}
+				});
+			},
 			/**
 			 * 日历选择器选中触发
 			 * @param {Object} e
@@ -132,6 +168,14 @@
 			uploadRemove(index) {
 				this.form.picList.splice(index, 1)
 			},
+			/**
+			 * 证书等级确认
+			 * @param {Object} item
+			 */
+			gradeChange(item) {
+				this.form.grade = item[0].value
+				this.form.gradeName = item[0].label
+			},
 			/**
 			 * 提交
 			 */