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

pages/my/my.vue

@@ -66,12 +66,12 @@
 				<image src="../../static/img/apply.png" mode=""></image>
 				我的申请
 				<image src="../../static/img/right.svg" mode=""></image>
-			</view>
+			</view> -->
 			<view class="btnList" @click="go('/pageMy/my/set')">
 				<image src="../../static/img/set.svg" mode=""></image>
 				设置
 				<image src="../../static/img/right.svg" mode=""></image>
-			</view> -->
+			</view>
 			<view class="btnList" @click="go('/pageMy/help/help')">
 				<image src="../../static/img/help.svg" mode=""></image>
 				帮助与反馈

pages/projectInfo/projectInfo.vue

@@ -53,6 +53,9 @@
 				</view>
 			</view>
 			<!-- 技能标签 end -->
+			<view v-if="info.jobSources" class="prolist">
+				来源：{{info.jobSources}}
+			</view>
 		</view>
 		<view class="head">
 			<view class="proname proneed">

pages/projectInfo/workInfo.vue

@@ -56,6 +56,9 @@
 				</view>
 			</view>
 			<!-- 技能标签 end -->
+			<view v-if="info.jobSources" class="prolist">
+				来源：{{info.jobSources}}
+			</view>
 		</view>
 		<view class="head">
 			<!-- <view class="proname proneed">
@@ -248,7 +251,8 @@
 				const self = this;
 				workDetail(self.workId).then(res => {
 					self.info = res.data.data;
-					self.status = res.data.data.detailStatus;
+					self.status = res.data.data.status;
+					self.missionNo = res.data.data.missionNo;
 					self.latitude = self.info.lat;
 					self.longitude = self.info.lon;
 					self.covers[0].latitude = self.info.lat;

vue.config.js

@@ -3,8 +3,8 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                // target: 'http://192.168.3.108:8000', // 本地服务接口地址
-				target: "http://39.98.184.58:8000",  // 阿里云后台地址
+                target: 'http://192.168.3.108:8000', // 本地服务接口地址
+				// target: "http://39.98.184.58:8000",  // 阿里云后台地址
 				// target: "http://192.168.0.101:8000",  // 本地网关
                 ws: true,
                 pathRewrite: {