空白格 3 years ago
parent
commit
c38931e5bb
45 changed files with 313 additions and 254 deletions
  1. 4 3
      h5_web/pages/applyEducationCode/applyEducationCode.scss
  2. 13 11
      h5_web/pages/basicTraining/basicTraining.scss
  3. 5 3
      h5_web/pages/basicTraining/basicTraining.vue
  4. 1 1
      h5_web/pages/basicTraining/offlineTrainingDetails/offlineTrainingDetails.vue
  5. 16 16
      h5_web/pages/basicTraining/onlineTrainingDetails/onlineTrainingDetails.scss
  6. 1 1
      h5_web/pages/basicTraining/onlineTrainingDetails/onlineTrainingDetails.vue
  7. 8 8
      h5_web/pages/businessDetails/businessDetails.scss
  8. 2 2
      h5_web/pages/cooperativeEnterprise/cooperativeEnterprise.scss
  9. 4 4
      h5_web/pages/entrepreneurshipGuidelines/entrepreneurshipGuidelines.scss
  10. 6 5
      h5_web/pages/entrepreneurshipGuidelines/planDetails/planDetails.vue
  11. 3 3
      h5_web/pages/evaluationIntention/evaluationIntention.scss
  12. 6 6
      h5_web/pages/index/index.scss
  13. 10 9
      h5_web/pages/jobDetails/scss/jobDetails.scss
  14. 7 6
      h5_web/pages/mine/mine.scss
  15. 7 7
      h5_web/pages/mine/skillsTraining/skillsTraining.scss
  16. 1 1
      h5_web/pages/mine/skillsTraining/skillsTraining.vue
  17. 6 5
      h5_web/pages/mine/skillsTraining/skillsTrainingDetails/skillsTrainingDetails.scss
  18. 2 2
      h5_web/pages/mine/skillsTraining/skillsTrainingDetails/skillsTrainingDetails.vue
  19. 12 10
      h5_web/pages/myDelivery/myDelivery.scss
  20. 20 14
      h5_web/pages/myInterview/myInterview.scss
  21. 1 1
      h5_web/pages/myInterview/myInterview.vue
  22. 12 12
      h5_web/pages/myResume/myResume.scss
  23. 3 2
      h5_web/pages/newsDetails/newsDetails.vue
  24. 1 1
      h5_web/pages/policyInfo/policyInfoDetails.vue
  25. 1 1
      h5_web/pages/professionalDetails/professionalDetails.vue
  26. 9 9
      h5_web/pages/progressiveIntegral/progressiveIntegral.scss
  27. 38 13
      h5_web/pages/progressiveIntegral/progressiveIntegral.vue
  28. 1 1
      h5_web/pages/recruitment/recruitment.vue
  29. 8 8
      h5_web/pages/recruitment/scss/recruitment.scss
  30. 7 7
      h5_web/pages/schoolDetails/schoolDetails.scss
  31. 7 6
      h5_web/pages/schools/schools.scss
  32. 2 2
      h5_web/pages/schools/schools.vue
  33. 16 16
      h5_web/pages/skillsTraining/courseDetailed/courseDetailed.scss
  34. 1 1
      h5_web/pages/skillsTraining/courseDetailed/courseDetailed.vue
  35. 14 13
      h5_web/pages/skillsTraining/skillsPackage/skillsPackage.scss
  36. 1 1
      h5_web/pages/skillsTraining/skillsPackage/skillsPackage.vue
  37. 19 14
      h5_web/pages/skillsTraining/skillsTraining.scss
  38. 1 1
      h5_web/pages/skillsTraining/skillsTraining.vue
  39. 5 3
      h5_web/pages/skillsTraining/skillsTrainingCourse/skillsTrainingCourse.scss
  40. 17 15
      h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.scss
  41. 2 2
      h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.vue
  42. 9 4
      h5_web/pages/upgrade/upgrade/upgrade.scss
  43. 2 2
      h5_web/pages/upgrade/upgradeCourse/upgradeCourse.scss
  44. 1 1
      h5_web/uview-ui/components/u-cell-item/u-cell-item.vue
  45. 1 1
      h5_web/uview-ui/components/u-form-item/u-form-item.vue

+ 4 - 3
h5_web/pages/applyEducationCode/applyEducationCode.scss

@@ -18,11 +18,12 @@
 				width: 62rpx;
 				height: 62rpx;
 				vertical-align: middle;
+				margin-bottom: 5rpx;
 			}
 			.font {
 				color: #4B4B4B;
 				opacity: 0.8;
-				font-size: 22rpx;
+				font-size: 26rpx;
 				line-height: 50rpx;
 			}
 		}
