Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

src/api/job.js

@@ -77,10 +77,20 @@ export function vocationalBillApi(data) {
 		// headers: { "Content-Type": "application/x-www-form-urlencoded" },
 	});
 }
+
+// // 自有职位报名
+// export function recordSelfBillApi (data) {
+//   return request({
+//     url: "/yishoudan/common/order/add",
+//     method: "post",
+//     data: data,
+//     headers: { "Content-Type": "application/x-www-form-urlencoded" },
+//   });
+// }
 // 一才录单报名
 export function recordBillYicaiApi(data) {
 	return request({
-		url: "/assistant/apply/handler/add",
+		url: "/yishoudan/common/order/add",
 		method: "post",
 		data:data,
 		headers: { "Content-Type": "application/x-www-form-urlencoded" },

src/components/FirstJob/components/recordSuccess.vue

@@ -80,7 +80,7 @@ export default {
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
    */
   created() {
-    this.firminfo = JSON.parse(sessionStorage.getItem("CURRENT_FIRM"));
+    this.firminfo = JSON.parse(sessionStorage.getItem("CURRENT_FIRM")) ||  JSON.parse(sessionStorage.getItem("CURRENT_FIRM_YICAI"));
     console.log(this.firminfo);
   },
   /**

src/components/FirstJob/detail.vue

@@ -332,11 +332,11 @@
 										<span slot="label" class>面试时间</span>
 										<span>{{ jobDetail.interviewDuration || "-" }}</span>
 									</a-descriptions-item>
-									<!-- <a-descriptions-item class="test1">
+									<a-descriptions-item class="test1">
 										<span slot="label" class>面试地点</span>
 										<span>{{ jobPoses.interview.posContent || "-" }}</span>
 									</a-descriptions-item>
-									<a-descriptions-item class="test1">
+									<!-- <a-descriptions-item class="test1">
 										<span slot="label" class>宿舍地址</span>
 										<span>{{ jobPoses.room.posContent ? jobPoses.room.posContent : "-" }}</span>
 									</a-descriptions-item> -->

src/components/FirstJob/joblist.vue

@@ -546,16 +546,7 @@
 											>元/月
 										</template>
 									</div>
-									<div class="jobpricehour" v-html="getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue)">
-										<!-- <template v-if="item.hourlyPay"
-                    ><span>{{ item.hourlyPay }}</span
-                    >元/小时</template
-                  >
-                  <template v-else-if="item.dayPay"
-                    ><span>{{ item.dayPay }}</span
-                    >元/日</template
-                    >-->
-									</div>
+									<div class="jobpricehour" v-html="getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue)"></div>
 								</div>
 							</div>
 						</span>
@@ -1354,6 +1345,7 @@ export default {
 			try {
 				newdata = {
 					agencyId: "3087",
+					// agencyId: "2743", //测试版
 					recruitment: "1",
 					keys: "",
 					pageNum: 1,