From 87b11809254eab6d4d3c632e669ee3369ac84e48 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 12 Jul 2024 09:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/package/record/splitPackageRecord.vue | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue
index 3ff4110c..7fec82ed 100644
--- a/src/pages/package/record/splitPackageRecord.vue
+++ b/src/pages/package/record/splitPackageRecord.vue
@@ -114,23 +114,10 @@
 			};
 		},
 		onLoad(option) {
-<<<<<<< Updated upstream
 			uni.setNavigationBarTitle({
 			  title: option.title
 			})
-			var typeCode = "SplitPackage"
-			getBusinessType(typeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
-					this.showFromLocationPopup();
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
-=======
 			this.getBusinessType();
->>>>>>> Stashed changes
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {