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

main.js

@@ -65,6 +65,7 @@ export function createApp () {
           uni.setStorageSync('apply-userinfo-copy', JSON.stringify(res));
           uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id，方便获取
           uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
+          if (res.agencyStatus == 1) {
             G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
               uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
               uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员
@@ -73,6 +74,8 @@ export function createApp () {
               uni.setStorageSync("SHOW_INVITE", 1);
               resolve(res)
             });
+          }
+
         },
           function fail (err) {
             console.log(err);
@@ -91,13 +94,16 @@ export function createApp () {
           uni.setStorageSync('apply-userinfo-copy', JSON.stringify(res));
           uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id，方便获取
           uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
+       if (res.agencyStatus == 1) {
             G.Get(apiInfo.login_agencyInfo, {}, (aRes) => {
               uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
               uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员
+
               // 登录跳转到首页的判断
               uni.setStorageSync("SHOW_INVITE", 1);
               resolve(res)
             });
+          }
         })
       })
     },

pages/person/index.vue

@@ -337,8 +337,10 @@ export default {
 				this.getAuthInfo();
 				this.getData();
 				this.getNum();
-
+        if(uni.getStorageSync("apply-userinfo").agencyStatus == 1){
 				this.getCompanyInfo();
+
+        }
 			}
 		} else {
 			that.waitNum_ups = 0;

root/detail/userShare.vue

@@ -1,7 +1,7 @@
 <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="fromShare ? 'home' : 'arrow-left'"></u-navbar>
-		<view class=" u-navbar-fixed" style="background-color: #caf1e0 !important;height:160px"></view>
+		<view class="u-navbar-fixed" style="background-color: #caf1e0 !important; height: 160px"></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">
 				<view class="g_flex_row_start">
@@ -96,15 +96,7 @@
 			</div>
 		</div>
 		<!-- 发布职位确认框 -->
-		<u-modal v-model="submitConfirm" 
-							width="90%" 
-							negativeTop="150" 
-							confirmText="发布职位" 
-							:showTitle="false" 
-					   :confirmStyle="{ color: '#576b95', 'font-weight': 600 }" 
-						 :cancelStyle="{ color: '#000', 'font-weight': 600 }" 
-						 :showConfirmButton="false"
-		>
+		<u-modal v-model="submitConfirm" width="90%" negativeTop="150" confirmText="发布职位" :showTitle="false" :confirmStyle="{ color: '#576b95', 'font-weight': 600 }" :cancelStyle="{ color: '#000', 'font-weight': 600 }" :showConfirmButton="false">
 			<div class="g_fs_17 g_text_c">
 				<div class style="padding: 42px 24px 36px">
 					<div class="g_text_c g_fw_600 g_c_0">创建团队/企业</div>
@@ -616,6 +608,9 @@ 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(() => {});
+				});
 				uni.showToast({
 					title: "申请成功",
 					icon: "none",
@@ -684,10 +679,7 @@ export default {
 			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 {
@@ -698,8 +690,6 @@ export default {
 					});
 				}
 			}
-				});
-			});
 		},
 		jobLogin() {
 			let that = this;