Merge remote-tracking branch 'remotes/origin/master' into old

2023-09-20 09:25:09 +08:00 · 2023-09-20 09:25:09 +08:00 · 3ae87e293a
commit 3ae87e293a
parent 701c54745f d1aaded460
2 changed files with 2 additions and 2 deletions
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@ -396,6 +396,7 @@
 				merchantUpdateAPI(data).then(res => {
 					Toast(res.message)
 					setTimeout(() => {
+						
 						uni.switchTab({
 							url: '/pages/moreProject/moreProject',
 							fail: (err) => {
--- a/pages/product/transactionApplication/application.vue
+++ b/pages/product/transactionApplication/application.vue
@ -95,7 +95,6 @@
 		margin-bottom: 70rpx;

 	}
-
 	.content_title_a {
 		width: 89rpx;
 		height: 37rpx;
@ -109,7 +108,7 @@
 		border-radius: 15rpx 0 15rpx 0;

 	}
-	
+

 	.content_title_b {
 		width: 89rpx;