Merge branch 'master' of http://172.16.90.201:3000/veterans/veterans_H5

h5_web/manifest.json

@@ -70,8 +70,12 @@
     },
     "h5" : {
         "router" : {
-            "mode" : "hash"
+            "mode" : "hash",
+            "base" : ""
         },
-        "template" : "template.h5.html"
+        "template" : "template.h5.html",
+        "devServer" : {
+            "https" : false
+        }
     }
 }

h5_web/pages/index/index.scss

@@ -1,5 +1,24 @@
-page{background-color: #f2f2f2;}
+// page{background-color: #f2f2f2;}
 .index{
+  width: 100%;
+  background-color: #f2f2f2;
+  
+  .index-head{
+    width: 100%;
+    height: 369rpx;
+    background-image: url(../../static/svg/index-head-bg.svg);
+    background-repeat: round;
+    background-size: cover;
+    
+    &-banner{
+      position: absolute;
+      width: 100%;
+      height: 440rpx;
+      margin-top: 140rpx;
+      padding: 0 20rpx;
+    }
+  }
+  
   .index-header{
     width: 100%;
     height: 585rpx;
@@ -10,8 +29,8 @@ page{background-color: #f2f2f2;}
       width: 100%;
       height: 400rpx;
       background-color: #2A322B;
-      border-bottom-right-radius: 100rpx;
-      border-bottom-left-radius: 100rpx;
+      border-bottom-right-radius: 5%;
+      border-bottom-left-radius: 5%;
     }
     
     &-left{
@@ -32,7 +51,7 @@ page{background-color: #f2f2f2;}
     
     &-top{
       position: absolute;
-      padding-top: 30rpx;
+      padding-top: 20rpx;
       width: 100%;
       display: flex;
       flex-wrap: wrap;
@@ -44,7 +63,7 @@ page{background-color: #f2f2f2;}
       }
       
       .header-top-notice{
-        margin: 0 30rpx 0 46rpx;
+        margin: 16rpx 30rpx 0 46rpx;
         line-height: 34px;
         
         &-badge{
@@ -55,8 +74,12 @@ page{background-color: #f2f2f2;}
       }
       
       .header-top-scan{
-        margin-right: 30rpx;
+        margin: 16rpx 30rpx 0 0;
         line-height: 34px;
+        
+        .header-scan-icon{
+          line-height: 34px;
+        }
       }
     }
     
@@ -65,33 +88,104 @@ page{background-color: #f2f2f2;}
       width: 100%;
       height: 440rpx;
       margin-top: 140rpx;
-      padding: 0 20rpx;
+      padding: 0 30rpx;
     }
   }
 }
 
 .service{
-	.service-item{
-		width: 25%;
-		margin: 24rpx 0;
-		text-align: center;
-		.service-item-img{width: 98rpx;height: 98rpx;}
-	}
+  padding: 20rpx 30rpx;
+  
+  .service-body{
+    background-color: #FFFFFF;
+    border-radius: 10rpx;
+    
+    .service-item{
+      width: 25%;
+      margin: 22rpx 0;
+      text-align: center;
+      .service-item-img{width: 98rpx;height: 98rpx;}
+    }
+  }
 }
-.news-list{
-	.u-body-item{
-		.u-body-item-title{
-			margin-bottom: 15rpx;
-		}
-		.foot{
-			font-size: 24rpx;
-			color: #ddd;
-			.time{
-				margin-left: 24rpx;
-			}
-		}
-	}
+
+.news{
+  padding: 0 30rpx;
+  .news-list{
+    ::v-deep {
+      .u-card__head{
+        padding-bottom: 0 !important;
+      }
+    }
+    &-head{
+      border-bottom: 1px solid #9F9F9F;
+      &-item{
+        margin-bottom: 17rpx;
+        .card-head-title{
+          font-size: 36rpx;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 600;
+          color: #000000;
+          line-height: 50rpx;
+          letter-spacing: 1px;
+        }
+      }
+    }
+    
+    &-body{
+      &-item{
+        border-bottom: 1px solid #E1E1E1;
+        
+        .news-text{
+          &-title{
+            margin-bottom: 12rpx;
+            font-size: 30rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #000000;
+            line-height: 41rpx;
+          }
+          &-foot{
+            justify-content: space-between;
+            
+            view:first-child{
+              font-size: 20rpx;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #8C8C8C;
+              line-height: 28rpx;
+              letter-spacing: 1px;
+            }
+            
+            view:last-child{
+              font-size: 20rpx;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #8C8C8C;
+              line-height: 28rpx;
+              letter-spacing: 1px;
+            }
+          }
+        }
+      }
+    }
+  }
 }
+
+// .news-list{
+// 	.u-body-item{
+// 		.u-body-item-title{
+// 			margin-bottom: 15rpx;
+// 		}
+// 		.foot{
+// 			font-size: 24rpx;
+// 			color: #ddd;
+// 			.time{
+// 				margin-left: 24rpx;
+// 			}
+// 		}
+// 	}
+// }
 .u-card-wrap { 
 	background-color: $u-bg-color;
 	padding: 1px;
@@ -100,7 +194,7 @@ page{background-color: #f2f2f2;}
 .u-body-item {
 	// font-size: 32rpx;
 	color: #333;
-	padding: 20rpx 10rpx;
+	padding: 30rpx 0;
 }
 	
 .u-body-item image {

h5_web/pages/index/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="index">
+    <!-- <view class="index-head"></view> -->
     <view class="index-header">
       <view class="index-header-container">
         <view class="index-header-left"></view>
@@ -11,7 +12,7 @@
             <u-badge size="mini" type="error" count="7" :absolute="false" class="header-top-notice-badge"></u-badge>
           </view>
           <view class="header-top-scan">
-            <u-icon name="scan" color="#FFFFFF" size="48"></u-icon>
+            <u-icon name="scan" color="#FFFFFF" size="48" class="header-scan-icon"></u-icon>
           </view>
         </view>
         <view class="index-header-banner">
@@ -27,80 +28,85 @@
         </view>
       </view>
     </view>
-		<u-card class="service" :border="false" :foot-border-top="false" :full="true" border-radius="0">
-			<view class="service-head" slot="head">
-				<view class="card-head-title">综合服务</view>
-			</view>
-			<view class="service-body u-flex u-flex-wrap u-row-left" slot="body">
-				<view class="service-item" @click="openPage('pages/policyNews/policyNews')">
-					<image class="service-item-img" src="../../static/img/index-service-01.png" mode="aspectFill"></image>
-					<view class="service-item-text">政策资讯</view>
-				</view>
-				<view class="service-item" @click="openPage('pages/recruitment/recruitment')" >
-					<image class="service-item-img" src="../../static/img/index-service-02.png" mode="aspectFill"></image>
-					<view class="service-item-text">招聘就业</view>
-				</view>
-				<view class="service-item" @click="openPage('pages/cooperativeEnterprise/cooperativeEnterprise')" >
-					<image class="service-item-img" src="../../static/img/index-service-03.png" mode="aspectFill"></image>
-					<view class="service-item-text">合作企业</view>
-				</view>
-				<view class="service-item" @click="openPage('pages/schools/schools')" >
-					<image class="service-item-img" src="../../static/img/index-service-04.png" mode="aspectFill"></image>
-					<view class="service-item-text">合作院校</view>
-				</view>
-				<view class="service-item" @click="openPage('pages/skillsTraining/skillsTraining')" >
-					<image class="service-item-img" src="../../static/img/index-service-05.png" mode="aspectFill"></image>
-					<view class="service-item-text">技能培训</view>
-				</view>
-				<view class="service-item" @click="openPage('pages/basicTraining/basicTraining')" >
-					<image class="service-item-img" src="../../static/img/index-service-06.png" mode="aspectFill"></image>
-					<view class="service-item-text">适应性培训</view>
-				</view>
-				<view class="service-item" @click="openPage('pages/upgrade/upgrade')" >
-					<image class="service-item-img" src="../../static/img/index-service-07.png" mode="aspectFill"></image>
-					<view class="service-item-text">学历提升</view>
-				</view>
-				<view class="service-item" @click="openPage('pages/inbuild/inbuild','创业指引')" >
-					<image class="service-item-img" src="../../static/img/index-service-08.png" mode="aspectFill"></image>
-					<view class="service-item-text">创业指导</view>
-				</view>
-			</view>
-		</u-card>
-		<u-card class="news-list" 
-			:body-style="{'padding-top':0}"
-			:border="false" 
-			:foot-border-top="false" 
-			:full="true" border-radius="0"
-		>
-			<view class="news-list-head" slot="head">
-				<view class="news-list-head-item">
-					<view class="card-head-title">新闻动态</view>
-					<view @click="openPage('/pages/newsInformation/newsInformation')">更多<u-icon name="arrow-right" color="#A3A3A3"></u-icon></view>
-				</view>
-			</view>
-			<view class="news-list-body" slot="body">
-				<u-nodata notice="暂无新闻" v-if="newsList.length==0"></u-nodata>
-				<view
-					v-for="(item,index) in newsList" 
-					@click="$u.route('/pages/newsDetails/newsDetails',{artId:item.artId})"
-					:key="item.artId" 
-					class="u-body-item u-flex u-border-bottom u-col-between u-row-between"
-				>
-					<view class="news-text">
-						<view class="u-body-item-title u-line-2">{{item.artTitle}}</view>
-						<view class="foot u-flex">
-							<view class="">{{item.artCategoryName}}</view>
-							<view class="time">{{$u.timeFormat(item.createTime.replace(/-/g, '/'), 'mm月dd日 hh时MM分')}}</view>
-						</view>
-					</view>
-					<image :src="item.artImage" mode="aspectFill"></image>
-				</view>
-			</view>
-		</u-card>
+    
+    <view class="service">
+      <view class="service-body u-flex u-flex-wrap u-row-left">
+        <view class="service-item" @click="openPage('pages/policyNews/policyNews')">
+          <image class="service-item-img" src="../../static/img/index-service-01.png" mode="aspectFill"></image>
+          <view class="service-item-text">政策资讯</view>
+        </view>
+        <view class="service-item" @click="openPage('pages/recruitment/recruitment')" >
+          <image class="service-item-img" src="../../static/img/index-service-02.png" mode="aspectFill"></image>
+          <view class="service-item-text">招聘就业</view>
+        </view>
+        <view class="service-item" @click="openPage('pages/cooperativeEnterprise/cooperativeEnterprise')" >
+          <image class="service-item-img" src="../../static/img/index-service-03.png" mode="aspectFill"></image>
+          <view class="service-item-text">合作企业</view>
+        </view>
+        <view class="service-item" @click="openPage('pages/schools/schools')" >
+          <image class="service-item-img" src="../../static/img/index-service-04.png" mode="aspectFill"></image>
+          <view class="service-item-text">合作院校</view>
+        </view>
+        <view class="service-item" @click="openPage('pages/skillsTraining/skillsTraining')" >
+          <image class="service-item-img" src="../../static/img/index-service-05.png" mode="aspectFill"></image>
+          <view class="service-item-text">技能培训</view>
+        </view>
+        <view class="service-item" @click="openPage('pages/basicTraining/basicTraining')" >
+          <image class="service-item-img" src="../../static/img/index-service-06.png" mode="aspectFill"></image>
+          <view class="service-item-text">适应性培训</view>
+        </view>
+        <view class="service-item" @click="openPage('pages/upgrade/upgrade')" >
+          <image class="service-item-img" src="../../static/img/index-service-07.png" mode="aspectFill"></image>
+          <view class="service-item-text">学历提升</view>
+        </view>
+        <view class="service-item" @click="openPage('pages/inbuild/inbuild','创业指引')" >
+          <image class="service-item-img" src="../../static/img/index-service-08.png" mode="aspectFill"></image>
+          <view class="service-item-text">创业指导</view>
+        </view>
+      </view>
+    </view>
+    
+    <view class="news">
+      <u-card class="news-list"
+      	:body-style="{'padding-top':0}"
+      	:border="false" 
+      	:foot-border-top="false" 
+        :head-border-bottom="false"
+      	:full="true" 
+        :border-radius="10"
+        margin="0"
+      >
+      	<view class="news-list-head" slot="head">
+      		<view class="news-list-head-item">
+      			<view class="card-head-title">新闻动态</view>
+      			<view @click="openPage('/pages/newsInformation/newsInformation')">更多<u-icon name="arrow-right" color="#A3A3A3"></u-icon></view>
+      		</view>
+      	</view>
+      	<view class="news-list-body" slot="body">
+      		<u-nodata notice="暂无新闻" v-if="newsList.length==0"></u-nodata>
+      		<view
+      			v-for="(item,index) in newsList" 
+      			@click="$u.route('/pages/newsDetails/newsDetails',{artId:item.artId})"
+      			:key="item.artId" 
+      			class="news-list-body-item u-body-item u-flex u-border-bottom u-col-between u-row-between"
+      		>
+      			<view class="news-text">
+      				<view class="news-text-title u-body-item-title u-line-2">{{item.artTitle}}</view>
+      				<view class="news-text-foot foot u-flex u-flex-wrap">
+      					<view>{{item.artCategoryName}}</view>
+      					<view>{{$u.timeFormat(item.createTime.replace(/-/g, '/'), 'mm-dd hh:MM')}}</view>
+      				</view>
+      			</view>
+      			<image :src="item.artImage" mode="aspectFill"></image>
+      		</view>
+      	</view>
+      </u-card>
+    </view>
     
     <!-- ########################## -- 底部导航栏 -- ################################ -->
     <u-tabbar
       :list="tabbarConfig.tabbarList"
+      :height="tabbarConfig.height"
       :mid-button="tabbarConfig.midButton"
       :inactive-color="tabbarConfig.inactiveColor"
       :active-color="tabbarConfig.activeColor"

h5_web/pages/jobDetails/jobDetails.vue

@@ -21,8 +21,8 @@
     		<view slot="body">
           <view class="jobdetails-head-cardbody">
             <view class="container" @tap="tapHeadCardBody(recruitmentData)">
-              <view class="image">
-                <u-image width="86rpx" height="86rpx" :src="recruitmentData.img" mode="aspectFill"></u-image>
+              <view class="container-image">
+                <image :src="recruitmentData.img" mode="aspectFill" class="image"></image>
               </view>
               <view class="content">
                 <view class="content-left">
@@ -105,7 +105,12 @@
        * 企业信息事件
        */
       tapHeadCardBody(param){
-        
+        this.$u.route({
+        	url: 'pages/businessDetails/businessDetails',
+        	params: {
+        	  flag: 'jobdetails'
+        	}
+        });
       },
       /**
        * 企业位置事件

h5_web/pages/jobDetails/scss/jobDetails.scss

@@ -62,6 +62,15 @@
           flex-wrap: wrap;
           border-bottom: 1px solid #e4e7ed;
           
+          .container-image{
+            .image{
+              width: 86rpx;
+              height: 86rpx;
+              box-shadow: 0px 0px 10px 0px rgba(77, 77, 77, 0.23);
+              border-radius: 7px;
+            }
+          }
+          
           .content{
             margin-left: 4%;
             width: 80%;

h5_web/pages/mine/mine.vue

@@ -92,6 +92,7 @@
     <!-- ########################## -- 底部导航栏 -- ################################ -->
     <u-tabbar
       :list="tabbarConfig.tabbarList"
+      :height="tabbarConfig.height"
       :mid-button="tabbarConfig.midButton"
       :inactive-color="tabbarConfig.inactiveColor"
       :active-color="tabbarConfig.activeColor"

h5_web/pages/mycode/mycode.vue

@@ -49,6 +49,7 @@
     <!-- ########################## -- 底部导航栏 -- ################################ -->
     <u-tabbar
       :list="tabbarConfig.tabbarList"
+      :height="tabbarConfig.height"
       :mid-button="tabbarConfig.midButton"
       :inactive-color="tabbarConfig.inactiveColor"
       :active-color="tabbarConfig.activeColor"

h5_web/pages/recruitment/recruitment.vue

@@ -69,7 +69,7 @@
     	<u-tabs bg-color="transparent" :list="dataAreaTabsList" @change="dataAreaTabsChange" :current="dataAreaTabsCurrent" />
       <view class="recruitment-dataarea-card" v-for="(item,index) in recommendListData" :key="index" @tap="tapDataAreaCard(item)">
         <view class="dataarea-card-left">
-          <u-image width="101rpx" height="101rpx" :src="item.img" mode="aspectFill"></u-image>
+          <image :src="item.img" mode="aspectFill" class="image"></image>
         </view>
         <view class="dataarea-card-content">
           <view class="dataarea-content-left">
@@ -253,9 +253,21 @@
 			},
       recommendCardMoreClick(index) {
         console.log("recommendCardMoreClick: ",index);
+        this.$u.route({
+        	url: 'pages/cooperativeEnterprise/cooperativeEnterprise',
+        	params: {
+        	  flag: 'recruitment'
+        	}
+        });
       },
       tapRecommendSwiperItem(param){
         console.log("tapRecommendSwiperItem: ",param);
+        this.$u.route({
+        	url: 'pages/businessDetails/businessDetails',
+        	params: {
+        	  flag: 'recruitment'
+        	}
+        });
       },
       dataAreaTabsChange(index) {
         console.log("dataAreaTabsChange: ",index);

h5_web/pages/recruitment/scss/recruitment.scss

@@ -46,6 +46,7 @@ page{background-color: #f2f2f2;}
             .img{
             	width: 94rpx;
             	height: 94rpx;
+              box-shadow: 0px 0px 10px 0px rgba(77, 77, 77, 0.23);
               border-radius: 10rpx;
             }
             
@@ -102,7 +103,16 @@ page{background-color: #f2f2f2;}
       padding: 5%;
       width: 100%;
       background-color: #FFFFFF;
-      border-radius: 10px;
+      border-radius: 10rpx;
+      
+      .dataarea-card-left{
+        .image{
+          width: 101rpx;
+          height: 101rpx;
+          box-shadow: 0 0 10rpx 0 rgba(77, 77, 77, 0.23);
+          border-radius: 5rpx;
+        }
+      }
       
       .dataarea-card-content{
         margin-left: 4%;

h5_web/static/svg/index-head-bg.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="750px" height="369px" viewBox="0 0 750 369" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 12</title>
+    <defs>
+        <path d="M0,325.4375 L0,0 L749.900444,0 L749.900444,325.4375 L750,325.4375 C670.807922,351.61469 533.00972,369 375.440456,369 C217.792548,369 79.2719568,351.636573 0.0995564376,325.4375 L0.0995564376,325.4375 L0,325.4375 Z" id="path-1"></path>
+        <linearGradient x1="50%" y1="1.5625%" x2="50%" y2="88.9821427%" id="linearGradient-3">
+            <stop stop-color="#80AA92" offset="0%"></stop>
+            <stop stop-color="#2A322B" offset="100%"></stop>
+        </linearGradient>
+        <filter x="-20.5%" y="-22.4%" width="141.0%" height="144.7%" filterUnits="objectBoundingBox" id="filter-4">
+            <feGaussianBlur stdDeviation="24" in="SourceGraphic"></feGaussianBlur>
+        </filter>
+        <linearGradient x1="50%" y1="1.5625%" x2="50%" y2="88.9821427%" id="linearGradient-5">
+            <stop stop-color="#2A322B" offset="0%"></stop>
+            <stop stop-color="#80AA92" offset="100%"></stop>
+        </linearGradient>
+        <filter x="-20.5%" y="-22.4%" width="141.0%" height="144.7%" filterUnits="objectBoundingBox" id="filter-6">
+            <feGaussianBlur stdDeviation="24" in="SourceGraphic"></feGaussianBlur>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-12">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="形状结合" fill="#2A322B" xlink:href="#path-1"></use>
+            <g id="编组-13" mask="url(#mask-2)" opacity="0.900000036">
+                <g transform="translate(0.000000, 1.000000)">
+                    <ellipse id="椭圆形" fill="url(#linearGradient-3)" filter="url(#filter-4)" cx="175.5" cy="161.019362" rx="175.5" ry="161.019362"></ellipse>
+                    <ellipse id="椭圆形备份" fill="url(#linearGradient-5)" filter="url(#filter-6)" cx="464.5" cy="213.980638" rx="175.5" ry="161.019362"></ellipse>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

h5_web/tabbarconfig.js

@@ -23,8 +23,9 @@ module.exports = {
       customIcon: false,
     }
   ],
+  height: '53px',
   midButton: true,
   inactiveColor: '#909399',
   activeColor: '#303133',
-  midButtonSize: 90
+  midButtonSize: 80
 }