From 71867a6f37938e86ad28914ff2bb85fdb373a1e4 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Fri, 22 Nov 2024 13:52:43 +0800
Subject: [PATCH] 11

---
 pages/index/checkShop.vue      | 2 +-
 pages/index/home.vue           | 4 ++--
 pages/inventory/goodsList1.vue | 2 +-
 pages/login/login.vue          | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/index/checkShop.vue b/pages/index/checkShop.vue
index 4448d4b..ec2c7ac 100644
--- a/pages/index/checkShop.vue
+++ b/pages/index/checkShop.vue
@@ -128,7 +128,7 @@
 						that.tui.toast('登录成功', 2000, true)
 						setTimeout(() => {
 							uni.reLaunch({
-								url: '/package1/other/newLogisticsIndex'
+								url: '/package2/other/newLogisticsIndex'
 							})
 						}, 200)
 					},
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 8d0f116..498b5da 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -19,7 +19,7 @@
 			if (uni.getStorageSync('hiver_token')) {
 				if (uni.getStorageSync('wayValue') == 1) {
 					uni.reLaunch({
-						url: '/package1/other/newLogisticsIndex'
+						url: '/package2/other/newLogisticsIndex'
 					})
 				} else if (uni.getStorageSync('wayValue') == 0) {
 					uni.reLaunch({
@@ -27,7 +27,7 @@
 					})
 				} else if (uni.getStorageSync('wayValue') == 2) {
 					uni.reLaunch({
-						url: '/package1/other/custom'
+						url: '/package2/other/custom'
 					})
 				}
 			} else if(option.khid){
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 525adbe..fc5af35 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -11307,7 +11307,7 @@
 								value.unitPrice = !value.isChangePrice ? value.lsprice : value.unitPrice
 								value.discountAmount = !value.isChangePrice ? value.lsprice : value.unitPrice
 								value.returnPrice = !value.isChangeReturnPrice ? value.lsprice : value.unitPrice
-							} else if (that.priceType == 1) { //批发
+							} else if (that.priceType == 1) { //批发1
 								value.unitPrice = !value.isChangePrice ? value.wholesalePrice : value.unitPrice
 								value.discountAmount = !value.isChangePrice ? value.wholesalePrice : value.unitPrice
 								value.returnPrice = !value.isChangeReturnPrice ? value.wholesalePrice : value.unitPrice
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5cdca8c..ae57f24 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -129,7 +129,7 @@
 			}
 			if(uni.getStorageSync('hiver_token') != '' && uni.getStorageSync('wayValue') == 2){
 				uni.reLaunch({
-					url: '/package1/other/custom?saleId=' + this.saleId + '&userId=' + this.userId
+					url: '/package2/other/custom?saleId=' + this.saleId + '&userId=' + this.userId
 				})
 			}
 			this.getCaptchaImg();
@@ -212,7 +212,7 @@
 							if(this.wayValue == 2){ //下游客户登录
 								setTimeout(() => {
 									uni.reLaunch({
-										url: '/package1/other/custom?saleId=' + this.saleId
+										url: '/package2/other/custom?saleId=' + this.saleId
 									})
 								}, 200)
 								this.tui.toast('登录成功', 2000, true)
@@ -269,7 +269,7 @@
 									that.tui.toast('登录成功', 2000, true)
 									setTimeout(() => {
 										uni.reLaunch({
-											url: '/package1/other/newLogisticsIndex'
+											url: '/package2/other/newLogisticsIndex'
 										})
 									}, 200)
 								} else {