Browse Source

修改标题

空白格 3 năm trước cách đây
mục cha
commit
1b6c7098ef
66 tập tin đã thay đổi với 227 bổ sung89 xóa
  1. 60 30
      h5_web/pages.json
  2. 1 0
      h5_web/pages/applyEducationCode/applyEducationCode.vue
  3. 1 0
      h5_web/pages/bannerDetails/bannerDetails.vue
  4. 1 1
      h5_web/pages/basicTraining/basicTraining.scss
  5. 2 1
      h5_web/pages/basicTraining/basicTraining.vue
  6. 1 0
      h5_web/pages/basicTraining/myBasicTraining/myBasicTraining.vue
  7. 1 0
      h5_web/pages/basicTraining/offlineTrainingDetails/offlineTrainingDetails.vue
  8. 1 0
      h5_web/pages/basicTraining/onlineTrainingDetails/onlineTrainingDetails.vue
  9. 6 2
      h5_web/pages/businessDetails/businessDetails.vue
  10. 1 1
      h5_web/pages/cooperativeEnterprise/cooperativeEnterprise.scss
  11. 1 0
      h5_web/pages/cooperativeEnterprise/cooperativeEnterprise.vue
  12. 1 0
      h5_web/pages/entrepreneurshipGuidelines/addPlan/addPlan.vue
  13. 1 0
      h5_web/pages/entrepreneurshipGuidelines/entrepreneurshipGuidelines.scss
  14. 1 0
      h5_web/pages/entrepreneurshipGuidelines/entrepreneurshipGuidelines.vue
  15. 1 0
      h5_web/pages/entrepreneurshipGuidelines/planDetails/planDetails.vue
  16. 1 1
      h5_web/pages/evaluationIntention/evaluationIntention.vue
  17. 5 1
      h5_web/pages/index/index.scss
  18. 1 1
      h5_web/pages/index/index.vue
  19. 1 1
      h5_web/pages/integralRule/integralRule.vue
  20. 1 0
      h5_web/pages/jobDetails/jobDetails.vue
  21. 6 1
      h5_web/pages/mine/skillsTraining/skillsTraining.scss
  22. 1 0
      h5_web/pages/mine/skillsTraining/skillsTraining.vue
  23. 4 0
      h5_web/pages/mine/skillsTraining/skillsTrainingDetails/skillsTrainingDetails.scss
  24. 1 0
      h5_web/pages/mine/skillsTraining/skillsTrainingDetails/skillsTrainingDetails.vue
  25. 1 0
      h5_web/pages/myDelivery/myDelivery.scss
  26. 1 0
      h5_web/pages/myDelivery/myDelivery.vue
  27. 1 0
      h5_web/pages/myInterview/myInterview.scss
  28. 1 0
      h5_web/pages/myInterview/myInterview.vue
  29. 1 1
      h5_web/pages/myResume/addExperience.vue
  30. 1 1
      h5_web/pages/myResume/myResume.vue
  31. 1 0
      h5_web/pages/newsDetails/newsDetails.vue
  32. 10 3
      h5_web/pages/newsInformation/newsInformation.vue
  33. 1 0
      h5_web/pages/notification/noticeDetails/noticeDetails.vue
  34. 1 0
      h5_web/pages/notification/notification.vue
  35. 3 1
      h5_web/pages/notification/scss/notification.scss
  36. 1 1
      h5_web/pages/phoneLogin/phoneLogin.vue
  37. 2 1
      h5_web/pages/policyInfo/policyInfo.vue
  38. 1 0
      h5_web/pages/policyInfo/policyInfoDetails.vue
  39. 5 1
      h5_web/pages/policyInfo/scss/policyInfo.scss
  40. 1 0
      h5_web/pages/professionalDetails/professionalDetails.vue
  41. 3 3
      h5_web/pages/progressiveIntegral/progressiveIntegral.vue
  42. 1 1
      h5_web/pages/recruitStudents/recruitStudents.vue
  43. 2 2
      h5_web/pages/recruitment/recruitment.vue
  44. 10 2
      h5_web/pages/recruitment/scss/recruitment.scss
  45. 1 1
      h5_web/pages/schoolDetails/schoolDetails.vue
  46. 1 1
      h5_web/pages/schools/schools.scss
  47. 1 0
      h5_web/pages/schools/schools.vue
  48. 1 0
      h5_web/pages/setting/setting.vue
  49. 1 1
      h5_web/pages/skillsTraining/achievementCertificate/achievementCertificate.vue
  50. 1 0
      h5_web/pages/skillsTraining/addAchievementCertificate/addAchievementCertificate.vue
  51. 1 0
      h5_web/pages/skillsTraining/courseDetailed/courseDetailed.vue
  52. 5 0
      h5_web/pages/skillsTraining/registrationNotice/registrationNotice.scss
  53. 5 2
      h5_web/pages/skillsTraining/registrationNotice/registrationNotice.vue
  54. 9 0
      h5_web/pages/skillsTraining/skillsPackage/skillsPackage.scss
  55. 8 6
      h5_web/pages/skillsTraining/skillsPackage/skillsPackage.vue
  56. 13 8
      h5_web/pages/skillsTraining/skillsTraining.scss
  57. 8 6
      h5_web/pages/skillsTraining/skillsTraining.vue
  58. 1 1
      h5_web/pages/skillsTraining/skillsTrainingCourse/skillsTrainingCourse.scss
  59. 1 1
      h5_web/pages/skillsTraining/submitSuccess/submitSuccess.vue
  60. 1 1
      h5_web/pages/upgrade/introductionDetails/introductionDetails.vue
  61. 8 0
      h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.scss
  62. 4 2
      h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.vue
  63. 5 1
      h5_web/pages/upgrade/upgrade/upgrade.scss
  64. 1 1
      h5_web/pages/upgrade/upgrade/upgrade.vue
  65. 1 0
      h5_web/pages/upgrade/upgradeCourse/upgradeCourse.scss
  66. 1 0
      h5_web/pages/upgrade/upgradeCourse/upgradeCourse.vue

