关注

root/bind/order.vue

@@ -33,7 +33,7 @@
               </view>
             </view>
             <g-loading :loading="loading" v-if="loading && speed == -1" />
-            <view v-if="!loading && speed == 0 && inviteNum <= 0" class="g_pt_130">
+            <view v-if="!loading && speed == 0 && inviteNum <= 0" class="g_pt_130" style="padding-top:130px">
               <g-empty :text="isLogin ? '暂无数据' : '请登录'" />
             </view>
             <view v-if="speed > 0 || inviteNum > 0">
@@ -400,7 +400,7 @@ export default {
           }
 
           uni.navigateTo({
-            url: '/root/detail/user?' + that.G.objToStr(params),
+            url: '/root/detail/userShare?' + that.G.objToStr(params),
           })
         } else {
           // 直接前往操作页

root/detail/apply.vue

@@ -42,7 +42,7 @@
 						</view> -->
 					</view>
 					<view class=" ">
-						<g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.agencyTel)" :remarkValue="orderDetail.agencyTel" :value="orderDetail.downFullName || orderDetail.downProviderName" />
+						<g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.downProviderName ? orderDetail.downProviderContactsTel : orderDetail.agencyTel)" :remarkValue="orderDetail.downProviderName ? orderDetail.downProviderContactsTel : orderDetail.agencyTel" :value="orderDetail.downFullName || orderDetail.downProviderName" />
 					</view>
 				</view>
 			</view>
@@ -89,17 +89,11 @@
 						</view>
 					</view>
 					<view class="g_flex_row_start">
-						<div v-if="orderDetail.idCardImageUrl" style="margin-right: 8px;">
+						<div v-if="orderDetail.idCardImageUrl" style="margin-right: 8px">
-							<g-panel-image :url="orderDetail.idCardImageUrl" radius="8" size="152" 
+							<g-panel-image :url="orderDetail.idCardImageUrl" radius="8" size="152" @clickItem="handleClickIDcard(orderDetail.idCardImageUrl)" />
-							@clickItem="handleClickIDcard(orderDetail.idCardImageUrl)" />
 						</div>
 						<div class="g_flex_row_start" v-if="orderDetail.userApplyOrderFiles && orderDetail.userApplyOrderFiles.length > 0">
-							<g-panel-image v-for="(item,index) in orderDetail.userApplyOrderFiles" :key='index'
+							<g-panel-image v-for="(item, index) in orderDetail.userApplyOrderFiles" :key="index" :url="item.url" radius="8" size="152" @clickItem="handleClickIDcard(item.url)" style="margin-right: 8px"> </g-panel-image>
-								:url="item.url" radius="8" size="152" @clickItem="handleClickIDcard(item.url)"
-								style="margin-right: 8px;"
-							>
-								
-							</g-panel-image>
 						</div>
 					</view>
 				</view>
@@ -880,11 +874,14 @@ export default {
 				imgs: "",
 				userName: this.orderDetail.userName,
 				userId: that.orderDetail.userId,
-				fujian:(that.orderDetail.userApplyOrderFiles && that.orderDetail.userApplyOrderFiles.length > 0) 
+				fujian:
-					   ?
+					that.orderDetail.userApplyOrderFiles && that.orderDetail.userApplyOrderFiles.length > 0
-				       that.orderDetail.userApplyOrderFiles.map(item => { return item.url }).join(',')
+						? that.orderDetail.userApplyOrderFiles
-					   :
+								.map((item) => {
-					   ''
+									return item.url;
+								})
+								.join(",")
+						: "",
 			};
 			uni.navigateTo({
 				url: "/root/detail/fellow?" + that.G.objToStr(params),

root/detail/userShare.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="p-root-detail-user g_w_all g_bg_page g_kuaishou">
-		<u-navbar backIconColor="#333" :borderBottom="false" :immersive="true" :customBack="goHome" :background="{ background: navColor }" backIconName="home"></u-navbar>
+		<u-navbar backIconColor="#333" :borderBottom="false" :immersive="true" :customBack="goHome" :background="{ background: navColor }" :backIconName="fromShare ? 'home' : 'arrow-left'"></u-navbar>
 		<view class="g_h_136 u-navbar-fixed" style="background-color: #caf1e0 !important"></view>
 		<div class style="background-color: #caf1e0 !important">
 			<view class="m-info g_p_20 g_pt_12 g_pb_0 g_bg_f g_position_rela" hover-class="none" style="margin-top: 0; border-radius: 8px 8px 0 0">
@@ -18,7 +18,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="g_flex_row_start flex_center g_mt_18 g_fs_14 g_c_8" hover-class="thover" @click="goPage('/root/person/info?active=1')">
+				<view class="g_flex_row_start flex_center g_mt_18 g_fs_14 g_c_8" hover-class="thover" @click="goMore">
 					<view class>{{ info.agencyName || info.fullName || "-" }}</view>
 					<i class="iconfont icon-gengduo11" style="line-height: 22px; font-size: 10px"></i>
 				</view>
@@ -44,14 +44,14 @@
 					</quickLogin>
 
 					<div style="width: calc(100vw - 40px)" v-else-if="isSelf">
-						<g-button btnText="不能关注自己" size="auto" type="disabled"></g-button>
+						<!-- <g-button btnText="不能关注自己" size="auto" type="disabled"></g-button> -->
 					</div>
 					<!--  -->
 					<div v-else>
 						<div class="g_flex_row_center" v-if="info.recordStatus == 1">
 							<!-- 已关注 1 -->
 							<!-- class="g_mr_10" -->
-							<div style="width: calc(100vw - 40px)">
+							<div style="width: calc(100vw - 40px)" @click="handleCancel">
 								<g-button btnText="已关注发单号" size="auto" type="disabled" class></g-button>
 							</div>
 							<!-- <div style="width:calc((100vw - 50px) / 2);">
@@ -59,7 +59,7 @@
               </div>-->
 						</div>
 
-						<div style="width: calc(100vw - 40px)" v-else-if="info.recordStatus == 2">
+						<div style="width: calc(100vw - 40px)" v-else-if="info.recordStatus == 2" @click="handleCancel">
 							<g-button btnText="互相关注" size="auto" type="disabled" class></g-button>
 						</div>
 
@@ -86,7 +86,7 @@
 					<!-- 正常职位 -->
 					<div class="m-detail">
 						<div class="g_h_10"></div>
-						<g-list-job :recordStatus="info.recordStatus" @successLogin="jobLogin" :showShare="false" :list="query.list" :loading="loading" :speed="speed" :isShowLoginBtn="isLogin ? false : true" :query="query" emptyText="暂无职位" emptySubText=" " />
+						<g-list-job :recordStatus="info.recordStatus" @successLogin="jobLogin" :isSelf="isSelf" :showShare="false" :list="query.list" :loading="loading" :speed="speed" :isShowLoginBtn="isLogin ? false : true" :query="query" emptyText="暂无职位" emptySubText=" " />
 					</div>
 
 					<div v-if="info.himSeeBtn == 0" style="padding-top: 260rpx">
@@ -129,8 +129,11 @@ export default {
 	data() {
 		return {
 			numSlot: [],
+			fromShare: false,
 			navColor: "rgb(255,255,255,0)",
 			isLogin: null,
+			isShowMore: true,
+			isShowJob: true,
 			submitConfirm: false,
 			pageSpeed: 0,
 			agencyId: 0,
@@ -219,11 +222,16 @@ export default {
 			var sceneStr = decodeURIComponent(options.scene);
 			var sceneJson = this.G.sceneToJson(sceneStr);
 			this.scene = options.scene;
+			this.fromShare = true;
+
 			console.log("sceneJson===", sceneJson);
 			this.inviteUserId = sceneJson.id.split("_")[1]; //被关注团队的邀请人id
 			this.uid = sceneJson.id.split("_")[0]; // 被关注团队的id
 		} else {
 			this.uid = options.id;
+			this.isShowMore = options.isShowMore ? true : false;
+			this.isShowJob = options.isShowJob;
+			this.fromShare = false;
 		}
 		this.type = options.type ? options.type : "";
 		this.jobDetailShow = options.jobDetailShow || true;
@@ -275,9 +283,15 @@ export default {
 	},
 	methods: {
 		goHome() {
+			if (this.fromShare) {
 				uni.switchTab({
 					url: "/pages/home/index",
 				});
+			} else {
+				uni.navigateBack({
+					delta: 1,
+				});
+			}
 		},
 		getAgencyInfo() {
 			let that = this;
@@ -294,6 +308,59 @@ export default {
 				});
 			});
 		},
+		goMore() {
+			let that = this,
+				str = "";
+			if (this.fromShare || this.isSelf) {
+				return false;
+			}
+			this.G.isLogin();
+			if (this.G.isLogin()) {
+				console.log(that.isShowMore);
+				console.log(that.info);
+				if (that.isShowMore == true) {
+					if (that.info.recordStatus == 2) {
+						str = 3;
+					} else {
+						str = that.info.up;
+					}
+					console.log("that.type", that.type);
+					uni.navigateTo({
+						url: "/root/bind/more?delta=2&id=" + that.agencyId + "&himSee=" + that.info.himSee + "&lookHim=" + that.info.lookHim + "&type=" + str + "&from=" + that.type + "&lid=" + that.info.lookHimOperateId + "&hid=" + that.info.himSeeOperateId,
+					});
+				}
+			}
+		},
+		handleCancel() {
+			let that = this;
+			this.G.isLogin();
+			if (this.G.isLogin()) {
+				that.G.handleConfirm({
+					content: "是否取消关注该发单号？",
+					success: (res) => {
+						if (res.confirm) {
+							that.G.Get(
+								that.api.bind_cancelApply + "/" + that.agencyId,
+								{
+									agencyId: that.agencyId,
+								},
+								() => {
+									uni.showToast({
+										icon: "success",
+										title: "取消关注成功",
+									});
+									setTimeout(() => {
+										that.getAgencyById();
+										that.getDefault("init");
+										// that.getList();
+									}, 1500);
+								}
+							);
+						}
+					},
+				});
+			}
+		},
 		getDetail() {
 			let that = this;
 			// 123123
@@ -315,9 +382,9 @@ export default {
 							that.isSelf = true;
 						}
 					}
-					if (that.info.supplierAccount == 0) {
+					// if (that.info.supplierAccount == 0) {
-						that.isShowMore = false;
+					// 	that.isShowMore = false;
-					}
+					// }
 					that.agencyId = res.agencyId;
 					that.numSlot = [
 						{
@@ -509,7 +576,7 @@ export default {
 									title: "关注成功",
 								});
 								setTimeout(() => {
-									that.getDetail();
+									that.getAgencyById();
 								}, 800);
 							}
 						);
@@ -570,6 +637,8 @@ export default {
 			return new Promise((reso, reject) => {
 				this.G.Get(this.api.order_getAgencyByIdForApply, { agencyId: that.uid, inviteUserId: this.inviteUserId }, (res) => {
 					console.log("resresresresresres++++++++++++++", res);
+					console.log("resresresresresres++++++++++++++", that.agencyInfo);
+					console.log("resresresresresres++++++++++++++", that.isSelf);
 					that.pageSpeed = 1;
 					that.info = res;
 					that.agencyId = res.id;
@@ -604,9 +673,12 @@ export default {
 		},
 		successLogin(e) {
 			let that = this;
+			this.isLogin = true;
 			console.log("successLogin", e);
 			this.getAgencyInfo().then(() => {
 				that.getAgencyById().then(() => {
+					that.getDefault("init");
+
 					if (that.info.recordStatus == 3 || that.info.recordStatus == 4 || that.info.recordStatus == 6) {
 						that.handleSubmit();
 					} else {
@@ -625,8 +697,8 @@ export default {
 			this.isLogin = true;
 			that.getAgencyInfo().then(() => {
 				that.getAgencyById().then(() => {
-					that.query.page++;
+					// that.query.page++;
-					that.getDefault("concat");
+					that.getDefault("init");
 				});
 			});
 		},