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

App.vue

@@ -283,9 +283,13 @@ export default {
 							text: String(res.approvePassHasNotRed),
 						});
 					} else {
-						uni.removeTabBarBadge({
+             try {
-							index: 2,
+                uni.removeTabBarBadge({
-						});
+                  index: 2,
+                });
+              } catch (error) {
+                  console.log("当前页面不是 TabBar 页面，无法移除 badge");
+              }
 					}
 				});
 			}

pages/person/index.vue

@@ -764,9 +764,13 @@ export default {
 					});
 					that.readed = false;
 				} else {
-					uni.removeTabBarBadge({
+					 try {
-						index: 2,
+                uni.removeTabBarBadge({
-					});
+                  index: 2,
+                });
+              } catch (error) {
+                  console.log("当前页面不是 TabBar 页面，无法移除 badge");
+              }
 					that.readed = true;
 				}
 			});

root/home/quickApplication.vue

@@ -192,6 +192,7 @@ export default {
 	},
 	data() {
 		return {
+			detailRes:{},
 			IS_CREATOR: false,
 			jobType: 2,
 			isFans: 2,
@@ -241,6 +242,7 @@ export default {
 					id: $data.leafCateId,
 				},
 				(res) => {
+					that.detailRes = res.record;
 					let policyStr;
 					if (that.isFans == 2) {
 						policyStr = "1. 佣金：" + (res.record.returnFeeType !== "" ? that.G.setReturnFee(res.record.returnFee, res.record.returnFeeType) : "详询客服") + " \n\n" + "2. 佣金详情：" + (res.record.returnFeeDesp || "详询客服") + " \n\n" + "3. 薪资待遇：" + (res.record.salaryDetail || "详询客服") + "\n\n";
@@ -503,8 +505,20 @@ export default {
 					};
 				})
 			);
+			// let _upAgencyName = '';
+			// if (that.detailRes.status == 0) {
+			// 	_upAgencyName = that.detailRes.fullName;
+			// } else if (that.detailRes.status == 1) {
+			// 	if (that.detailRes.providerNameAll) {
+			// 		_upAgencyName = `${that.detailRes.providerName}（${that.detailRes.providerNameAll}）`;
+			// 	} else {
+			// 		_upAgencyName = that.detailRes.providerName;
+			// 	}
+			// } else {
+			// 	_upAgencyName = that.detailRes.userName;
+			// }
+			// submitInfo.upAgencyName = _upAgencyName ? _upAgencyName : '';
 			console.log("submitInfo", submitInfo);
-			// return
 			that.G.Post("/yishoudan/common/order/addBatch", submitInfo, (res) => {
 				// uni.hideLoading();
 				uni.showToast({