+ 60 - 30
h5_web/pages.json

@@ -20,7 +20,8 @@
 		{
 			"path": "pages/authentication/authentication",
 			"style": {
-				"navigationBarTitleText": "退役军人职业教育码申请"
+				"navigationBarTitleText": "退役军人职业教育码申请",
+				"navigationStyle":"custom"
 			}
 
 		},
@@ -34,7 +35,8 @@
 		{
 			"path": "pages/bannerDetails/bannerDetails",
 			"style": {
-				"navigationBarTitleText": "详情页"
+				"navigationBarTitleText": "详情页",
+				"navigationStyle": "custom"
 			}
 
 		}, {
@@ -55,7 +57,8 @@
 			"style": {
 				"navigationBarTitleText": "新闻详情",
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -89,28 +92,32 @@
 			"style": {
 				"navigationBarTitleText": "学院列表",
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/skillsTraining/skillsTraining",
 			"style": {
 				"navigationBarTitleText": "技能培训",
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/basicTraining/basicTraining",
 			"style": {
 				"navigationBarTitleText": "适应性培训",
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 		}, {
 			"path": "pages/basicTraining/myBasicTraining/myBasicTraining",
 			"style": {
 				"navigationBarTitleText": "我的适应性培训",
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 		}, {
 			"path": "pages/basicTraining/basicTrainingDetails/basicTrainingDetails",
@@ -139,7 +146,8 @@
 			"style": {
 				"navigationBarTitleText": "招聘就业",
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/myResume/myResume",
@@ -147,7 +155,8 @@
 				"navigationBarTitleText": "简历",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 		}, {
 			"path": "pages/myResume/addExperience",
@@ -177,7 +186,8 @@
 			"style": {
 				"navigationBarTitleText": "学院列表",
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/skillsTraining/skillsTraining",
@@ -243,7 +253,8 @@
 				"navigationBarTitleText": "我的投递",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -252,7 +263,8 @@
 				"navigationBarTitleText": "我的面试",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -270,7 +282,8 @@
 				"navigationBarTitleText": "设置",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -287,7 +300,8 @@
 				"navigationBarTitleText": "企业列表",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 
 		}, {
@@ -303,7 +317,8 @@
 				"navigationBarTitleText": "职位详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 
 		}, {
@@ -320,7 +335,8 @@
 				"navigationBarTitleText": "退役军人职业教育码申请",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -337,7 +353,8 @@
 				"navigationBarTitleText": "新闻动态",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 
 		}, {
@@ -352,7 +369,8 @@
 				"navigationBarTitleText": "专业详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/policyInfo/policyInfo",
@@ -360,7 +378,8 @@
 				"navigationBarTitleText": "政策资讯",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/notification/notification",
@@ -368,7 +387,8 @@
 				"navigationBarTitleText": "消息通知",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/questionConsulting/questionConsulting",
@@ -383,7 +403,8 @@
 				"navigationBarTitleText": "政策资讯详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/integralRule/integralRule",
@@ -414,7 +435,8 @@
 				"navigationBarTitleText": "适应性培训线上课程",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -423,7 +445,8 @@
 				"navigationBarTitleText": "线下课程详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -450,7 +473,8 @@
 				"navigationBarTitleText": "我的技能培训",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 
 		}, {
@@ -494,7 +518,8 @@
 				"navigationBarTitleText": "我的技能培训详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 
 		}, {
@@ -529,7 +554,8 @@
 				"navigationBarTitleText": "消息详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 
 		}, {
@@ -538,7 +564,8 @@
 				"navigationBarTitleText": "学历提升课程",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -556,7 +583,8 @@
 				"navigationBarTitleText": "创业指引",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -565,7 +593,8 @@
 				"navigationBarTitleText": "提交创业计划",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {
@@ -574,7 +603,8 @@
 				"navigationBarTitleText": "创业计划详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle":"custom"
 			}
 
 		}, {

+ 1 - 0
h5_web/pages/applyEducationCode/applyEducationCode.vue

@@ -1,6 +1,7 @@
 <!-- 退役军人职业教育码申请 -->
 <template>
 	<view class="apply-code">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<u-form :model="form" ref="uForm" label-width="160" label-align="left">
 			<u-form-item label="姓名:" prop="veteName" :required="true">
 				<u-input v-model="form.veteName" placeholder="请输入真实姓名" />

+ 1 - 0
h5_web/pages/bannerDetails/bannerDetails.vue

@@ -1,6 +1,7 @@
 <template>
 	<!-- 轮播详情 -->
 	<view>
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<u-parse :html="dom"></u-parse>
 		<u-toast ref="uToast" />
 	</view>

+ 1 - 1
h5_web/pages/basicTraining/basicTraining.scss

@@ -99,7 +99,7 @@ page {
 			align-items: center;
 			.left {
 				margin-right: 14rpx;
-				border: solid 1px #b4b4b4;
+				border: solid 1px #e0e0e0;
 				border-radius: 10rpx;
 			}
 			.right {

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

@@ -1,5 +1,6 @@
 <template>
 	<view class="training">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<image class="bg" src="../../static/img/basic-training-bg.png" mode="widthFix"></image>
 		<view class="tab">
 			<view class="tab-bg">
@@ -36,7 +37,7 @@
 				@click="recordBrowseTotal(item)"
 				>
 					<view class="left">
-						<u-image :src="item.titleImg" width="198" height="144"></u-image>
+						<u-image :src="item.titleImg" width="198" height="144" border-radius="10"></u-image>
 					</view>
 					<view class="right">
 						<view>{{ item.adaptName }}</view>

+ 1 - 0
h5_web/pages/basicTraining/myBasicTraining/myBasicTraining.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<image class="bg" src="../../../static/img/banner-myBasicTraining.png" mode="widthFix"></image>
 		<view class="title u-flex u-row-between">
 			<view class="left">

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

@@ -1,6 +1,7 @@
 <!-- 专业详情 -->
 <template>
 	<view class="details">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<view class="details-name">{{ info.adaptName }}</view>
 		<view class="details-code">({{ info.adaptAddress }})</view>
 		<view class="details-content">

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

@@ -1,5 +1,6 @@
 <template>
 	<view class="details">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<!-- 视频 -->
 		<view class="details-video" v-if="isPaly">
 			<video class="details-video-con" id="myVideo" @timeupdate="timeUpdate" :src="videoInfo.videoUrl" controls

+ 6 - 2
h5_web/pages/businessDetails/businessDetails.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="business-details">
 		<!-- 导航栏 -->
-		<u-navbar title="企业详情" :background="background" title-color="#fff" back-icon-color="#fff" />
+		<u-navbar title="" :background="background" title-color="#fff" back-icon-color="#fff" :border-bottom="false"/>
 		<!-- 背景 -->
 		<view class="business-details-bg"></view>
 		<!-- 内容 -->
@@ -89,7 +89,11 @@
 						<view class="left">
 							<view class="logo">
 								<u-image :src="item.companyLogoUrl" mode="aspectFill" width="112" height="112"
-									border-radius="10" />
+									border-radius="10">
+									<view slot="error">
+										<u-image src="../../static/img/default-company.jpg" width="112" height="112" border-radius="10"/>
+									</view>
+								</u-image>
 							</view>
 							<view class="info">
 								<view>{{ item.postName }}</view>

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

@@ -5,7 +5,7 @@
 	/* 搜索 */
 	&-search {
 		width: calc(100% - 60rpx);
-		margin: 0 auto;
+		margin: 88rpx auto 0;
 		padding: 29rpx 0;
 	}
 	/* tab */

+ 1 - 0
h5_web/pages/cooperativeEnterprise/cooperativeEnterprise.vue

@@ -1,6 +1,7 @@
 <!-- 企业列表 -->
 <template>
 	<view class="enterprose-list">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging
 			ref="paging"
 			v-model="companyList"

+ 1 - 0
h5_web/pages/entrepreneurshipGuidelines/addPlan/addPlan.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="plan">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<u-form :model="form" ref="uForm">
 			<u-form-item label="名称:" prop="title" label-position="top">
 				<u-input v-model="form.title" placeholder="请输入名称" :border="true" />

+ 1 - 0
h5_web/pages/entrepreneurshipGuidelines/entrepreneurshipGuidelines.scss

@@ -7,6 +7,7 @@ page {
 	font-family: PingFangSC-Regular, PingFang SC;
 	&-list {
 		padding: 30rpx;
+		margin-top: 88rpx;
 		&-item {
 			background-color: #fff;
 			padding: 31rpx 32rpx;

+ 1 - 0
h5_web/pages/entrepreneurshipGuidelines/entrepreneurshipGuidelines.vue

@@ -1,6 +1,7 @@
 <!-- 创业指引 -->
 <template>
 	<view class="entrepreneurship">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging ref="paging" v-model="list" @query="queryList">
 			<view class="entrepreneurship-list">
 				<view class="entrepreneurship-list-item" v-for="(item, index) in list" :key="index" @click="jumpPage('pages/entrepreneurshipGuidelines/planDetails/planDetails', { id: item.id })">

+ 1 - 0
h5_web/pages/entrepreneurshipGuidelines/planDetails/planDetails.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="details">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<view class="details-content">
 			<view class="details-content-title">{{ planInfo.title }}</view>
 			<view class="details-content-createtime">{{ planInfo.createTime }}提交</view>

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

@@ -3,7 +3,7 @@
 	<view class="evaluate-intention">
 		
 		<!-- 导航栏 -->
-		<u-navbar class="evaluate-intention-bar" back-text="" title="完善加分项" :background="{backgroundColor: '#3D5D4C'}" title-color="#fff" back-icon-color="#fff">
+		<u-navbar class="evaluate-intention-bar" back-text="" title="" :background="{backgroundColor: '#3D5D4C'}" title-color="#fff" back-icon-color="#fff">
 		</u-navbar>
 		
 		<view class="evaluate-intention-explain">

+ 5 - 1
h5_web/pages/index/index.scss

@@ -205,4 +205,8 @@
 	display: flex;
 	justify-content: space-between;
 	color: #A3A3A3;
-}
+}
+.image-border {
+	border: solid 1px #E0E0E0;
+	border-radius: 10rpx;
+}

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

@@ -99,7 +99,7 @@
 								<view>{{$u.timeFormat(item.createTime.replace(/-/g, '/'), 'mm-dd hh:MM')}}</view>
 							</view>
 						</view>
-						<view>
+						<view class="image-border">
 							<u-image :src="item.artImage" mode="aspectFill" width="160" height="120"
 								border-radius="10">
 								<view slot="error">

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

@@ -2,7 +2,7 @@
 <template>
 	<view class="rules">
 		<!-- 导航栏 -->
-		<u-navbar class="evaluate-intention-bar" back-text="" title="积分规则" :background="background" title-color="#fff" back-icon-color="#fff"/>
+		<u-navbar class="evaluate-intention-bar" back-text="" title="" :background="background" title-color="#fff" back-icon-color="#fff"/>
 		<view class="rules-list">
 			<view>
 				1,完成各段时间采集信息提交  +50

+ 1 - 0
h5_web/pages/jobDetails/jobDetails.vue

@@ -5,6 +5,7 @@
 
 <template>
 	<view class="jobdetails">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<view class="jobdetails-head">
 			<u-card :border="false" :head-border-bottom="false" :foot-border-top="false" :padding="0" :border-radius="0"
 				class="jobdetails-head-card">

+ 6 - 1
h5_web/pages/mine/skillsTraining/skillsTraining.scss

@@ -6,7 +6,9 @@ page {
 }
 
 .training {
-	
+	&-tab {
+		margin-top: 88rpx;
+	}
 	&-list {
 		padding: 30rpx;
 		
@@ -19,6 +21,9 @@ page {
 			
 			.left {
 				margin-right: 22rpx;
+				border: solid 1px #e0e0e0;
+				padding: 2rpx;
+				border-radius: 10rpx;
 			}
 			.right {
 				color: #3E3E3E;

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

@@ -1,6 +1,7 @@
 <!-- 我的技能培训 -->
 <template>
 	<view class="training">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging
 			ref="paging"
 			v-model="trainingList"

+ 4 - 0
h5_web/pages/mine/skillsTraining/skillsTrainingDetails/skillsTrainingDetails.scss

@@ -32,8 +32,12 @@ page {
 			display: flex;
 			
 			.left {
+				height: 224rpx;
 				margin-right: 22rpx;
 				position: relative;
+				border: solid 1px #e0e0e0;
+				border-radius: 10rpx;
+				padding: 2rpx;
 				&-weekly {
 					width: 204rpx;
 					height: 44rpx;

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

@@ -1,6 +1,7 @@
 <!-- 我的技能培训详情  -->
 <template>
 	<view class="details">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<!-- 背景 -->
 		<view class="details-bg">
 			<view class="details-bg-1"></view>

+ 1 - 0
h5_web/pages/myDelivery/myDelivery.scss

@@ -4,6 +4,7 @@
 	background-color: #F2F2F2;
 	&-list {
 		padding: 28rpx 0;
+		margin-top: 88rpx;
 		&-item {
 			display: flex;
 			justify-content: space-between;

+ 1 - 0
h5_web/pages/myDelivery/myDelivery.vue

@@ -1,6 +1,7 @@
 <!-- 我的投递 -->
 <template>
 	<view class="delivery">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging
 			 ref="paging"
 			 v-model="deliveryList"

+ 1 - 0
h5_web/pages/myInterview/myInterview.scss

@@ -6,6 +6,7 @@
 	
 	&-list {
 		padding: 26rpx 30rpx;
+		margin-top: 88rpx;
 		
 		&-item {
 			border-radius: 10rpx;

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

@@ -15,6 +15,7 @@
 -->
 <template>
 	<view class="interview">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging ref="paging" v-model="interviewList" @query="queryList">
 			<view class="interview-list">
 				<view class="interview-list-item" v-for="(item, index) in interviewList" :key="index">

+ 1 - 1
h5_web/pages/myResume/addExperience.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="experience">
 		<!-- 导航栏 -->
-		<u-navbar class="experience-bar" back-text="" back-icon-color="#fff" title="添加工作经历" title-color="#fff" :background="background">
+		<u-navbar class="experience-bar" back-text="" back-icon-color="#fff" title="" title-color="#fff" :background="background">
 			<view class="experience-bar-right" slot="right">保存</view>
 		</u-navbar>
 		

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

@@ -1,7 +1,7 @@
 <!-- 我的简历 -->
 <template>
 	<view class="resume">
-
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<!-- ================================ 头像部分 ================================ -->
 		<!--  @click="jumpPage('/pages/dynamicTracking/dynamicTracking')" -->
 		<view class="resume-head">

+ 1 - 0
h5_web/pages/newsDetails/newsDetails.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="news-details">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<view class="news-details-header">
 			<view class="news-details-header-title">{{ newsInfo.artTitle }}</view>
 			<view class="news-details-header-subtitle">

+ 10 - 3
h5_web/pages/newsInformation/newsInformation.vue

@@ -1,12 +1,17 @@
 <!-- 新闻动态 -->
 <template>
 	<view class="news">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging ref="paging" v-model="newsList" @query="queryList">
 			<view class="news-list">
 				<view class="news-list-item" v-for="(item, index) in newsList" :key="index"
 					@click="jumpPage('/pages/newsDetails/newsDetails', { artId: item.artId })">
-					<view class="news-list-item-left">
-						<u-image :src="item.artImage" width="128" height="120" border-radius="10"/>
+					<view class="news-list-item-left image-border">
+						<u-image :src="item.artImage" width="128" height="120" border-radius="10">
+							<view slot="error">
+								<u-image src="../../static/img/default-news.png" mode="aspectFill" width="160" height="120" border-radius="10"/>
+							</view>
+						</u-image>
 					</view>
 					<view class="news-list-item-right">
 						<view class="title">{{ item.artTitle }}</view>
@@ -84,6 +89,7 @@
 
 		&-list {
 			padding: 28rpx 30rpx;
+			margin-top: 88rpx;
 
 			&-item {
 				display: flex;
@@ -94,7 +100,8 @@
 
 				&-left {
 					margin-right: 16rpx;
-
+					border: solid 1px #E0E0E0;
+					border-radius: 10rpx;
 					image {
 						width: 132rpx;
 						height: 106rpx;

+ 1 - 0
h5_web/pages/notification/noticeDetails/noticeDetails.vue

@@ -1,6 +1,7 @@
 <!-- 消息详情 -->
 <template>
 	<view class="news-details">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<view class="news-details-header">
 			<view class="news-details-header-title">{{ info.name }}</view>
 			<view class="news-details-header-subtitle">

+ 1 - 0
h5_web/pages/notification/notification.vue

@@ -1,6 +1,7 @@
 <!-- 消息通知 -->
 <template>
 	<view class="notice">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging
 			ref="paging"
 			v-model="noticeList"

+ 3 - 1
h5_web/pages/notification/scss/notification.scss

@@ -3,7 +3,9 @@ page {
 	background-color: #f2f2f2;
 }
 .notice {
-	
+	&-tab {
+		margin-top: 88rpx;
+	}
 	&-list {
 		margin-top: 18rpx;
 		padding: 0 30rpx;

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

@@ -1,7 +1,7 @@
 <template>
 	<view class="phonelogin">
 		<u-navbar title-color="#FFFFFF" :custom-back="customBack" :bpay-bottom="false" back-icon-color="#FFFFFF"
-			:background="{background: 'transparent' }" title="手机登录" class="phonelogin-unavbar" />
+			:background="{background: 'transparent' }" title="" class="phonelogin-unavbar" />
 		<view class="phonelogin-title">
 			<view>欢迎您!</view>
 			<view>登录退役军人服务移动端</view>

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

@@ -5,9 +5,10 @@
 
 <template>
 	<view class="policyInfo">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{background: '#3D5D4C' }"></u-navbar>
 		<z-paging ref="policyInfoPaging" v-model="policyInfoList" @query="policyInfoQueryList">
 			<view class="policyInfo-banner" slot="top">
-				<u-swiper :list="bannerList" name="bannerUrl" border-radius="0" :mode="bannerList.length > 1 ? 'round' : 'none'" height="240"
+				<u-swiper :list="bannerList" name="bannerUrl" border-radius="0" :mode="bannerList.length > 1 ? 'round' : 'none'" height="300"
 					img-mode="scaleToFill" @click="swiperClick" @change="swiperChange"></u-swiper>
 			</view>
 

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

@@ -1,5 +1,6 @@
 <template>
 	<view class="policyinfodetails">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{background: '#3D5D4C' }"></u-navbar>
 		<view class="policyinfodetails-header">
 			<view class="policyinfodetails-header-title">{{ policyInfoDetailsObj.artTitle }}</view>
 			<view class="policyinfodetails-header-subtitle">

+ 5 - 1
h5_web/pages/policyInfo/scss/policyInfo.scss

@@ -1,6 +1,9 @@
 .policyInfo{
 	min-height: calc(100vh - 88rpx);
 	background-color: #f2f2f2;
+	&-banner {
+		margin-top: 88rpx;
+	}
   &-title{
     width: 100%;
     height: 82rpx;
@@ -50,7 +53,8 @@
             width: 128rpx;
             height: 101rpx;
             box-shadow: 0 0 10rpx 0 rgba(77, 77, 77, 0.23);
-            border-radius: 7rpx;
+						border: solid 1px #E0E0E0;
+						border-radius: 10rpx;
           }
         }
       }

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

@@ -1,6 +1,7 @@
 <!-- 专业详情 -->
 <template>
 	<view class="details">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<view class="details-name">{{ professionalInfo.professionName }}</view>
 		<view class="details-code">(专业代码:{{ professionalInfo.professionCode }})</view>
 		<view class="details-content">

+ 3 - 3
h5_web/pages/progressiveIntegral/progressiveIntegral.vue

@@ -3,8 +3,8 @@
 	<view class="integral">
 		<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" :border-bottom="false">
 			</u-navbar>
 
 			<!-- 背景 -->
@@ -80,7 +80,7 @@
 		data() {
 			return {
 				background: {
-					backgroundColor: '#FE7C0F'
+					backgroundColor: 'transparent'
 				},
 				// 积分列表
 				integralList: [],

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

@@ -3,7 +3,7 @@
 	<view class="recruit">
 
 		<!-- 导航栏 -->
-		<u-navbar title="招生简章" :background="background" title-color="#fff" back-icon-color="#fff">
+		<u-navbar title="" :background="background" title-color="#fff" back-icon-color="#fff">
 			<view class="navbar-right" slot="right" @click="downloadFile(info)" v-if="info.regulation_file">
 				<u-image src="../../static/img/attachment.png" width="26" height="28" />
 				<text>下载附件</text>

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

@@ -7,12 +7,12 @@
 	<view class="recruitment">
 		<!-- <u-navbar title-color="#FFFFFF" :customBack="navbarCustomBack" :bpay-bottom="false" back-icon-color="#FFFFFF"
 			:background="{background: '#3D5D4C' }" title="招聘就业" class="recruitment-unavbar" /> -->
-
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging ref="recruitmentPaging" v-model="recruitmentJobList" @query="recruitmentQueryList">
 
 			<!-- ###################################-- 轮播图 -- ################################### -->
 			<view class="recruitment-banner" slot="top">
-				<u-swiper :list="bannerList" name="bannerUrl" border-radius="0" mode="round" height="240"
+				<u-swiper :list="bannerList" name="bannerUrl" border-radius="0" mode="round" height="300"
 					img-mode="scaleToFill" @click="swiperClick" :mode="bannerList.length > 1 ? 'round' : 'none'"></u-swiper>
 			</view>
 

+ 10 - 2
h5_web/pages/recruitment/scss/recruitment.scss

@@ -1,11 +1,15 @@
-page{background-color: #f2f2f2;}
+page{
+	background-color: #f2f2f2;
+}
 .recruitment{
   &-unavbar{
     ::v-deep .u-border-bottom:after {
       border-bottom-width: 0 !important;
     }
   }
-  
+  &-banner {
+		margin-top: 88rpx;
+	}
   &-usearch{
     margin: 20rpx 30rpx 0;
   }
@@ -52,6 +56,8 @@ page{background-color: #f2f2f2;}
             .img {
               // box-shadow: 0px 0px 10px 0px rgba(77, 77, 77, 0.23);
 							margin-bottom: 20rpx;
+							border: solid 1px #E0E0E0;
+							border-radius: 10rpx;
             }
             
             .subject {
@@ -117,6 +123,8 @@ page{background-color: #f2f2f2;}
       
       .dataarea-card-left{
 				margin-right: 24rpx;
+				border: solid 1px #E0E0E0;
+				border-radius: 10rpx;
       }
       
       .dataarea-card-content{

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

@@ -2,7 +2,7 @@
 <template>
 	<view class="school-details">
 		<!-- 导航栏 -->
-		<u-navbar title="学院详情" :background="background" title-color="#fff" back-icon-color="#fff"/>
+		<u-navbar title="" :background="background" title-color="#fff" back-icon-color="#fff" :border-bottom="false"/>
 		<view class="school-details-bg"></view>
 		<view class="school-details-content">
 			<view class="school-details-content-logo">

+ 1 - 1
h5_web/pages/schools/schools.scss

@@ -6,7 +6,7 @@
 	/* 搜索 */
 	&-search {
 		width: calc(100% - 60rpx);
-		margin: 0 auto;
+		margin: 88rpx auto 0;
 		padding: 29rpx 0;
 	}
 	

+ 1 - 0
h5_web/pages/schools/schools.vue

@@ -1,6 +1,7 @@
 <!-- 学院列表 -->
 <template>
 	<view class="school">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging ref="paging" v-model="schoolList" @query="queryList">
 			<!-- 搜索 -->
 			<view class="school-search" slot="top">

+ 1 - 0
h5_web/pages/setting/setting.vue

@@ -1,6 +1,7 @@
 <!-- 设置 -->
 <template>
 	<view class="setting">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<u-cell-group :border="false" :title-style="{'color': '#333333', 'font-size': '24rpx'}">
 			<u-cell-item icon="" title="退出登录" @click="	logoutModal = true"/>
 			<u-cell-item icon="" title="版本信息" :arrow="false" :value="`当前版本${ config.version },已更新`"/>

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

@@ -2,7 +2,7 @@
 <template>
 	<view class="achievement">
 		<!-- 导航栏 -->
-		<u-navbar back-icon-color="#fff" title="成绩与证书" title-color="#fff" :background="{ backgroundColor: '#3D5D4C' }">
+		<u-navbar back-icon-color="#fff" title="" title-color="#fff" :background="{ backgroundColor: '#3D5D4C' }">
 			<view class="navbar-right" slot="right"
 				@click="jumpPage('/pages/skillsTraining/addAchievementCertificate/addAchievementCertificate', { id })">
 				<u-icon name="plus" color="#fff"></u-icon>

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

@@ -1,6 +1,7 @@
 <!-- 录入成绩和证书 -->
 <template>
 	<view class="achievement" id="achievement">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<u-form :model="form" ref="uForm" class="achievement-form">
 			<u-form-item label="考试名称:" label-position="top" :required="true" prop="examName">
 				<u-input v-model="form.examName" placeholder="请输入内容" />

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

@@ -1,5 +1,6 @@
 <template>
 	<view class="details">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<!-- 视频 -->
 		<view class="details-video" v-if="isPlay">
 			<video class="details-video-con" id="myVideo" @timeupdate="timeUpdate" :src="videoInfo.videoUrl" controls

+ 5 - 0
h5_web/pages/skillsTraining/registrationNotice/registrationNotice.scss

@@ -7,6 +7,7 @@ page {
 .registration {
 	&-list {
 		padding: 26rpx 30rpx;
+		margin-top: 88rpx;
 		&-item {
 			background-color: #fff;
 			padding: 36rpx 32rpx;
@@ -14,7 +15,11 @@ page {
 			border-radius: 10rpx;
 			display: flex;
 			.left {
+				height: 224rpx;
 				margin-right: 22rpx;
+				border: solid 1px #E0E0E0;
+				border-radius: 10rpx;
+				padding: 2rpx;
 			}
 			.right {
 				width: calc(100% - 204rpx);

+ 5 - 2
h5_web/pages/skillsTraining/registrationNotice/registrationNotice.vue

@@ -1,6 +1,7 @@
 <!-- 报班通知 -->
 <template>
 	<view class="registration">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging
 			ref="paging"
 			v-model="noticeList"
@@ -9,12 +10,14 @@
 			<view class="registration-list">
 				<view class="registration-list-item" v-for="(item, index) in noticeList" :key="index">
 					<view class="left">
-						<u-image :src="item.img" mode="aspectFill" width="204" height="220" border-radius="10"/>
+						<u-image :src="item.img" mode="aspectFill" width="200" height="216" border-radius="10"/>
 					</view>
 					<view class="right">
 						<view class="name">{{ item.name }}</view>
 						<view class="school">{{ item.schoolName }}</view>
-						<view class="content">{{ item.description }}</view>
+						<view class="content">
+							<u-parse :html="item.description"></u-parse>
+						</view>
 						<view class="button" @click="signUp(item)">报名</view>
 					</view>
 				</view>

+ 9 - 0
h5_web/pages/skillsTraining/skillsPackage/skillsPackage.scss

@@ -32,8 +32,12 @@ page {
 			display: flex;
 			
 			.left {
+				height: 220rpx;
 				margin-right: 22rpx;
 				position: relative;
+				border: solid 1px #E0E0E0;
+				border-radius: 10rpx;
+				padding: 2rpx;
 				&-weekly {
 					width: 204rpx;
 					height: 44rpx;
@@ -135,6 +139,11 @@ page {
 							font-size: 26rpx;
 							margin: 10rpx 0;
 						}
+						.img {
+							border: solid 1px #E0E0E0;
+							border-radius: 10rpx;
+							padding: 2rpx;
+						}
 						.classes-subtitle {
 							font-size: 24rpx;
 							color: #818181;

+ 8 - 6
h5_web/pages/skillsTraining/skillsPackage/skillsPackage.vue

@@ -61,12 +61,14 @@
 								@click="jumpPage('pages/skillsTraining/courseDetailed/courseDetailed', { id: item.id })">
 								<!-- <u-image :src="item.img" width="95%" height="196" mode="aspectFill"
 									border-radius="10" /> -->
-								<u-image :src="item.img" width="95%" height="196" border-radius="10" mode="aspectFill">
-									<view slot="error">
-										<u-image src="../../../static/img/default-company.jpg" height="220" width="95%"
-											border-radius="10" mode="aspectFill" />
-									</view>
-								</u-image>
+								<view class="img">
+									<u-image :src="item.img" width="90%" height="196" border-radius="10" mode="aspectFill">
+										<view slot="error">
+											<u-image src="../../../static/img/default-company.jpg" height="220" width="95%"
+												border-radius="10" mode="aspectFill" />
+										</view>
+									</u-image>
+								</view>
 								<view class="classes-name">{{ item.name }}</view>
 								<!-- <view class="classes-subtitle">{{ item.subtitle }}</view> -->
 							</swiper-item>

+ 13 - 8
h5_web/pages/skillsTraining/skillsTraining.scss

@@ -28,11 +28,12 @@ page {
 	&-total {
 		padding: 0 30rpx;
 		height: 164rpx;
-		background: linear-gradient(90deg, #FEA460 0%, #FB6C59 100%);
+		// background: linear-gradient(90deg, #FEA460 0%, #FB6C59 100%);
+		background-color: #fff;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		color: #fff;
+		color: #666;
 		font-size: 30rpx;
 		
 		&-left {
@@ -41,7 +42,7 @@ page {
 					font-size: 40rpx;
 					font-weight: 700;
 					margin-bottom: 6rpx;
-					color: rgba($color: #fff, $alpha: 0.9);
+					color: rgba($color: #000, $alpha: 0.9);
 				}
 			}
 		}
@@ -80,15 +81,18 @@ page {
 					align-items: center;
 					
 					.left {
-						width: 204rpx;
-						height: 220rpx;
+						width: 212rpx;
+						height: 230rpx;
 						margin-right: 22rpx;
+						border: solid 1px #E0E0E0;
+						border-radius: 10rpx;
+						padding: 2rpx;
 					}
 					
 					.right {
 						text-align: left;
 						width: calc(100% - 226rpx);
-						view {
+						view.item {
 							&:first-child {
 								font-size: 36rpx;
 								color: #101010;
@@ -162,8 +166,9 @@ page {
 				}
 				.border-1 {
 					border: solid 1px #d0d0d0;
-					border-radius: 12rpx;
-					margin-right: -2rpx;
+					border-radius: 10rpx;
+					padding: 2rpx;
+					text-align: center;
 				}
 				view {
 					&:nth-child(2) {

+ 8 - 6
h5_web/pages/skillsTraining/skillsTraining.vue

@@ -1,7 +1,7 @@
 <!-- 技能培训 -->
 <template>
 	<view class="training">
-
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<!-- banner -->
 		<view class="training-banner">
 			<u-swiper v-if="bannerList.length" :list="bannerList" name="bannerUrl" border-radius="0" mode="round"
@@ -15,7 +15,7 @@
 				<view>学习时长:{{ skillTotal.learnTime }}小时</view>
 			</view>
 			<view class="training-total-right">
-				<u-icon name="arrow-right" size="44" color="#fff"></u-icon>
+				<u-icon name="arrow-right" size="44" color="#666"></u-icon>
 			</view>
 		</view>
 		<view class="training-total" v-else>
@@ -47,9 +47,11 @@
 								</u-image>
 							</view>
 							<view class="right">
-								<view>{{ item.name }}</view>
-								<view>{{ item.schoolName }}</view>
-								<view>{{ item.description }}</view>
+								<view class="item">{{ item.name }}</view>
+								<view class="item">{{ item.schoolName }}</view>
+								<view class="item">
+									<u-parse :html="item.description"></u-parse>
+								</view>
 								<view class="btn" @click="signUp(item)">报名</view>
 							</view>
 						</view>
@@ -71,7 +73,7 @@
 				<view class="training-package-list-item" v-for="(item, index) in packageList" :key="index"
 					@click="recordBrowseTotal(item)">
 					<view class="border-1">
-						<u-image :src="item.img" mode="aspectFill" border-radius="10" height="190" width="300">
+						<u-image :src="item.img" mode="aspectFill" border-radius="10" height="180" width="294">
 							<view slot="error">
 								<u-image src="../../static/img/default-company.jpg" height="190" width="300"
 									border-radius="10" mode="aspectFill" />

+ 1 - 1
h5_web/pages/skillsTraining/skillsTrainingCourse/skillsTrainingCourse.scss

@@ -16,7 +16,7 @@ page {
 			margin-bottom: 20rpx;
 			.left {
 				margin-right: 22rpx;
-				border: solid 1px #b6b6b6;
+				border: solid 1px #e0e0e0;
 				border-radius: 10rpx;
 			}
 			.right {

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

@@ -3,7 +3,7 @@
 	<view class="box">
 		
 		<!-- 导航栏 -->
-		<u-navbar :is-back="false" title="提交成功" :background="{backgroundColor: '#3D5D4C'}" title-color="#fff"></u-navbar>
+		<u-navbar :is-back="false" title="" :background="{backgroundColor: '#3D5D4C'}" title-color="#fff"></u-navbar>
 		<view class="box-content">
 			<view class="box-content-image">
 				<u-image src="../../../static/img/success-icon.png" mode="aspectFill" width="176" height="176"></u-image>

+ 1 - 1
h5_web/pages/upgrade/introductionDetails/introductionDetails.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="details">
 		<!-- 导航栏 -->
-		<u-navbar title="学历提升" :background="background" title-color="#fff" back-icon-color="#fff" :border-bottom="false"/>
+		<u-navbar title="" :background="background" title-color="#fff" back-icon-color="#fff" :border-bottom="false"/>
 		
 		<view class="details-img">
 			<image src="../../../static/img/introduction-details.png" mode="widthFix"></image>

+ 8 - 0
h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.scss

@@ -25,6 +25,9 @@
 			
 			&-left {
 				margin-right: 24rpx;
+				border: solid 1px #e0e0e0;
+				border-radius: 10rpx;
+				padding: 2rpx;
 			}
 			&-right {
 				
@@ -122,6 +125,11 @@
 							font-size: 28rpx;
 							margin-top: 20rpx;
 						}
+						.image {
+							border: solid 1px #e0e0e0;
+							padding: 2rpx;
+							border-radius: 10rpx;
+						}
 						.classes-teacher {
 							font-size: 26rpx;
 							color: #818181;

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

@@ -1,7 +1,7 @@
 <template>
 	<view class="professional">
 		<!-- 导航栏 -->
-		<u-navbar title="专业介绍" :background="background" title-color="#fff" back-icon-color="#fff" :border-bottom="false"/>
+		<u-navbar title="" :background="background" title-color="#fff" back-icon-color="#fff" :border-bottom="false"/>
 		
 		<view class="professional-bg"></view>
 		
@@ -44,7 +44,9 @@
 							height="196rpx"
 						>
 							<swiper-item class="swiper-item" v-for="(item, index) in details.courseList" :key="index" @click="jumpPage('/pages/upgrade/courseDetail/courseDetail', { id: item.id })">
-								<u-image :src="item.img" width="95%" height="196"/>
+								<view class="image">
+									<u-image :src="item.img" width="95%" height="196" border-radius="10"/>
+								</view>
 								<view class="classes-name">{{ item.name }}</view>
 								<view class="classes-teacher">讲师:{{ item.teacherName }}</view>
 							</swiper-item>

+ 5 - 1
h5_web/pages/upgrade/upgrade/upgrade.scss

@@ -89,6 +89,9 @@
 				image {
 					width: 100%;
 					height: 220rpx;
+					border: solid 1px #e0e0e0;
+					border-radius: 10rpx;
+					padding: 2rpx;
 				}
 			}
 			
@@ -112,8 +115,9 @@
 						.image {
 							width: 100%;
 							margin-bottom: 10rpx;
-							// border: solid 1px #f2f2f2;
+							border: solid 1px #e0e0e0;
 							border-radius: 10rpx;
+							padding: 2rpx;
 						}
 						view {
 							&:nth-child(2) {

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

@@ -3,7 +3,7 @@
 	<view class="upgrade">
 		
 		<!-- 导航栏 -->
-		<u-navbar title="学历提升" :background="background" title-color="#fff" back-icon-color="#fff" :border-bottom="false"/>
+		<u-navbar title="" :background="background" title-color="#fff" back-icon-color="#fff" :border-bottom="false"/>
 		
 		<view class="upgrade-bg"></view>
 		

+ 1 - 0
h5_web/pages/upgrade/upgradeCourse/upgradeCourse.scss

@@ -8,6 +8,7 @@ page {
 	
 	&-list {
 		padding: 26rpx 30rpx;
+		margin-top: 88rpx;
 		&-item {
 			background-color: #fff;
 			padding: 30rpx 32rpx;

+ 1 - 0
h5_web/pages/upgrade/upgradeCourse/upgradeCourse.vue

@@ -1,6 +1,7 @@
 <!-- 学历提升课程 -->
 <template>
 	<view class="course">
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
 		<z-paging ref="paging" v-model="courseList" @query="queryList">
 			<view class="course-list">
 				<view class="course-list-item" v-for="(item, index) in courseList" :key="index" @click="jumpPage('pages/upgrade/courseDetail/courseDetail', { id: item.id })">