Merge branch 'master' of https://gitee.com/beiwu/jobslink-user-clent

components/companyList/companyList.vue

@@ -21,6 +21,7 @@
 		<!-- <view class="allName">
 			{{ companyitem.companyName }}
 		</view> -->
+		<view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
 		<view class="timeAddress" style="position: relative;">
 			<view style="display: flex;align-items: center;">
 				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
@@ -147,6 +148,7 @@ export default {
 	font-size: 24rpx;
 	color: #999999;
 	margin: 10rpx 0;
+	padding: 10rpx 0;
 }
 
 .allName {
@@ -207,6 +209,7 @@ export default {
 	overflow: hidden;
 	box-sizing: border-box;
 	padding: 20rpx;
+	padding-bottom: 0;
 	border-radius: 20rpx;
 	margin-top: 20rpx;
 }

components/companyList/workList.vue

@@ -21,6 +21,7 @@
 		<!-- <view class="allName">
 			{{ companyitem.jobCompanyName }}
 		</view> -->
+		<view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
 		<view class="timeAddress" style="position: relative;">
 			<!-- <view v-if="companyitem.missionCompanyName">
 				{{ companyitem.missionCompanyName }}
@@ -155,6 +156,7 @@ export default {
 	font-size: 24rpx;
 	color: #999999;
 	margin: 10rpx 0;
+	padding: 10rpx 0;
 }
 
 .allName {
@@ -215,6 +217,7 @@ export default {
 	overflow: hidden;
 	box-sizing: border-box;
 	padding: 20rpx;
+	padding-bottom: 0;
 	border-radius: 20rpx;
 	margin-top: 20rpx;
 }

pages/projectInfo/workInfo.vue

@@ -14,7 +14,7 @@
 				招聘人数：{{info.peopleNum}}
 			</view>
 			<view class="prolist">
-				行业类型：{{info.tradeNames}}
+				行业类型：{{info.tradeNames?info.tradeNames:info.jobCompanyIndustry}}
 			</view>
 			<view class="prolist">
 				工种类型：{{info.skillNames}}