同步

App.vue

@@ -2,7 +2,10 @@
 export default {
 	onShow: function (options) {
 		console.log("show 项目init：", options, decodeURIComponent(options.query.scene));
+		// 清除扫码获取的id信息
 		uni.removeStorageSync("scene");
+		uni.removeStorageSync("user_scene");
+		uni.removeStorageSync("user_options", options);
 
 		if (options.query.id) {
 			uni.setStorageSync("apply-jobdetail-id", options.query.id);

pages/home/index.vue

@@ -19,7 +19,7 @@
 					</div>
 					<!-- #ifdef APP-PLUS || H5 || MP-TOUTIAO || MP-KUAISHOU -->
 					<div>
-						<div class="g_mb_10 g_bg_f_5 sticky g_flex_row_between">
+						<div class=" g_bg_f_5 sticky g_flex_row_between">
 							<div class="g_flex_1">
 								<u-tabs bg-color="transparent" from="index" :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>
 							</div>
@@ -30,7 +30,7 @@
 					<!-- #endif -->
 					<!-- #ifdef MP-WEIXIN -->
 					<div>
-						<div class="g_mb_10 g_bg_f_5 sticky g_flex_row_between">
+						<div class=" g_bg_f_5 sticky g_flex_row_between">
 							<div class="g_flex_1">
 								<u-tabs bg-color="transparent" from="index" :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>
 							</div>

pages/login/index.vue

@@ -262,29 +262,31 @@ export default {
 			uni.setStorageSync("apply-token", $data.token); // 单独存储 -- token，方便获取
 			uni.setStorageSync("apply-agencyId", $data.user.agencyId); // 单独存储 -- 代理id，方便获取
 			uni.setStorageSync("apply-supplierAccount", $data.supplierAccount); // 单独存储 -- 是否是发单号，方便获取 0.不是发单号 1.是发单号
-			that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
-				console.log("获取团队信息:", aRes);
-				uni.setStorageSync("IS_CREATOR", aRes.agency.userId == $data.user.id || $data.admin == true ? 1 : 2); // 1是创建者 2是普通成员
-				if (that.fromPageType == "detail") {
-					uni.navigateBack({
-						delta: 1,
-					});
-					return;
-				}
-				// 登录跳转到首页的判断
-				uni.setStorageSync("SHOW_INVITE", 1);
-				console.log("that.path", that.path);
 			if (!that.path) {
 				uni.switchTab({
 					url: "/pages/home/index",
 				});
+			} else if (that.fromPageType == "detail") {
+				uni.navigateBack({
+					delta: 1,
+				});
+				return;
 			} else {
 				// 固定跳首页
 				uni.reLaunch({
 					url: that.path,
 				});
 			}
+			if ($data.agencyStatus == 1) {
+				that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
+					console.log("获取团队信息:", aRes);
+					uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
+					uni.setStorageSync("IS_CREATOR", aRes.agency.userId == $data.user.id || $data.admin == true ? 1 : 2); // 1是创建者 2是普通成员
+
+					// 登录跳转到首页的判断
+					uni.setStorageSync("SHOW_INVITE", 1);
 				});
+			}
 		},
 
 		// 发送验证码

pages/workBench/index.vue

@@ -11,7 +11,8 @@
 				<view class="g_fw_600 g_mb_10 g_fs_20">{{ upNum }}</view>
 				<view class="g_c_6">关注发单号</view>
 			</view>
-			<view class="g_mt_10" v-if="agencyInfo.supplierAccount == 1">
+      <!-- v-if="agencyInfo.supplierAccount == 1" -->
+			<view class="g_mt_10" v-if="false">
 				<!-- 发单号 -->
 				<g-panel-card-num :list="orderDataList" :subhead="agencyInfo.fullName || ''" titleNav="/root/merchantManagement/orderManagement" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="我的发单号" :bottomBox="true" bottomNav="/root/merchantManagement/jobForm" @clickItem="handleClickNum" />
 			</view>

root/bind/myMain.vue

@@ -2,7 +2,7 @@
 	<view class="p-root-bind-my-main g_flex_column_center flex_center g_w_all g_h_all g_bg_f_5 g_kuaishou" :style="{ 'background-image': showBg ? 'url(' + cdnBaseImg + 'share_bg.svg)' : '' }" :class="showBg ? 'g_pt_32' : ''">
 		<view class="g_flex_row_center g_fs_22 g_c_3 g_fw_600 g_mb_24" v-if="showBg">邀请粉丝（代理）关注我的发单号</view>
 		<!-- #ifdef APP-PLUS || MP-WEIXIN -->
-		<image :src="shareJobImg" style="width: 343px; height: 555px; margin: 0 auto; display: block" mode=""></image>
+		<image :src="shareJobImg" show-menu-by-longpress style="width: 343px; height: 555px; margin: 0 auto; display: block" mode=""></image>
 		<!-- #endif -->
 		<!-- #ifdef APP-PLUS -->
 		<canvas

root/detail/user.vue

@@ -150,18 +150,37 @@ export default {
 		if (this.loginId == options.id && options.id) {
 			this.isSelf = true;
 		}
-		this.scene = options.scene;
-		if (this.scene) {
-			let _str = decodeURIComponent(this.scene);
-			this.uid = _str.split("=")[1];
+		this.G.checkToken().then((info) => {
+			console.log("info11", info);
+			if (!info.msg) {
+				if (uni.getStorageSync("user_scene") || options.scene) {
+					this.scene = uni.getStorageSync("user_scene") ? decodeURIComponent(uni.getStorageSync("user_scene")) : decodeURIComponent(options.scene);
+					this.uid = this.scene.split("=")[1];
+
+					console.log("this.uid", this.uid);
+					uni.removeStorageSync("user_scene");
 				} else {
-			this.uid = options.id;
+					if (uni.getStorageSync("user_options")) {
+						options = uni.getStorageSync("user_options");
 					}
 					this.type = options.type ? options.type : "";
-		this.isShowMore = options.isShowMore;
-		this.isShowJob = options.isShowJob;
+					this.isShowMore = options.isShowMore ? options.isShowMore : "";
+					this.isShowJob = options.isShowJob ? options.isShowJob : "";
 					this.jobDetailShow = options.jobDetailShow || true;
 					this.from = options.shareForm;
+					this.uid = options.id;
+					uni.removeStorageSync("user_options", options);
+				}
+				this.getDetail();
+			} else {
+				if (options.scene) {
+					uni.setStorageSync("user_scene", options.scene);
+				} else {
+					uni.setStorageSync("user_options", options);
+				}
+			}
+		});
+
 		if (options.bindid) {
 			this.bindid = options.bindid;
 		}
@@ -193,6 +212,7 @@ export default {
 			// this.G.isLogin();
 			// if (this.G.isLogin()) {
 			that.pageSpeed = 0;
+			if (that.uid) {
 				that.G.Get(
 					that.api.bind_enterpriseDetail + "/" + that.uid,
 					{
@@ -230,6 +250,8 @@ export default {
 						that.getList();
 					}
 				);
+			}
+
 			// }
 		},
 		goDetailUser() {

root/person/applyManage.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="g_pb_32">
 		<div v-for="(item, index) in applyList">
-			<div class="g_pb_8 g_pt_16 g_pl_16 g_border_e_b g_c_9">
+			<div class="g_pb_8 g_pt_16 g_pl_16 g_border_e_b g_c_9" v-if="item.length > 0">
 				{{ index == "near" ? "近三天" : "三天前" }}
 			</div>
 			<div class="g_flex_row_between flex_center i-items" style="padding: 20px 16px 8px" v-for="i in item" :key="item.id">

root/person/memberApplyAdd.vue

@@ -45,7 +45,6 @@ export default {
 		if (uni.getStorageSync("scene") || options.scene) {
 			console.log("XXXXXXXXXXXX");
 			//扫小程序码携带参数
-
 			var sceneStr = uni.getStorageSync("scene") ? decodeURIComponent(uni.getStorageSync("scene")) : decodeURIComponent(options.scene);
 			var sceneJson = this.G.sceneToJson(sceneStr);
 			console.log("sceneJson===", sceneJson);

utils/ajax.js

@@ -104,6 +104,11 @@ let data = {
     if ($parmas.formdata || $method == "POST" || $method == "PUT") {
       $header['content-type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
     }
+    for (const k in $parmas) {
+      if ($parmas[k] == undefined || $parmas[k] == 'undefined') {
+        $parmas[k] = ''
+      }
+    }
     console.log("公共参数，+++++", Object.assign($parmas, that.setPublicParams()));
     uni.request({
       url: ajaxUrl + $url,
@@ -128,17 +133,17 @@ let data = {
             });
           }, 1500);
         } else if (resData.status == 500 || resData.status == 502) {// 某种原因导致接口提示该状态码
-          if (resData.msg == '系统异常，请稍后') {
-            uni.reLaunch({
-              url: '/root/other/error'
-            });
-          } else {
+          // if (resData.msg == '系统异常，请稍后') {
+          //   uni.reLaunch({
+          //     url: '/root/other/error'
+          //   });
+          // } else {
           uni.showToast({
             title: resData.msg,
             icon: "none"
           });
           failback(resData.msg);
-          }
+          // }
         } else if (resData.status == 2002) {
           uni.showToast({
             title: resData.msg,