身份标识

ghsApp/src/admin/billing/affirm.vue

@@ -211,11 +211,7 @@ export default {
 				const {
 					data: { id, orderSn }
 				} = res;
-				// 如果是客户跳转到客户成功页pagesClient/official/clientApply   供货员工下单到 /admin/billing/result
-				let url =
-					this.getLoginInfo.identity == "1"
-						? "pagesClient/official/clientApply"
-						: `/admin/billing/result?orderId=${id}&orderSn=${orderSn}`;
+				let url = `/admin/billing/result?orderId=${id}&orderSn=${orderSn}`;
 				uni.redirectTo({
 					url: url,
 					success: result => {},

ghsApp/src/admin/billing/customerAffirm.vue

@@ -175,10 +175,7 @@ export default {
 					data: { orderId, orderSn }
 				} = res;
 				// 如果是客户跳转到客户成功页pagesClient/official/clientApply   供货员工下单到 /admin/billing/result
-				let url =
-					this.getLoginInfo.identity == "1"
-						? "pagesClient/official/clientApply"
-						: `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}`;
+				let url = `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}`;
 				uni.redirectTo({
 					url: url,
 					success: result => {},

glhs/src/mixins/globalMixins.js

@@ -40,26 +40,18 @@ export default {
 							needRedirect = false;
 						}
 					})
-
 					if (needRedirect == true) {
 						//花店员工
-						if (res.data.admin.identity == '2') {
+						if (res.data.shopAdminId == '0') {
 							this.$util.pageTo({
-								url: "/admin/home/workbench",
-								type: 3
-							});
-						//买花人
-						} else if(res.data.admin.identity == '1'){
-							this.$util.pageTo({
-								url: "/admin/official/latest-shop",
+								url: "/admin/official/index",
 								type: 2
-							});
-						//未知身份
+							})
 						}else{
 							this.$util.pageTo({
-								url: "/admin/official/index",
-								type: 2
-							});
+								url: "/admin/home/workbench",
+								type: 3
+							})
 						}
 					}
 					getUser()

hdApp/src/admin/billing/affirm.vue

@@ -183,11 +183,7 @@ export default {
 							const {
 								data: { orderId, orderSn }
 							} = res;
-							// 如果是客户跳转到客户成功页pagesClient/official/clientApply   供货员工下单到 /admin/billing/result
-							let url =
-								self.getLoginInfo.identity == "1"
-									? "pagesClient/official/clientApply"
-									: `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}&type=zuhe`;
+							let url = `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}&type=zuhe`;
 							uni.redirectTo({url: url});
 						});
 					}

hdApp/src/admin/billing/affirmGhs.vue

@@ -397,11 +397,7 @@ export default {
 				const {
 					data: { id, orderSn }
 				} = res;
-				// 如果是客户跳转到客户成功页pagesClient/official/clientApply   供货员工下单到 /admin/billing/result
-				let url =
-					this.getLoginInfo.identity == "1"
-						? "pagesClient/official/clientApply"
-						: `/admin/billing/result?orderId=${id}&orderSn=${orderSn}`;
+				let url = `/admin/billing/result?orderId=${id}&orderSn=${orderSn}`;
 				uni.redirectTo({
 					url: url,
 					success: result => {},

hdApp/src/admin/billing/affirmGoods.vue

@@ -187,11 +187,7 @@ export default {
 							const {
 								data: { orderId, orderSn }
 							} = res;
-							// 如果是客户跳转到客户成功页pagesClient/official/clientApply   供货员工下单到 /admin/billing/result
-							let url =
-								self.getLoginInfo.identity == "1"
-									? "pagesClient/official/clientApply"
-									: `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}`;
+							let url = `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}`;
 							uni.redirectTo({url: url});
 						});
 					}

hdApp/src/admin/billing/customerAffirm.vue

@@ -174,11 +174,7 @@ export default {
 				const {
 					data: { orderId, orderSn }
 				} = res;
-				// 如果是客户跳转到客户成功页pagesClient/official/clientApply   供货员工下单到 /admin/billing/result
-				let url =
-					this.getLoginInfo.identity == "1"
-						? "pagesClient/official/clientApply"
-						: `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}`;
+				let url = `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}`;
 				uni.redirectTo({
 					url: url,
 					success: result => {},

hdApp/src/pagesPurchase/cosNext.vue

@@ -245,11 +245,7 @@ export default {
               const {
                 data: { orderId, orderSn }
               } = res;
-              // 如果是客户跳转到客户成功页pagesClient/official/clientApply   供货员工下单到 /admin/billing/result
-              let url =
-                self.getLoginInfo.identity == "1"
-                  ? "pagesClient/official/clientApply"
-                  : `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}&type=zuhe`;
+              let url = `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}&type=zuhe`;
               uni.redirectTo({ url: url });
             });
           }