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

root/bind/applyList.vue

@@ -199,7 +199,7 @@
 					}
 					
 					uni.navigateTo({
-						url:'/root/detail/user?' + that.G.objToStr(params)
+						url:'/root/detail/userShare?' + that.G.objToStr(params)
 					})
 				}
 			},

root/bind/inviteList.vue

@@ -380,7 +380,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

@@ -356,7 +356,7 @@
 		</u-popup>
 
 		<view class="g_h_104" style="background-color: #ededed"></view>
-		<g-panel-fixed style="box-shadow: 0 -4px 12px #ededed">
+		<!-- <g-panel-fixed style="box-shadow: 0 -4px 12px #ededed">
 			<slot>
 				<view class="g_pl_20 g_pr_20 g_flex_row_center flex_center flex_nw" style="width: 100%">
 					<view class="g_flex_1 g_flex_column_center">
@@ -366,7 +366,7 @@
 					</view>
 				</view>
 			</slot>
-		</g-panel-fixed>
+		</g-panel-fixed> -->
 
 		<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height="600px" :mask-close-able="true">
 			<mainPanel :showBg="true" :rid="rid" :oid="oid" :active="1" :name="orderDetail.userName" :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
@@ -776,7 +776,7 @@ export default {
 				isShowJob: false,
 			};
 			uni.navigateTo({
-				url: "/root/detail/user?" + that.G.objToStr(params),
+				url: "/root/detail/userShare?" + that.G.objToStr(params),
 			});
 		},
 

root/detail/job.vue

@@ -825,7 +825,7 @@ export default {
 									jobDetailShow: false,
 								};
 								uni.navigateTo({
-									url: "/root/detail/user?" + that.G.objToStr(params),
+									url: "/root/detail/userShare?" + that.G.objToStr(params),
 								});
 							}
 						},
@@ -973,7 +973,7 @@ export default {
 				isShowJob: true,
 			};
 			uni.navigateTo({
-				url: "/root/detail/user?" + that.G.objToStr(params),
+				url: "/root/detail/userShare?" + that.G.objToStr(params),
 			});
 		},
 

root/detail/userShare.vue

@@ -611,8 +611,10 @@ export default {
 				}
 			}
 			this.G.Get(this.api.bind_subscribeSubmit + "/" + that.uid, { agencyId: that.agencyInfo.id, agencyName: that.agencyInfo.fullName, source: _code, remark: " " }, (res) => {
-				this.getAgencyInfo().then(() => {
-					that.getAgencyById().then(() => {});
+				that.getAgencyInfo().then(() => {
+					that.getAgencyById().then(() => {
+						that.G.checkToken();
+					});
 				});
 				uni.showToast({
 					title: "申请成功",