@@ -43,13 +44,13 @@
 			.font {
 				color: #4B4B4B;
 				opacity: 0.8;
-				font-size: 22rpx;
+				font-size: 26rpx;
 				line-height: 50rpx;
 			}
 		}
 		.tips {
 			color: #5F5F5F;
-			font-size: 20rpx;
+			font-size: 24rpx;
 		}
 		.pic-url {
 			width: 184rpx;

+ 13 - 11
h5_web/pages/basicTraining/basicTraining.scss

@@ -67,12 +67,12 @@ page {
 	view {
 		&:first-child {
 			color: #FF7E00;
-			font-size: 36rpx;
+			font-size: 38rpx;
 			font-size: 500;
 		}
 		&:last-child {
-			color: #A3A3A3;
-			font-size: 24rpx;
+			color: #525252;
+			font-size: 28rpx;
 			margin-top: 20rpx;
 		}
 	}
@@ -99,14 +99,16 @@ page {
 			align-items: center;
 			.left {
 				margin-right: 14rpx;
+				border: solid 1px #b4b4b4;
+				border-radius: 10rpx;
 			}
 			.right {
-				font-size: 30rpx;
+				font-size: 34rpx;
 				color: #424242;
 				view {
 					&:last-child {
-						font-size: 24rpx;
-						color: #6F6F6F;
+						font-size: 28rpx;
+						color: #525252;
 						margin-top: 20rpx;
 					}
 				}
@@ -135,18 +137,18 @@ page {
 				justify-content: space-between;
 				margin-bottom: 20rpx;
 				view {
-					font-size: 30rpx;
-					color: #424242;
+					font-size: 26rpx;
+					color: #787878;
 					&:last-child {
 						min-width: 40%;
 						text-align: right;
-						color: #9A9A9A;
 					}
 				}
 			}
 			.bottom {
-				font-size: 24rpx;
-				color: #6F6F6F;
+				font-size: 32rpx;
+				color: #525252;
+				font-weight: 600;
 				line-height: 40rpx;
 				padding-bottom: 10rpx;
 			}

+ 5 - 3
h5_web/pages/basicTraining/basicTraining.vue

@@ -14,7 +14,7 @@
 					</view>
 					<view class="training-data-item">
 						<view>还需观看</view>
-						<view><text>{{ online.playNot }}</text>个</view>
+						<view><text style="color: #FF7E00;">{{ online.playNot }}</text>个</view>
 					</view>
 				</view>
 				<view class="training-offline" v-if="tabIndex === 1">
@@ -53,11 +53,13 @@
 			</view>
 			<view class="training-offline1-list">
 				<view class="training-offline1-list-item" v-for="(item, index) in offLineList" :key="index" @click="recordBrowseTotal(item, 1)">
-					<view class="top">
+					<view class="bottom">
 						<view>{{ item.adaptName }}</view>
+					</view>
+					<view class="top">
+						<view>{{ item.adaptAddress }}</view>
 						<view>{{ item.createTime }}</view>
 					</view>
-					<view class="bottom">{{ item.adaptAddress }}</view>
 				</view>
 			</view>
 		</view>

+ 1 - 1
h5_web/pages/basicTraining/offlineTrainingDetails/offlineTrainingDetails.vue

@@ -77,7 +77,7 @@
 	}
 	&-content {
 		color: #545454;
-		font-size: 24rpx;
+		font-size: 28rpx;
 		line-height: 40rpx;
 	}
 	&-total {

+ 16 - 16
h5_web/pages/basicTraining/onlineTrainingDetails/onlineTrainingDetails.scss

@@ -21,25 +21,25 @@ page {
 			
 			&-title {
 				color: #424242;
-				font-size: 36rpx;
-				font-weight: 500;
+				font-size: 42rpx;
+				font-weight: 600;
 			}
 			
 			&-progress {
 				padding: 26rpx 0;
 				color: #EF651F;
-				font-size: 26rpx;
+				font-size: 28rpx;
 			}
 			
 			&-teacher {
-				font-size: 32rpx;
+				font-size: 36rpx;
 				color: #424242;
 				margin-bottom: 22rpx;
 			}
 			
 			&-info {
 				color: #545454;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				line-height: 44rpx;
 			}
 		}
@@ -54,11 +54,11 @@ page {
 				justify-content: space-between;
 				align-items: center;
 				color: #424242;
-				font-size: 36rpx;
+				font-size: 38rpx;
 				view {
 					&:last-child {
 						color: #A3A3A3;
-						font-size: 24rpx;
+						font-size: 28rpx;
 					}
 				}
 			}
@@ -79,8 +79,8 @@ page {
 						&:last-child {
 							text-align: center;
 							margin-top: 10rpx;
-							color: #827F7F;
-							font-size: 24rpx;
+							color: #525252;
+							font-size: 26rpx;
 						}
 					}
 				}
@@ -90,7 +90,7 @@ page {
 							background: linear-gradient(168deg, #A5C8AC 0%, #709078 100%);
 						}
 						&:last-child {
-							color: #709078;
+							color: #525252;
 						}
 					}
 				}
@@ -120,12 +120,12 @@ page {
 				margin-bottom: 30rpx;
 				view {
 					&:first-child {
-						font-size: 36rpx;
+						font-size: 38rpx;
 						color: #424242;
 					}
 					&:last-child {
 						color: #8D8D8D;
-						font-size: 24rpx;
+						font-size: 28rpx;
 					}
 				}
 			}
@@ -145,19 +145,19 @@ page {
 					.right {
 						view {
 							line-height: 40rpx;
-							&:last-child {
+							&:first-child {
 								color: #3D3D3D;
-								font-size: 28prx;
+								font-size: 32rpx;
 							}
 							&:nth-child(2) {
-								font-size: 24rpx;
+								font-size: 28rpx;
 								color: #A5A5A5;
 								text {
 									margin-left: 10rpx;
 								}
 							}
 							&:last-child {
-								font-size: 24rpx;
+								font-size: 28rpx;
 								color: #6C6C6C;
 							}
 						}

+ 1 - 1
h5_web/pages/basicTraining/onlineTrainingDetails/onlineTrainingDetails.vue

@@ -58,7 +58,7 @@
 					<view class="right">
 						<view>{{ item.createBy }}</view>
 						<view>
-							<u-rate :count="5" size="24" disabled="" active-color="#C4C4C4" v-model="item.starLevel">
+							<u-rate :count="5" size="28" disabled="" active-color="#FFBC00" v-model="item.starLevel">
 							</u-rate>
 							<text>{{ item.createTime }}</text>
 						</view>

+ 8 - 8
h5_web/pages/businessDetails/businessDetails.scss

@@ -108,13 +108,13 @@
 			text-align: left;
 			.title {
 				color: #000;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 400;
 				margin-bottom: 10rpx;
 			}
 			.item {
 				color: #545454;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				line-height: 48rpx;
 				.address {
 					display: flex;
@@ -142,12 +142,12 @@
 			text-align: left;
 			.title {
 				color: #000;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 400;
 				margin-bottom: 10rpx;
 			}
 			.content {
-				font-size: 24rpx;
+				font-size: 28rpx;
 				color: #545454;
 				line-height: 40rpx;
 			}
@@ -163,7 +163,7 @@
 			text-align: left;
 			.title {
 				color: #000;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 400;
 				margin-bottom: 20rpx;
 			}
@@ -195,7 +195,7 @@
 			text-align: left;
 			.title {
 				color: #000;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 400;
 				margin-bottom: 16rpx;
 				border-bottom: solid 1px #9F9F9F;
@@ -224,7 +224,7 @@
 						}
 						.info {
 							view {
-								font-size: 26rpx;
+								font-size: 28rpx;
 								color: #9B9B9B;
 								line-height: 40rpx;
 								&:first-child {
@@ -238,7 +238,7 @@
 						display: flex;
 						flex-direction: column;
 						view {
-							font-size: 24rpx;
+							font-size: 26rpx;
 							text-align: right;
 							color: #BCBCBC;
 							&:first-child {

+ 2 - 2
h5_web/pages/cooperativeEnterprise/cooperativeEnterprise.scss

@@ -46,11 +46,11 @@
 					font-family: 'PingFangSC-Regular, PingFang SC;';
 					color: #000;
 					font-size: 32rpx;
-					font-weight: 400;
+					font-weight: 600;
 					.company {
 						display: flex;
 						font-size: 24rpx;
-						color: #9B9B9B;
+						color: #6F6F6F;
 						margin-top: 18rpx;
 						.icon {
 							margin-right: 83rpx;

+ 4 - 4
h5_web/pages/entrepreneurshipGuidelines/entrepreneurshipGuidelines.scss

@@ -12,13 +12,13 @@ page {
 			padding: 31rpx 32rpx;
 			margin-bottom: 20rpx;
 			&-title {
-				font-size: 32rpx;
+				font-size: 36rpx;
 				color: #000;
 				margin-bottom: 14rpx;
 			}
 			&-content {
 				color: #545454;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				margin-bottom: 14rpx;
 				overflow : hidden;
 				text-overflow: ellipsis;
@@ -31,10 +31,10 @@ page {
 				justify-content: space-between;
 				.right {
 					color: #9F9F9F;
-					font-size: 22rpx;
+					font-size: 26rpx;
 				}
 				.left {
-					font-size: 22rpx;
+					font-size: 26rpx;
 				}
 				.waiting {
 					color: #EF6622;

+ 6 - 5
h5_web/pages/entrepreneurshipGuidelines/planDetails/planDetails.vue

@@ -71,22 +71,22 @@
 	&-content {
 		&-title {
 			color: #050505;
-			font-size: 36rpx;
+			font-size: 38rpx;
 			margin-bottom: 18rpx;
 			font-weight: 600;
 		}
 		&-createtime {
 			color: #9F9F9F;
-			font-size: 24rpx;
+			font-size: 28rpx;
 			margin-bottom: 18rpx;
 		}
 		.reply {
 			color: #028DFE;
-			font-size: 22rpx;
+			font-size: 26rpx;
 		}
 		.waiting {
 			color: #EF6622;
-			font-size: 22rpx;
+			font-size: 26rpx;
 		}
 		&-description {
 			margin-top: 32rpx;
@@ -94,11 +94,12 @@
 			.title {
 				color: #3F3F3F;
 				font-weight: 600;
-				font-size: 30rpx;
+				font-size: 34rpx;
 				margin-bottom: 30rpx;
 			}
 			&-content {
 				color: #4D4D4D;
+				font-size: 28rpx;
 			}
 			&-pdf {
 				width: 100%;

+ 3 - 3
h5_web/pages/evaluationIntention/evaluationIntention.scss

@@ -7,12 +7,12 @@
 		margin-top: 40rpx;
 		view {
 			&:first-child {
-				font-size: 40rpx;
+				font-size: 44rpx;
 				color: #000;
 			}
 			&:last-child {
 				color: #9B9B9B;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				margin-top: 10rpx;
 			}
 		}
@@ -30,7 +30,7 @@
 		}
 		&-active {
 			color: #4C4C4C;
-			border-bottom: solid 1px #028DFE;
+			border-bottom: solid 2px #028DFE;
 		}
 	}
 	

+ 6 - 6
h5_web/pages/index/index.scss

@@ -124,10 +124,10 @@
       border-bottom: 1px solid rgba($color: #9F9F9F, $alpha: 0.2);
       &-item {
         margin-bottom: 17rpx;
-				font-size: 26rpx;
+				font-size: 28rpx;
 				align-items: end;
         .card-head-title {
-          font-size: 36rpx;
+          font-size: 38rpx;
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
           color: #000000;
@@ -143,9 +143,9 @@
         
         .news-text{
 					margin-right: 26rpx;
-          &-title{
+          &-title {
             margin-bottom: 20rpx;
-            font-size: 28rpx;
+            font-size: 30rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
             color: #000000;
@@ -155,7 +155,7 @@
             justify-content: space-between;
             
             view:first-child{
-              font-size: 24rpx;
+              font-size: 26rpx;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
               color: #8C8C8C;
@@ -164,7 +164,7 @@
             }
             
             view:last-child{
-              font-size: 24rpx;
+              font-size: 26rpx;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
               color: #8C8C8C;

+ 10 - 9
h5_web/pages/jobDetails/scss/jobDetails.scss

@@ -25,17 +25,17 @@ page{background-color: #f2f2f2;}
             margin-bottom: 12rpx;
             font-size: 46rpx;
             font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
+            font-weight: 700;
             color: #000000;
             line-height: 65rpx;
             letter-spacing: 2px;
           }
           
           view:last-child{
-            font-size: 36rpx;
+            font-size: 32rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #9B9B9B;
+            color: #525252;
             line-height: 50rpx;
             letter-spacing: 1px;
           }
@@ -51,6 +51,7 @@ page{background-color: #f2f2f2;}
 					.salary {
 						color: #EF651F;
 						font-size: 36rpx;
+						font-weight: 700;
 						margin-bottom: 30rpx;
 					}
         }
@@ -87,7 +88,7 @@ page{background-color: #f2f2f2;}
               
               view:first-child{
                 margin-bottom: 12rpx;
-                font-size: 32rpx;
+                font-size: 36rpx;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
                 color: #000000;
@@ -95,10 +96,10 @@ page{background-color: #f2f2f2;}
               }
               
               view:last-child{
-                font-size: 24rpx;
+                font-size: 28rpx;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
-                color: #9F9F9F;
+                color: #525252;
                 line-height: 33rpx;
               }
             }
@@ -126,10 +127,10 @@ page{background-color: #f2f2f2;}
             max-width: 80%;
             
             view:first-child{
-              font-size: 22rpx;
+              font-size: 28rpx;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
-              color: #9F9F9F;
+              color: #525252;
               line-height: 30rpx;
             }
           }
@@ -145,7 +146,7 @@ page{background-color: #f2f2f2;}
             
             &-text{
               text-align: right;
-              font-size: 22rpx;
+              font-size: 28rpx;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
               color: #709078;

+ 7 - 6
h5_web/pages/mine/mine.scss

@@ -42,8 +42,9 @@
 				
 				.name {
 					color: #fff;
-					font-size: 40rpx;
+					font-size: 44rpx;
 					font-family: 'PingFangSC-Medium, PingFang SC';
+					font-weight: 700;
 				}
 			}
 			
@@ -61,7 +62,7 @@
 					&:first-child {
 						font-size: 22rpx;
 						color: #fff;
-						opacity: 0.7;
+						line-height: 24rpx;
 					}
 					&:nth-child(2) {
 						font-size: 60rpx;
@@ -78,7 +79,7 @@
 			justify-content: space-between;
 			width: calc(100% - 220rpx);
 			margin: 50rpx auto;
-			font-size: 26rpx;
+			font-size: 28rpx;
 			color: rgba(255, 255, 255, .6);
 			&-item {
 				display: flex;
@@ -88,7 +89,7 @@
 					background-color: rgba(255, 255, 255, 0.2);
 					border-radius: 30rpx;
 					margin-left: 10rpx;
-					font-size: 20rpx;
+					font-size: 24rpx;
 				}
 				.had {
 					width: 134rpx;
@@ -96,8 +97,8 @@
 					line-height: 72rpx;
 					text-align: right;
 					color: #684B06;
-					font-size: 20rpx;
-					padding-right: 18rpx;
+					font-size: 24rpx;
+					padding-right: 12rpx;
 				}
 				.certified {
 					background: url(../../static/img/certified-icon.png) no-repeat center center;

+ 7 - 7
h5_web/pages/mine/skillsTraining/skillsTraining.scss

@@ -23,25 +23,25 @@ page {
 				margin-right: 22rpx;
 			}
 			.right {
-				color: #9A9A9A;
-				font-size: 24rpx;
+				color: #3E3E3E;
+				font-size: 28rpx;
 				line-height: 45rpx;
 				width: 100%;
 				.name {
 					color: #3E3E3E;
-					font-size: 34rpx;
+					font-size: 36rpx;
 					font-weight: 500;
 				}
 				.school {
-					color: #525252;
-					font-size: 24rpx;
+					color: #3E3E3E;
+					font-size: 28rpx;
 				}
 				.flex {
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					font-size: 24rpx;
-					color: #A2A2A2;
+					font-size: 28rpx;
+					color: #3E3E3E;
 				}
 			}
 		}

+ 1 - 1
h5_web/pages/mine/skillsTraining/skillsTraining.vue

@@ -22,7 +22,7 @@
 						<view class="school">培训学校:{{ item.schoolName }}</view>
 						<view class="flex">
 							<view class="rate">
-								难度<u-rate :count="5" v-model="item.difficult" inactive-color="#EF651F" active-color="#EF651F" disabled size="24" gutter="6"></u-rate>
+								难度<u-rate :count="5" v-model="item.difficult" inactive-color="#EF651F" active-color="#EF651F" disabled size="30" gutter="6"></u-rate>
 							</view>
 							<!-- <view>报名人数:{{ item.people }}</view> -->
 						</view>

+ 6 - 5
h5_web/pages/mine/skillsTraining/skillsTrainingDetails/skillsTrainingDetails.scss

@@ -43,7 +43,8 @@ page {
 					text-align: center;
 					background-color: #DDB100;
 					font-size: 22rpx;
-					color: rgba($color: #fff, $alpha: 0.7);
+					font-weight: 700;
+					color: #fff;
 					border-bottom-left-radius: 10rpx;
 					border-bottom-right-radius: 10rpx;
 					position: absolute;
@@ -51,14 +52,14 @@ page {
 				}
 			}
 			.right {
-				font-size: 24rpx;
-				color: #A2A2A2;
+				font-size: 28rpx;
+				color: #3E3E3E;
 				line-height: 40rpx;
 				.name {
 					display: flex;
 					align-items: center;
 					color: #3D5D4C;
-					font-size: 34rpx;
+					font-size: 36rpx;
 					font-weight: 500;
 					margin-bottom: 10rpx;
 					.tip {
@@ -107,7 +108,7 @@ page {
 					align-items: center;
 					border: solid 1px #D3D3D3;
 					border-radius: 10rpx;
-					font-size: 24rpx;
+					font-size: 28rpx;
 					color: #555555;
 					.name {
 						margin: 0 34rpx 0 20rpx;

+ 2 - 2
h5_web/pages/mine/skillsTraining/skillsTrainingDetails/skillsTrainingDetails.vue

@@ -23,10 +23,10 @@
 					<view>培训学校:{{ details.schoolName }}</view>
 					<view>培训导师:{{ details.teacherName }}</view>
 					<view class="hardly">
-						难度<u-rate :count="5" v-model="details.difficult" size="24" active-color="#EF651F"
+						难度<u-rate :count="5" v-model="details.difficult" size="30" active-color="#EF651F"
 							inactive-color="#EF651F" disabled></u-rate>
-						报名人数:10/20
 					</view>
+					<view class="hardly">报名人数:10/20</view>
 				</view>
 			</view>
 			<view class="details-content-course">

+ 12 - 10
h5_web/pages/myDelivery/myDelivery.scss

@@ -27,18 +27,19 @@
 					}
 				}
 				&-info {
-					font-size: 22rpx;
+					font-size: 26rpx;
 					font-family: 'Microsoft YaHei';
-					color: #9B9B9B;
+					color: #525252;
 					line-height: 50rpx;
 					font-weight: 400;
 					view {
 						&:first-child {
 							color: #000;
-							font-size: 30rpx;
+							font-weight: 600;
+							font-size: 36rpx;
 						}
 						&:last-child {
-							color: #bbb;
+							color: #525252;
 						}
 					}
 				}
@@ -47,19 +48,20 @@
 				display: flex;
 				flex-direction: column;
 				view {
-					font-size: 22rpx;
+					font-size: 26rpx;
 					font-family: 'Microsoft YaHei';
-					color: #BCBCBC;
+					color: #525252;
 					font-weight: 400;
 				}
 				.salary {
+					font-size: 28rpx;
 					color: #EE5A10;
-					font-weight: 500;
-					margin-bottom: 40rpx;
+					font-weight: 700;
+					margin-bottom: 70rpx;
 				}
 				.off-the-shelf {
-					color: #BCBCBC;
-					margin-bottom: 40rpx;
+					color: #525252;
+					margin-bottom: 70rpx;
 				}
 			}
 		}

+ 20 - 14
h5_web/pages/myInterview/myInterview.scss

@@ -14,28 +14,28 @@
 			margin-bottom: 20rpx;
 			
 			&-title {
-				font-size: 32rpx;
+				font-size: 36rpx;
 				color: #000;
 				display: flex;
 				align-items: center;
 				margin-bottom: 20rpx;
 				
 				image {
-					width: 24rpx;
-					height: 24rpx;
+					width: 30rpx;
+					height: 30rpx;
 					margin-left: 10rpx;
 				}
 			}
 			
 			&-date {
 				color: #028DFE;
-				font-size: 50rpx;
-				font-weight: 600;
+				font-size: 40rpx;
+				font-weight: 700;
 				line-height: 70rpx;
 			}
 			
 			&-way {
-				font-size: 22rpx;
+				font-size: 26rpx;
 				color: #9B9B9B;
 				margin-bottom: 22rpx;
 			}
@@ -46,7 +46,7 @@
 				
 				.left {
 					display: flex;
-					align-items: center;
+					// align-items: center;
 					
 					image {
 						width: 98rpx;
@@ -56,13 +56,14 @@
 					}
 					
 					.info {
-						color: #9B9B9B;
-						font-size: 24rpx;
-						line-height: 40rpx;
+						color: #525252;
+						font-size: 28rpx;
+						line-height: 50rpx;
 						view {
 							&:first-child {
 								color: #000;
-								font-size: 32rpx;
+								font-size: 36rpx;
+								margin-top: -10rpx;
 							}
 						}
 					}
@@ -70,12 +71,14 @@
 				
 				.right {
 					view {
-						font-size: 24rpx;
-						color: #9B9B9B;
+						font-size: 28rpx;
+						color: #525252;
 						text-align: right;
 						&:first-child {
 							color: #EF651F;
-							margin-bottom: 12rpx;
+							font-size: 28rpx;
+							font-weight: 700;
+							margin-bottom: 8rpx;
 						}
 					}
 				}
@@ -120,4 +123,7 @@
 			}
 		}
 	}
+}
+.disable {
+	color: #a1a1ac;
 }

+ 1 - 1
h5_web/pages/myInterview/myInterview.vue

@@ -24,7 +24,7 @@
 							<image src="../../static/img/shijian.png" />
 						</view>
 					</view>
-					<view class="interview-list-item-date">{{ item.interviewTime }}</view>
+					<view class="interview-list-item-date" :class="{'disable': item.status == 40 || item.status == 80}">{{ item.interviewTime }}</view>
 					<view class="interview-list-item-way">{{ item.interviewAddress }}</view>
 					<view class="interview-list-item-position">
 						<view class="left">

+ 12 - 12
h5_web/pages/myResume/myResume.scss

@@ -11,7 +11,7 @@
 		&-left {
 			.name {
 				font-size: 50rpx;
-				font-weight: 500;
+				font-weight: 700;
 				color: #4C4C4C;
 				display: flex;
 				align-items: center;
@@ -25,7 +25,7 @@
 				display: flex;
 				margin-top: 20rpx;
 				color: #4C4C4C;
-				font-size: 26rpx;
+				font-size: 28rpx;
 				.position {
 					color: #FF6901;
 					margin-left: 10rpx;
@@ -40,12 +40,12 @@
 		border-bottom: solid 1px #DBDBDB;
 		padding: 38rpx 0;
 		&-left {
-			font-size: 26rpx;
+			font-size: 28rpx;
 			color: #4C4C4C;
 			line-height: 50rpx;
 			font-weight: 400;
 			.title {
-				font-size: 34rpx;
+				font-size: 36rpx;
 				color: #000000;
 			}
 		}
@@ -64,12 +64,12 @@
 		padding: 38rpx 0;
 		
 		&-left {
-			font-size: 26rpx;
+			font-size: 28rpx;
 			color: #4C4C4C;
 			line-height: 50rpx;
 			font-weight: 400;
 			.title {
-				font-size: 34rpx;
+				font-size: 36rpx;
 				color: #000000;
 			}
 			.supple {
@@ -92,11 +92,11 @@
 		
 		&-left {
 			.title {
-				font-size: 34rpx;
+				font-size: 36rpx;
 				color: #000000;
 			}
 			.supple {
-				font-size: 26rpx;
+				font-size: 28rpx;
 				color: #7B7B7B;
 				line-height: 50rpx;
 			}
@@ -110,7 +110,7 @@
 		&-info {
 			.rsei-box {
 				color: #666666;
-				font-size: 26rpx;
+				font-size: 28rpx;
 				margin-top: 20rpx;
 				line-height: 40rpx;
 			}
@@ -118,7 +118,7 @@
 				color: #2a82e4;
 				text-align: center;
 				margin-top: 30rpx;
-				font-size: 26rpx;
+				font-size: 28rpx;
 			}
 		}
 	}
@@ -145,7 +145,7 @@
 			.rwel-item {
 				display: flex;
 				justify-content: space-between;
-				margin-bottom: 26rpx;
+				margin-bottom: 28rpx;
 				&-left {
 					font-size: 24rpx;
 					color: #7B7B7B;
@@ -163,7 +163,7 @@
 				&-right {
 					display: flex;
 					color: #7B7B7B;
-					font-size: 24rpx;
+					font-size: 26rpx;
 					view {
 						&:first-child {
 							margin-right: 10rpx;

+ 3 - 2
h5_web/pages/newsDetails/newsDetails.vue

@@ -75,19 +75,20 @@
 			padding-bottom: 22rpx;
 			&-title {
 				color: #000;
-				font-size: 36rpx;
+				font-size: 40rpx;
 			}
 			&-subtitle {
 				margin-top: 20rpx;
 				display: flex;
 				justify-content: space-between;
 				color: #6F6F6F;
-				font-size: 24rpx;
+				font-size: 26rpx;
 			}
 		}
 		&-content {
 			padding: 18rpx 0;
 			line-height: 50rpx;
+			font-size: 28rpx;
 		}
 	}
 </style>

+ 1 - 1
h5_web/pages/policyInfo/policyInfoDetails.vue

@@ -85,7 +85,7 @@
 				display: flex;
 				justify-content: space-between;
 				color: #6F6F6F;
-				font-size: 20rpx;
+				font-size: 24rpx;
 			}
 		}
 		&-content {

+ 1 - 1
h5_web/pages/professionalDetails/professionalDetails.vue

@@ -83,7 +83,7 @@
 	}
 	&-total {
 		color: #9B9B9B;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		margin-top: 60rpx;
 	}
 }

+ 9 - 9
h5_web/pages/progressiveIntegral/progressiveIntegral.scss

@@ -15,7 +15,7 @@
 		// margin-top: -472rpx;
 		&-header {
 			text-align: center;
-			font-size: 22rpx;
+			font-size: 28rpx;
 			color: rgba($color: #fff, $alpha: 0.5);
 			position: relative;
 			&-grade {
@@ -29,8 +29,8 @@
 				align-items: center;
 				justify-content: center;
 				.point {
-					width: 16rpx;
-					height: 16rpx;
+					width: 20rpx;
+					height: 20rpx;
 					display: flex;
 					justify-content: center;
 					align-items: center;
@@ -75,8 +75,8 @@
 					display: flex;
 					align-items: center;
 					text {
-						font-size: 24rpx;
-						color: rgba($color: #fff, $alpha: 0.5);
+						font-size: 28rpx;
+						color: #fff;
 						margin-left: 10rpx;
 					}
 				}
@@ -91,7 +91,7 @@
 			padding: 32rpx 60rpx;
 			text-align: center;
 			color: #393939;
-			font-size: 30rpx;
+			font-size: 34rpx;
 			&-header {
 				margin-bottom: 20rpx;
 			}
@@ -102,7 +102,7 @@
 			&-item {
 				text-align: center;
 				color: #393939;
-				font-size: 26rpx;
+				font-size: 28rpx;
 				image {
 					width: 94rpx;
 					height: 94rpx;
@@ -127,8 +127,8 @@
 				.left {
 					view {
 						&:last-child {
-							color: #B2B2B2;
-							font-size: 24rpx;
+							color: #525252;
+							font-size: 26rpx;
 							margin-top: 10rpx;
 						}
 					}

+ 38 - 13
h5_web/pages/progressiveIntegral/progressiveIntegral.vue

@@ -1,18 +1,15 @@
 <!-- 进步积分 -->
 <template>
 	<view class="integral">
-		<z-paging
-			ref="paging"
-			v-model="integralList"
-			@query="queryList"
-		>
+		<z-paging ref="paging" v-model="integralList" @query="queryList">
 			<!-- 导航栏 -->
-			<u-navbar class="evaluate-intention-bar" back-text="" title="进步积分" :background="background" title-color="#fff" back-icon-color="#fff" slot="top">
+			<u-navbar class="evaluate-intention-bar" back-text="" title="进步积分" :background="background"
+				title-color="#fff" back-icon-color="#fff" slot="top">
 			</u-navbar>
-			
+
 			<!-- 背景 -->
 			<view class="integral-bg" slot="top"></view>
-			
+
 			<!-- 内容 -->
 			<view class="integral-content" style="margin-top: -472rpx;" slot="top">
 				<view class="integral-content-header">
@@ -26,9 +23,13 @@
 							<view></view>
 						</view>
 					</view>
-					<view class="integral-content-header-rules" @click="jumpPage('/pages/integralRule/integralRule')">积分规则<u-icon name="arrow-right"/></view>
+					<view class="integral-content-header-rules" @click="jumpPage('/pages/integralRule/integralRule')">
+						积分规则
+						<u-icon name="arrow-right" />
+					</view>
 					<view class="integral-content-header-behavior">
-						<view class="item" v-for="(item, index) in behaviorList" :key="index">{{ item.count }}<text>个{{ item.type == 1 ? '加' : '减' }}分行为</text></view>
+						<view class="item" v-for="(item, index) in behaviorList" :key="index">
+							{{ item.count }}<text>个{{ item.type == 1 ? '加' : '减' }}分行为</text></view>
 						<!-- <view class="item">0<text>个减分行为</text></view> -->
 					</view>
 				</view>
@@ -106,7 +107,28 @@
 			getIntegralTotal() {
 				this.$u.api.mine.totalCount().then(res => {
 					if (res.code === 200) {
-						this.behaviorList = res.data;
+						let list = []
+						res.data.forEach(item => {
+							if (item.type == 0) {
+								const obj = {
+									type: 1, count: 0, total: 0
+								}
+								if (res.data.length == 1) {
+									list.push(obj)
+								}
+							} else  if (item.type == 1) {
+								const obj = {
+									type: 0, count: 0, total: 0
+								}
+								if (res.data.length == 1) {
+									list.push(obj)
+								}
+							}
+						});
+						if (list.length == 1) {
+							list = list.concat(res.data)
+						}
+						this.behaviorList = list
 						// 计算总分
 						let total = 0
 						this.totalCount = res.data.reduce((total, item) => total + item.total, 0)
@@ -127,7 +149,10 @@
 			 * 积分列表
 			 */
 			getintegralList(pageNum, pageSize) {
-				this.$u.api.mine.integralList({pageNum, pageSize}).then(res => {
+				this.$u.api.mine.integralList({
+					pageNum,
+					pageSize
+				}).then(res => {
 					if (res.code === 200) {
 						this.$refs.paging.complete(res.rows);
 					} else {
@@ -155,5 +180,5 @@
 </script>
 
 <style lang="scss" scoped>
-@import './progressiveIntegral.scss';
+	@import './progressiveIntegral.scss';
 </style>

+ 1 - 1
h5_web/pages/recruitment/recruitment.vue

@@ -98,7 +98,7 @@
 							<view>{{item.companyName}}</view>
 						</view>
 						<view class="dataarea-content-right">
-							<view>{{item.lowestSalary}}k~{{item.highestSalary}}k</view>
+							<view>{{item.lowestSalary}}K~{{item.highestSalary}}K</view>
 							<view>&nbsp;</view>
 							<view>{{$u.timeFormat(new Date(item.createTime).getTime(), 'yyyy-mm-dd')}}</view>
 						</view>

+ 8 - 8
h5_web/pages/recruitment/scss/recruitment.scss

@@ -137,19 +137,19 @@ page{background-color: #f2f2f2;}
           
           .content{
             margin-bottom: 9rpx;
-            font-size: 22rpx;
+            font-size: 24rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #9B9B9B;
+            color: #6F6F6F;
             line-height: 30rpx;
             letter-spacing: 1px;
           }
           
           view:last-child{
-            font-size: 22rpx;
+            font-size: 24rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #BBBBBB;
+            color: #6F6F6F;
             line-height: 30rpx;
             letter-spacing: 1px;
           }
@@ -159,9 +159,9 @@ page{background-color: #f2f2f2;}
           view:first-child{
             margin-bottom: 55rpx;
             text-align: right;
-            font-size: 22rpx;
+            font-size: 26rpx;
             font-family: PingFangSC-Medium, PingFang SC;
-            font-weight: 500;
+            font-weight: 700;
             color: #EE5A10;
             line-height: 30rpx;
             letter-spacing: 1px;
@@ -169,10 +169,10 @@ page{background-color: #f2f2f2;}
           
           view:last-child{
             text-align: right;
-            font-size: 22rpx;
+            font-size: 24rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #BCBCBC;
+            color: #6F6F6F;
             line-height: 30rpx;
             letter-spacing: 1px;
           }

+ 7 - 7
h5_web/pages/schoolDetails/schoolDetails.scss

@@ -84,13 +84,13 @@
 			text-align: left;
 			.title {
 				color: #000;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 400;
 				margin-bottom: 10rpx;
 			}
 			.item {
 				color: #545454;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				line-height: 48rpx;
 				.home {
 					display: flex;
@@ -126,12 +126,12 @@
 			text-align: left;
 			.title {
 				color: #000;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 400;
 				margin-bottom: 10rpx;
 			}
 			.content {
-				font-size: 24rpx;
+				font-size: 28rpx;
 				color: #545454;
 				line-height: 40rpx;
 			}
@@ -147,7 +147,7 @@
 			text-align: left;
 			.title {
 				color: #000;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 400;
 				margin-bottom: 20rpx;
 			}
@@ -177,7 +177,7 @@
 			text-align: left;
 			.title {
 				color: #000;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 400;
 				margin-bottom: 20rpx;
 			}
@@ -188,7 +188,7 @@
 					border-bottom: dashed 1px #DBDBDB;
 					padding: 20rpx 0;
 					color: #545454;
-					font-size: 24rpx;
+					font-size: 28rpx;
 					font-family: 'PingFangSC-Regular, PingFang SC';
 				}
 			}

+ 7 - 6
h5_web/pages/schools/schools.scss

@@ -24,8 +24,8 @@
 				display: flex;
 				align-items: center;
 				.image {
-					width: 98rpx;
-					height: 98rpx;
+					width: 112rpx;
+					height: 112rpx;
 					border: solid 1px #E0E0E0;
 					display: flex;
 					justify-content: center;
@@ -33,17 +33,18 @@
 					margin-right: 22rpx;
 					border-radius: 10rpx;
 					image {
-						width: 78rpx;
-						height: 78rpx;
+						width: 112rpx;
+						height: 122rpx;
 					}
 				}
 				.title {
-					font-size: 24rpx;
-					color: #9B9B9B;
+					font-size: 26rpx;
+					color: #6f6f6f;
 					.name {
 						font-size: 32rpx;
 						color: #000;
 						margin-bottom: 18rpx;
+						font-weight: 600;
 					}
 					.grade {
 						display: flex;

+ 2 - 2
h5_web/pages/schools/schools.vue

@@ -11,9 +11,9 @@
 				<view class="school-list-item" v-for="(item, index) in schoolList" :key="index" @click="recordBrowseTotal(item)">
 					<view class="school-list-item-left">
 						<view class="image">
-							<u-image :src="item.schoolLogoUrl" width="80" height="80" border-radius="10" mode="aspectFill">
+							<u-image :src="item.schoolLogoUrl" width="112" height="112" border-radius="10" mode="aspectFill">
 								<view slot="error">
-									<u-image src="../../static/img/default-company.jpg" width="80" height="80" border-radius="10" mode="aspectFill"/>
+									<u-image src="../../static/img/default-company.jpg" width="122" height="112" border-radius="10" mode="aspectFill"/>
 								</view>
 							</u-image>
 						</view>

+ 16 - 16
h5_web/pages/skillsTraining/courseDetailed/courseDetailed.scss

@@ -21,25 +21,25 @@ page {
 			
 			&-title {
 				color: #424242;
-				font-size: 36rpx;
-				font-weight: 500;
+				font-size: 42rpx;
+				font-weight: 600;
 			}
 			
 			&-progress {
 				padding: 26rpx 0;
 				color: #EF651F;
-				font-size: 26rpx;
+				font-size: 28rpx;
 			}
 			
 			&-teacher {
-				font-size: 32rpx;
+				font-size: 36rpx;
 				color: #424242;
 				margin-bottom: 22rpx;
 			}
 			
 			&-info {
 				color: #545454;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				line-height: 44rpx;
 			}
 		}
@@ -54,11 +54,11 @@ page {
 				justify-content: space-between;
 				align-items: center;
 				color: #424242;
-				font-size: 36rpx;
+				font-size: 38rpx;
 				view {
 					&:last-child {
 						color: #A3A3A3;
-						font-size: 24rpx;
+						font-size: 28rpx;
 					}
 				}
 			}
@@ -79,8 +79,8 @@ page {
 						&:last-child {
 							text-align: center;
 							margin-top: 10rpx;
-							color: #827F7F;
-							font-size: 24rpx;
+							color: #525252;
+							font-size: 26rpx;
 						}
 					}
 				}
@@ -90,7 +90,7 @@ page {
 							background: linear-gradient(168deg, #A5C8AC 0%, #709078 100%);
 						}
 						&:last-child {
-							color: #709078;
+							color: #525252;
 						}
 					}
 				}
@@ -120,12 +120,12 @@ page {
 				margin-bottom: 30rpx;
 				view {
 					&:first-child {
-						font-size: 36rpx;
+						font-size: 38rpx;
 						color: #424242;
 					}
 					&:last-child {
 						color: #8D8D8D;
-						font-size: 24rpx;
+						font-size: 28rpx;
 					}
 				}
 			}
@@ -145,19 +145,19 @@ page {
 					.right {
 						view {
 							line-height: 40rpx;
-							&:last-child {
+							&:first-child {
 								color: #3D3D3D;
-								font-size: 28prx;
+								font-size: 32rpx;
 							}
 							&:nth-child(2) {
-								font-size: 24rpx;
+								font-size: 28rpx;
 								color: #A5A5A5;
 								text {
 									margin-left: 10rpx;
 								}
 							}
 							&:last-child {
-								font-size: 24rpx;
+								font-size: 28rpx;
 								color: #6C6C6C;
 							}
 						}

+ 1 - 1
h5_web/pages/skillsTraining/courseDetailed/courseDetailed.vue

@@ -58,7 +58,7 @@
 					<view class="right">
 						<view>{{ item.createBy }}</view>
 						<view>
-							<u-rate :count="5" size="24" disabled="" active-color="#C4C4C4" v-model="item.starLevel">
+							<u-rate :count="5" size="28" disabled="" active-color="#FFBC00" v-model="item.starLevel">
 							</u-rate>
 							<text>{{ item.createTime }}</text>
 						</view>

+ 14 - 13
h5_web/pages/skillsTraining/skillsPackage/skillsPackage.scss

@@ -43,7 +43,8 @@ page {
 					text-align: center;
 					background-color: #DDB100;
 					font-size: 22rpx;
-					color: rgba($color: #fff, $alpha: 0.7);
+					font-weight: 700;
+					color: #fff;
 					border-bottom-left-radius: 10rpx;
 					border-bottom-right-radius: 10rpx;
 					position: absolute;
@@ -52,14 +53,14 @@ page {
 			}
 			.right {
 				width: calc(100% - 226rpx);
-				font-size: 24rpx;
-				color: #A2A2A2;
+				font-size: 28rpx;
+				color: #545454;
 				line-height: 40rpx;
 				.name {
 					display: flex;
 					align-items: center;
 					color: #3D5D4C;
-					font-size: 34rpx;
+					font-size: 36rpx;
 					font-weight: 500;
 					margin-bottom: 10rpx;
 					.tip {
@@ -91,14 +92,14 @@ page {
 					justify-content: space-between;
 				}
 				.status {
-					width: 100%;
-					height: 44rpx;
-					line-height: 44rpx;
-					text-align: center;
 					background-color: #709078;
-					color: rgba($color: #fff, $alpha: 0.7);
-					font-size: 24rpx;
+					width: 120rpx;
+					height: 50rpx;
+					line-height: 50rpx;
+					text-align: center;
 					border-radius: 40rpx;
+					font-size: 24rpx;
+					color: #fff;
 					margin-top: 20rpx;
 				}
 			}
@@ -118,12 +119,12 @@ page {
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					font-size: 26rpx;
+					font-size: 28rpx;
 					color: #9D9D9D;
 					padding-bottom: 34rpx;
 					text {
 						color: #424242;
-						font-size: 36rpx;
+						font-size: 38rpx;
 						margin-right: 22rpx;
 					}
 				}
@@ -154,7 +155,7 @@ page {
 					padding-bottom: 34rpx;
 					text {
 						color: #424242;
-						font-size: 36rpx;
+						font-size: 38rpx;
 						margin-right: 22rpx;
 					}
 				}

+ 1 - 1
h5_web/pages/skillsTraining/skillsPackage/skillsPackage.vue

@@ -29,7 +29,7 @@
 					<view class="hardly">培训导师:{{ details.teacherName }}</view>
 					<view class="hardly">
 						<view>
-							难度<u-rate :count="5" v-model="details.difficult" size="24" disabled=""
+							难度<u-rate :count="5" v-model="details.difficult" size="30" disabled=""
 								active-color="#EF651F" inactive-color="#EF651F"></u-rate>
 						</view>
 					</view>

+ 19 - 14
h5_web/pages/skillsTraining/skillsTraining.scss

@@ -34,14 +34,14 @@ page {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		color: rgba($color: #fff, $alpha: 0.6);
+		color: #fff;
 		font-size: 30rpx;
 		
 		&-left {
 			view {
 				&:first-child {
 					font-size: 40rpx;
-					font-weight: 500;
+					font-weight: 700;
 					margin-bottom: 6rpx;
 					color: rgba($color: #fff, $alpha: 0.9);
 				}
@@ -65,7 +65,7 @@ page {
 				}
 				&:last-child {
 					color: #A3A3A3;
-					font-size: 24rpx;
+					font-size: 26rpx;
 				}
 			}
 		}
@@ -92,18 +92,18 @@ page {
 						width: calc(100% - 226rpx);
 						view {
 							&:first-child {
-								font-size: 34rpx;
+								font-size: 36rpx;
 								color: #101010;
 								font-weight: 500;
 								margin-bottom: 12rpx;
 							}
 							&:nth-child(2) {
-								font-size: 24rpx;
+								font-size: 28rpx;
 								color: #525252;
 							}
 							&:nth-child(3) {
-								font-size: 24rpx;
-								color: #9A9A9A;
+								font-size: 28rpx;
+								color: #525252;
 								margin-top: 8rpx;
 								white-space: nowrap;/* 规定文本是否折行 */  
 								overflow: hidden;/* 规定超出内容宽度的元素隐藏 */
@@ -141,10 +141,10 @@ page {
 					color: #424242;
 					font-size: 36rpx;
 				}
-				&:last-child {
-					color: #A3A3A3;
-					font-size: 24rpx;
-				}
+				// &:last-child {
+				// 	color: #A3A3A3;
+				// 	font-size: 24rpx;
+				// }
 			}
 		}
 		
@@ -162,15 +162,20 @@ page {
 				&:nth-child(2n) {
 					margin-right: 0;
 				}
+				.border-1 {
+					border: solid 1px #d0d0d0;
+					border-radius: 12rpx;
+					margin-right: -2rpx;
+				}
 				view {
 					&:nth-child(2) {
 						color: #3F3F3F;
-						font-size: 28rpx;
+						font-size: 32rpx;
 						margin: 12rpx 0 8rpx;
 					}
 					&:last-child {
-						font-size: 22rpx;
-						color: #A2A2A2;
+						font-size: 28rpx;
+						color: #525252;
 					}
 				}
 			}

+ 1 - 1
h5_web/pages/skillsTraining/skillsTraining.vue

@@ -70,7 +70,7 @@
 			<view class="training-package-list">
 				<view class="training-package-list-item" v-for="(item, index) in packageList" :key="index"
 					@click="recordBrowseTotal(item)">
-					<view>
+					<view class="border-1">
 						<u-image :src="item.img" mode="aspectFill" border-radius="10" height="190" width="300">
 							<view slot="error">
 								<u-image src="../../static/img/default-company.jpg" height="190" width="300" border-radius="10" mode="aspectFill"/>

+ 5 - 3
h5_web/pages/skillsTraining/skillsTrainingCourse/skillsTrainingCourse.scss

@@ -18,14 +18,16 @@ page {
 			margin-bottom: 20rpx;
 			.left {
 				margin-right: 22rpx;
+				border: solid 1px #b6b6b6;
+				border-radius: 10rpx;
 			}
 			.right {
 				view {
-					color: #9A9A9A;
-					font-size: 24rpx;
+					color: #525252;
+					font-size: 28rpx;
 					line-height: 50rpx;
 					&:first-child {
-						font-size: 30rpx;
+						font-size: 36rpx;
 						color: #0B0B0B;
 					}
 				}

+ 17 - 15
h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.scss

@@ -30,13 +30,14 @@
 				
 				.name {
 					display: flex;
-					align-items: center;
+					// align-items: ;
 					// justify-content: space-between;
 					view {
 						&:first-child {
 							background: linear-gradient(153deg, #F89E42, #FF7833);
-							font-size: 20rpx;
-							width: 100rpx;
+							font-size: 22rpx;
+							width: 70rpx;
+							height: 40rpx;
 							padding: 4rpx 0;
 							text-align: center;
 							border-radius: 20rpx;
@@ -50,7 +51,8 @@
 						}
 						&:last-child {
 							color: #585858;
-							font-size: 26rpx;
+							font-size: 34rpx;
+							margin-top: -10rpx;
 						}
 					}
 				}
@@ -59,10 +61,10 @@
 					// display: flex;
 					// justify-content: space-between;
 					// align-items: center;
-					font-size: 24rpx;
+					font-size: 28rpx;
 					margin-top: 18rpx;
 					margin-bottom: 20rpx;
-					color: #A2A2A2;
+					color: #525252;
 				}
 				
 				.price {
@@ -99,11 +101,11 @@
 					line-height: 34rpx;
 					margin-bottom: 20rpx;
 					view {
-						font-size: 26rpx;
+						font-size: 28rpx;
 						color: #9D9D9D;
 						text {
 							color: #424242;
-							font-size: 36rpx;
+							font-size: 38rpx;
 							margin-right: 22rpx;
 						}
 					}
@@ -117,11 +119,11 @@
 						width: 50%!important;
 						.classes-name {
 							color: #2E2E2E;
-							font-size: 26rpx;
+							font-size: 28rpx;
 							margin-top: 20rpx;
 						}
 						.classes-teacher {
-							font-size: 24rpx;
+							font-size: 26rpx;
 							color: #818181;
 							margin-top: 10rpx;
 						}
@@ -132,18 +134,18 @@
 			&-introduction {
 				margin-top: 32rpx;
 				.title {
-					font-size: 26rpx;
+					font-size: 28rpx;
 					color: #9D9D9D;
 					margin-bottom: 14rpx;
 					text {
-						color: #424242;
-						font-size: 36rpx;
+						color: #525252;
+						font-size: 38rpx;
 						margin-right: 22rpx;
 					}
 				}
 				.content {
-					font-size: 24rpx;
-					color: #545454;
+					font-size: 28rpx;
+					color: #525252;
 					line-height: 50rpx;
 				}
 			}

+ 2 - 2
h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.vue

@@ -10,7 +10,7 @@
 			<!-- 专业详情 -->
 			<view class="professional-content-info">
 				<view class="professional-content-info-left">
-					<u-image src="../../../static/img/skill-工业机器人系统运维员.png" width="198" height="220" border-radius="10"/>
+					<u-image :src="details.img" width="198" height="220" border-radius="10"/>
 				</view>
 				<view class="professional-content-info-right">
 					<view class="name">
@@ -19,7 +19,7 @@
 						<!-- <view>(630601)</view> -->
 					</view>
 					<view class="study">
-						难度 <u-rate :count="5" v-model="details.difficult" active-color="#EF651F" disabled size="24" :gutter="4"/>
+						难度 <u-rate :count="5" v-model="details.difficult" active-color="#EF651F" disabled size="30" :gutter="4"/>
 					</view>
 					<view class="study">
 						学习时间:{{ details.cycle }}年

+ 9 - 4
h5_web/pages/upgrade/upgrade/upgrade.scss

@@ -96,7 +96,7 @@
 			&-hot {
 				margin-top: 36rpx;
 				.title {
-					font-size: 36rpx;
+					font-size: 38rpx;
 					color: #424242;
 					margin-bottom: 24rpx;
 				}
@@ -106,7 +106,7 @@
 					justify-content: space-between;
 					.item {
 						width: calc(50% - 11rpx);
-						font-size: 30rpx;
+						font-size: 32rpx;
 						color: #3F3F3F;
 						margin-bottom: 36rpx;
 						.image {
@@ -116,9 +116,14 @@
 							border-radius: 10rpx;
 						}
 						view {
+							&:nth-child(2) {
+								white-space: nowrap;/* 规定文本是否折行 */  
+								overflow: hidden;/* 规定超出内容宽度的元素隐藏 */
+								text-overflow: ellipsis;
+							}
 							&:last-child {
-								font-size: 24rpx;
-								color: #A2A2A2;
+								font-size: 26rpx;
+								color: #525252;
 								margin-top: 10rpx;
 							}
 						}

+ 2 - 2
h5_web/pages/upgrade/upgradeCourse/upgradeCourse.scss

@@ -22,10 +22,10 @@ page {
 			.right {
 				view {
 					color: #9A9A9A;
-					font-size: 24rpx;
+					font-size: 28rpx;
 					line-height: 50rpx;
 					&:first-child {
-						font-size: 30rpx;
+						font-size: 34rpx;
 						color: #0B0B0B;
 					}
 				}

+ 1 - 1
h5_web/uview-ui/components/u-cell-item/u-cell-item.vue

@@ -227,7 +227,7 @@ export default {
 }
 
 .u-cell_title {
-	font-size: 28rpx;
+	font-size: 30rpx;
 }
 
 .u-cell__left-icon-wrap {

+ 1 - 1
h5_web/uview-ui/components/u-form-item/u-form-item.vue

@@ -352,7 +352,7 @@
 		@include vue-flex;
 		// align-items: flex-start;
 		padding: 20rpx 0;
-		font-size: 28rpx;
+		font-size: 30rpx;
 		color: $u-main-color;
 		box-sizing: border-box;
 		line-height: $u-form-item-height;