Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

pages/home/child/filter.vue

@@ -1,13 +1,13 @@
 <template>
-	<view class="gjFixed" v-if="show == 'special'" @click.stop @touchmove.stop.prevent>
+	<view class="gjFixed" v-if="show == 'special'" @click.stop="hideDrawer" @touchmove.stop.prevent>
-		<view class="filterContainer filterBox" style>
+		<view class="filterContainer filterBox" style @click.stop>
 			<scroll-view class style="padding: 0; background-color: #ededed" scroll-y>
 				<template v-for="item in anchorList">
-					<view :class="item.id == filterTo ? 'filterActive' : ''" class="g_c_3 g_fw_600" style="width: 84px; padding: 12px 0" @click="goAnchor(item)">{{ item.name }}</view>
+					<view :class="item.id == filterTo ? 'filterActive' : ''" class="g_c_3 g_fw_600 g_text_c" style="width: 84px; padding: 12px 0" @click="goAnchor(item)">{{ item.name }}</view>
 				</template>
 			</scroll-view>
 			<scroll-view class=" " :data-filter-to="filterTo" :scroll-into-view="filterTo" scroll-with-animation style="width: calc(100% - 100px); padding: 0 8px" scroll-y>
-				<view style="padding: 0 10px">
+				<view style="padding: 0 10px 32px 0">
 					<view class="sub" id="age">
 						<view class="title">年龄</view>
 						<view class="content g_bg_f">
