Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

my/jilu/bossMianshiDetail.vue

@@ -388,13 +388,15 @@ export default {
 			recordId:that.recordId,
 			interviewResultType:that.resultType,
 			interviewResultMsg:that.text,
-			
+			interviewProcesses:4
 		}).then(res => {
 			that.isWork=false
 			that.showResult=false
 			if (res.code === 0) {
 				that.info.interviewResultMsg=that.text
 				that.info.interviewResultType=that.resultType
+				that.info.interviewProcesses=4
+				that.currentStep=4
 			} else {
 				uni.showToast({
 					title: res.msg,
@@ -412,15 +414,12 @@ export default {
 			recordId:that.recordId,
 			interviewRecordType:that.recordList[that.isCheck],
 			interviewRecordMsg:that.text,
-			interviewProcesses:4
 		}).then(res => {
 			that.isWork=false
 			that.showRecord=false
 			if (res.code === 0) {
 				that.info.interviewRecordMsg=that.text
 				that.info.interviewRecordType=that.recordList[that.isCheck]
-				that.info.interviewProcesses=4
-				that.currentStep=4
 			} else {
 				uni.showToast({
 					title: res.msg,

my/jilu/mianshiDetail.vue

@@ -146,7 +146,7 @@
                   <view class="step-title">面试结果</view>
                   <view class="step-desc">面试完后30天内可向招聘方获取面试结果</view>
 				  <u-tag v-if="currentStep>=4&&info.interviewResultType==null" text="等待面试结果" type="primary" mode="plain" size="mini"/>
-				  <u-tag v-if="currentStep>=4&&info.interviewResultType!=null" :text="info.interviewResultType==0?'面试通过':(info.interviewResultType==1?info.interviewResultMsg||'面试未通过':'结果待定')" :type="info.interviewResultType==0?'primary':'error'" mode="light" size="mini"/>
+				  <u-tag v-if="currentStep>=4&&info.interviewResultType!=null" :text="info.interviewResultType==0?'面试通过':(info.interviewResultType==2?'面试未通过':'结果待定')" :type="info.interviewResultType==0?'primary':'error'" mode="light" size="mini"/>
 				  <u-tag v-if="currentStep==3" text="获取面试结果" type="info" mode="light" size="mini"/>
                 </view>
                 <view class="step-line"></view>
@@ -287,7 +287,7 @@ export default {
 		if(this.info.interviewResultType==null)
 			return this.$queue.showToast('还未出结果，请耐心等待')
 		uni.showModal({
-		  title: "面试"+(this.info.interviewResultType==0?'已通过':(this.info.interviewResultType==1?'未通过':'结果待定')),
+		  title: "面试"+(this.info.interviewResultType==0?'已通过':(this.info.interviewResultType==2?'未通过':'结果待定')),
 		  content: this.info.interviewResultMsg||'祝您生活愉快',
 		  editable: false,
 		  showCancel:false