Merge remote-tracking branch 'origin/master'

pages.json

@@ -55,6 +55,9 @@
 			{
 				"path": "work/workDetail"
 			},
+			{
+				"path": "work/bossDetail"
+			},
 			{
 				"path": "mine/collect",
 				"style": {

pages/index/center.vue

@@ -18,9 +18,9 @@
 				<view class="tips">
 					手机号：{{phone}}
 				</view>
-				<!-- <view>
-					湖南瀚海黎明信息科技有限公司 * HR
-				</view> -->
+				<view>
+					{{numInfo.vipType}}
+				</view>
 			</view>
 			<!-- <view class="headBtn" @click="headBtn">
 				角色切换

pages_order/mine/MemberRecharge.vue

@@ -17,10 +17,13 @@
 				<view class="tips">
 					手机号：{{userInfo.phone}}
 				</view>
+				<!-- <view>
+					{{numInfo.vipType}}
+				</view> -->
 			</view>
 		</view>
 
-		<view class="openvip">开通VIP</view>
+		<view class="openvip">{{numInfo.vipType}}</view>
 
 		<view class="options">
 			<view 
@@ -90,16 +93,27 @@
 			return {
 				radiovalue: false,
 				mixinsListApi : 'commonQueryVipType',
-				vipId : ''
+				vipId : '',
+				numInfo:{}
 			}
 		},
 		onShow() {
 			this.$store.commit('getUserInfo')
+			//判断如果是登录状态则获取信息
+			this.getUserCenterData();
 		},
 		computed: {
 			headImage() {
 				return '/static/image/center/headImage.png'
 			},
+			//获取个人中心基础信息的接口
+			getUserCenterData(){
+				this.$api('getUserCenterData',{}, res =>{
+					if(res.code == 200){
+						this.numInfo = res.result
+					}
+				})
+			},
 			vip(){
 				let vip = {}
 				this.list.forEach(n => {

pages_order/work/bossDetail.vue

@@ -6,16 +6,16 @@
 		
 		<view class="box">
 			<view class="boss-box">
-				<image src="/static/image/center/headImage.png" 
+				<image :src="hanHaiMember.headImage" 
 				class="headImage"
 				mode="aspectFill"></image>
 				
 				<view class="info">
 					<view class="title">
-						李先生<text></text>
+						{{personInfo.name}}<text></text>
 					</view>
 					<view class="desc">
-						广州有限公司 · 老板
+						{{companyInfo.companyName}}
 						
 						<view class="vip">
 							vip
@@ -29,15 +29,15 @@
 					任职企业
 				</view>
 				<view class="firm-info">
-					<image src="/static/image/center/headImage.png"
+					<image :src="companyInfo.logo"
 					class="image"
 					mode="aspectFill"></image>
 					<view class="info">
 						<view class="name">
-							广州有限公司
+							{{companyInfo.companyName}}
 						</view>
 						<view class="desc">
-							0-20人
+							{{companyInfo.financing}}*{{companyInfo.industry}}*{{companyInfo.number}}
 						</view>
 					</view>
 				</view>
@@ -80,6 +80,9 @@
 			return {
 				id : 0,
 				detail : {},
+				personInfo:{},
+				companyInfo:{},
+				hanHaiMember:{},
 				collectionFlag : false,
 				mixinsListApi : 'employeeQueryJobList',
 				urls: ['https://via.placeholder.com/400x200.png/3c9cff/fff'],
@@ -89,7 +92,7 @@
 			this.id = id
 		},
 		onShow() {
-			// this.getDetail()
+			this.getDetail()
 		},
 		methods: {
 			getDetail(){
@@ -101,8 +104,11 @@
 				}
 				this.$api('employeeQueryJobById', data, res => {
 					if(res.code == 200){
-						this.detail = res.result.employJob
+						this.detail = res.result.jobInfo
 						this.collectionFlag = res.result.collectionFlag
+						this.personInfo = res.result.personInfo
+						this.companyInfo = res.result.companyInfo
+						this.hanHaiMember  = res.result.hanHaiMember
 					}
 				})
 			},

pages_order/work/workDetail.vue

@@ -31,8 +31,8 @@
 			</view>
 			
 			<view class="userHead">
-				<userHead :headImage="detail.headImage"
-				:name="detail.name" :phoneCall="detail.phone"/>
+				<userHead :image="hanHaiMember.headImage" :tips="personInfo.phone" 
+				:name="personInfo.name" :phoneCall="personInfo.phone"/>
 			</view>
 			
 			<view class="address">
@@ -52,11 +52,11 @@
 					></uv-icon>
 				</view>
 				
-				<view class="tag-list">
+				<!-- <view class="tag-list">
 					<view>
 						距您14.6千米
 					</view>
-				</view>
+				</view> -->
 			</view>
 			
 			<view class="info">
@@ -94,17 +94,17 @@
 		</view>
 		
 		<view class="boss-box"
-		@click="$utils.navigateTo('/pages_order/work/bossDetail?id=1')">
+		@click="$utils.navigateTo('/pages_order/work/bossDetail?id='+detail.id)">
 			<view class="image">
-				<image src="../static/work/g.png" mode=""></image>
+				<image :src="companyInfo.logo" mode=""></image>
 			</view>
 			<view class="shop-box"
 			>
 				<view class="title">
-					广州有限公司
+					{{companyInfo.companyName}}
 				</view>
 				<view class="desc">
-					天使论A
+					{{companyInfo.financing}}*{{companyInfo.industry}}*{{companyInfo.number}}
 				</view>
 			</view>
 			<view class="arrow-right">
@@ -155,6 +155,9 @@
 				text : '',
 				id : 0,
 				detail : {},
+				personInfo:{},
+				companyInfo:{},
+				hanHaiMember:{},
 				collectionFlag : false,
 				mixinsListApi : 'employeeQueryJobList',
 			}
@@ -176,8 +179,11 @@
 				}
 				this.$api('employeeQueryJobById', data, res => {
 					if(res.code == 200){
-						this.detail = res.result.employJob
+						this.detail = res.result.jobInfo
 						this.collectionFlag = res.result.collectionFlag
+						this.personInfo = res.result.personInfo
+						this.companyInfo = res.result.companyInfo
+						this.hanHaiMember  = res.result.hanHaiMember
 					}
 				})
 			},