@@ -315,6 +315,10 @@ export default {
 		// this.getType();
 	},
 	methods: {
+		hideDrawer() {
+      console.log('123123');
+			this.$emit("hideDrawer", "");
+		},
 		format(val) {
 			return val;
 		},

pages/home/index.vue

@@ -26,7 +26,7 @@
 						</div>
 					</div>
 					<div>
-						<div class="sticky">
+						<div class="sticky" v-if="isLogin">
 							<div class="g_flex_row_between flex_center" :class="toTop ? 'g_bg_f' : 'g_bg_f_5'" :style="{ 'box-shadow': toTop ? '0px 2px 3px 0px rgba(214, 214, 214, 0.3)' : '' }" id="tttop">
 								<div class="g_flex_1">
 									<u-tabs bg-color="transparent" from="index" gutter="20" :list="tabInfo.list" :is-scroll="true" :current="tabInfo.active" active-color="#00b666" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="34" duration="0.05" height="76"></u-tabs>
@@ -46,7 +46,6 @@
 										筛选
 										<span class="iconfont icon-shouqi g_fs_12 g_c_9 fst g_ml_4" v-if="whichOneShow == 'special'"></span>
 										<span class="iconfont icon-zhankai g_fs_12 g_c_9 fst g_ml_4" v-if="whichOneShow != 'special'"></span>
-										<g-filter :show="whichOneShow" ref="filterChild" top="43px" :getFilterDataNew="getFilterData" @filterObj="receiveFromChild"></g-filter>
 									</view>
 								</div>
 								<!-- <div class="g_flex_none g_flex_column_center g_fs_17 g_pr_26 g_pb_4" style="color: #576b95; text-decoration: underline" @click="goPage('/root/home/ignore')">忽略</div> -->
@@ -99,9 +98,11 @@
 					</div>
 				</div>
 			</scroll-view>
-			<div hover-class="none" style="position: fixed; right: 20px; bottom: 20px" hover-stop-propagation="false" @click="toRecord" v-if="isLogin">
+			<div hover-class="none" style="position: fixed; right: 20px; bottom: 20px; z-index: 0" hover-stop-propagation="false" @click="toRecord" v-if="isLogin">
 				<g-panel-image :url="cdnBaseImg + 'quick_application0610.svg'" size="96" />
 			</div>
+			<g-filter :show.sync="whichOneShow" @hideDrawer="(e)=>whichOneShow = e" ref="filterChild" top="43px" :getFilterDataNew="getFilterData" @filterObj="receiveFromChild"></g-filter>
+
 			<u-popup v-model="showPop" mode="bottom" uZindex="9999" border-radius="12" :closeable="true" :mask-close-able="true">
 				<div class="g_fs_18 g_text_c g_pt_32">
 					<div class="g_bg_f g_fw_600 g_pb_24">以下发单号向你发出关注邀请</div>
@@ -214,6 +215,7 @@ export default {
 		return {
 			scrollTo: "",
 			selectedCity: "全国",
+      whichOneShow:'',
 			toTop: false, // 筛序栏顶部状态
 			getFilterData: {
 				sex: "-1",

root/detail/job.vue

@@ -7,14 +7,15 @@
 			<g-loading />
 		</div>
 		<div v-if="speed == 1">
-			<view class="r_box g_flex_row_between flex_center g_pl_16 g_pr_16 g_fs_16" @click="goUserMain" style="height: 60px">
+			<view class="r_box" v-if="true">
+				<div class="g_flex_row_between flex_center g_pl_16 g_pr_16 g_fs_16 g_border_e_b" @click="goUserMain" style="height: 60px">
 					<view class="g_fw_600 g_mr_4 g_flex_column_center">项目方</view>
 					<view class="g_flex_row_end flex_center g_flex_1">
 						<span class="g_c_6" selectable="false" space="false" decode="false">{{ jobDetail.fullName ? jobDetail.fullName : jobDetail.agencyName }}</span>
 						<span class="iconfont icon-gengduo11 g_fs_14 g_c_6 g_ml_4"></span>
 					</view>
-			</view>
+				</div>
-			<div class="r_box g_mb_10 g_mt_10 g_pl_16 g_pr_16 servicePrice" @click="showFee" style="height: 60px">
+				<div class="g_mb_10 g_pl_16 g_pr_16 servicePrice" @click="showFee" style="height: 60px">
 					<div class="g_flex_row_between flex_center g_fs_16">
 						<div class="g_flex_row_start" style="flex: none">
 							<div class="g_fw_600 g_mr_4 g_hs_67 g_flex_column_center">代理佣金</div>
@@ -27,6 +28,7 @@
 						</div>
 					</div>
 				</div>
+			</view>
 
 			<!-- 基本信息 -->
 			<view class="g_bg_f g_pt_10 g_pl_16 g_pr_16 g_mt_10 g_kuaishou g_radius_8 g_pb_16">
@@ -170,8 +172,8 @@
 									</view>
 								</view>
 								<view class="" v-if="isLogin">
-									<view class="contactInfo" style="white-space: pre-line">{{ userInfo.noticeEndStr ? userInfo.noticeEndStr : "详情咨询：" + userInfo.tel }}</view>
+									<view class="contactInfo" style="white-space: pre-line">{{ loginInfo.noticeEndStr ? loginInfo.noticeEndStr : "详情咨询：" + loginInfo.tel }}</view>
-									<view class="g_fs_14 g_text_c g_mt_16" v-if="userInfo.agencyStatus == 1">
+									<view class="g_fs_14 g_text_c g_mt_16" v-if="loginInfo.agencyStatus == 1">
 										以上联系人，可以
 										<span class="g_fw_600" @click="changeContact" style="color: #576b95; text-decoration: underline">改成我的</span>
 									</view>
@@ -553,11 +555,8 @@ export default {
 		// 											"", this.jobDetail.jobName + " " + this.jobDetail.priceStr + " " + "好厂好工作 火热招聘中");
 		let that = this;
 		let path;
-		if (this.isMember) {
+		console.log("that.loginInfo", that.loginInfo);
-			path = `/root/detail/job?id=${that.jobDetail.id}&from=home&userId=${that.userInfo.user.id}`;
+		path = `/root/detail/job?scene=id=${that.jobDetail.id}_${that.loginInfo.user.id}_${1}`;
-		} else {
-			path = `/root/detail/job?id=${that.jobDetail.id}&from=home`;
-		}
 		return {
 			promise: new Promise((resolve, reject) => {
 				uni.showLoading({
@@ -586,6 +585,9 @@ export default {
 		return {
 			globalData: getApp().globalData,
 			videoContextTemp: {},
+			isSharePage: false, // 是否是分享页面的判断
+
+			shareUserId: null, // 分享人id
 			corpUserFlag: false,
 			agreeRadio: ["agree"],
 			isPerson: false,
@@ -675,14 +677,20 @@ export default {
 		console.log("详情", options);
 		if (options.id) {
 			this.uid = options.id;
+		} else if (options.scene) {
+			var sceneStr = decodeURIComponent(options.scene);
+			var sceneJson = this.G.sceneToJson(sceneStr);
+			console.log("sceneJson===", sceneJson);
+			this.uid = sceneJson.id.split("_")[0]; //职位id
+			this.shareUserId = sceneJson.id.split("_")[1]; //分享人id
+			this.isSharePage = true;
+			this.checkIsFans(this.shareUserId);
 		}
-		if (options.from) {
+		this.from = options.from || "home";
-			this.from = options.from;
-		}
 		if (!uni.getStorageSync("apply-token")) {
 			console.log("apply-token");
 			uni.navigateTo({
-				url: "/root/person/loginIndex?type=detail&path=/root/detail/job&id=" + options.id,
+				url: "/root/person/loginIndex?type=detail&path=/root/detail/job&scene=" + options.scene,
 			});
 			return;
 		}
@@ -698,8 +706,6 @@ export default {
 		// 		console.log("this.applyList", this.applyList);
 		// 	});
 		// }
-
-		console.log("this.applyList", this.applyList);
 	},
 	onShow() {
 		let that = this;
@@ -1422,7 +1428,7 @@ export default {
 				// 根据标签数量调整立即咨询背景位置
 				that.G.roundRect1(ctx, mycenter - 712 / 2, line7, 712, 100, 4, "#00b666"); // 立即咨询背景
 				// 根据标签数量调整立即咨询位置
-				that.G.fillTextLineBreak(ctx, "立即咨询", mycenter - 24 - ctx.measureText("立即咨询").width / 2 + 100, line7 + 65, 300, 120, "#fff", titleFontSize, "500"); // 立即咨询
+				that.G.fillTextLineBreak(ctx, "立即咨询", mycenter - 24 - ctx.measureText("立即咨询").width / 2, line7 + 65, 300, 120, "#fff", titleFontSize, "500"); // 立即咨询
 				// 绘制职位logo
 				uni.downloadFile({
 					url: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/goxj2-qpwbo.png",
@@ -1454,6 +1460,12 @@ export default {
 				console.log("all err", err);
 			});
 		},
+		checkIsFans(upAgencyId) {
+			let that = this;
+			that.G.Post("/assistant/circle/agency/checkUserTypeForAssistant", { upAgencyId }, (res) => {
+				console.log(res);
+			});
+		},
 	},
 };
 </script>

root/home/quickApplication.vue

@@ -315,6 +315,7 @@
 								.returnFeeDesp || "详询客服") + " \n\n" + "3. 薪资待遇：" + (res.record.salaryDetail ||
 							"详询客服") + "\n\n";
 						console.log("政策列表：", res);
+            that.setFormList()
 						that.jobData = [{
 								icon: "",
 								label: "报名职位",
@@ -376,7 +377,67 @@
 					}
 				);
 			},
-
+      setFormList(){
+				that.jobData = [{
+						icon: "",
+						label: "报名职位",
+						result: that.updateInfo.jobName,
+						path: "/root/other/search?from=record",
+						placeholder: "请选择报名职位",
+						fontColor: that.updateInfo.jobName == "请选择报名职位" ? "g_c_9" : "g_c_3",
+						tip: "applia-job",
+						require: true,
+						customRequire: true,
+						pColumn: 12,
+					},
+					{
+						icon: '',
+						label: '面试地址',
+						result: '',
+						value: that.updateInfo['interviewAddress'],
+						path: '',
+						addressDetail: {
+							latitude: that.updateInfo['interviewLat'],
+							longitude: that.updateInfo['interviewLng'],
+						},
+						tip: 'slot-choose&input-address',
+						placeholder: '请选择面试地址',
+						type: 'slot',
+						fontSize: '16px',
+						pColumn: 5,
+						pRow: 12,
+						require: false,
+						suffix: 'icon-dizhi1',
+					},
+					{
+						icon: "",
+						label: "面试时间",
+						result: "",
+						path: "",
+						value: that.updateInfo.interviewTimeStr,
+						tip: "slot-time",
+						require: true,
+						customRequire: true,
+						type: "slot",
+						pColumn: 12,
+						from: "reservation-time",
+					},
+					{
+						icon: "",
+						label: "财务结算",
+						result: "",
+						path: "",
+						value: "-",
+						tip: "slot-caiwu",
+						require: false,
+						customRequire: false,
+						type: "slot",
+						pColumn: 12,
+						from: "slot-caiwu",
+					},
+				];
+				that.$forceUpdate();
+      },
 			handleClickIDcard(e) {
 				this.info.idCard = e;
 			},

root/person/loginIndex.vue

@@ -128,7 +128,7 @@ export default {
       console.log('options', options)
       this.fromPageType = options.type
       if (options.type == 'detail') {
-        this.currentId = options.id
+        this.currentId = options.scene
       }
     },
     goHome() {
@@ -304,7 +304,7 @@ export default {
         })
       } else if (that.fromPageType == 'detail') {
         uni.reLaunch({
-          url: `${that.path}?id=${that.currentId}`,
+          url: `${that.path}?scene=${that.currentId}`,
         })
         uni.navigateBack({
           delta: 1,

root/person/teamManage.vue

@@ -28,12 +28,12 @@
 				</div>
 				<g-panel-fixed>
 					<div class="g_flex_row_center">
-						<div class="g_w_128 g_mr_20">
+						<div class="g_w_200 g_mr_20">
 							<g-button btnText="手动添加" size="auto" @clickBtn="goPage('/root/person/addOrUpdataMember')"></g-button>
 						</div>
-						<div class="g_w_128">
+						<!-- <div class="g_w_128">
 							<g-button btnText="微信邀请" size="auto" type="primary" class @clickBtn="goPage('/root/person/memberApplyQRCode')"></g-button>
-						</div>
+						</div> -->
 					</div>
 				</g-panel-fixed>
 				<!-- <div class="g_h_24"></div> -->