From 34b6e0548fb7f3d88842914db89d7cd603a5e531 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 01 八月 2024 23:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
App.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/App.vue b/App.vue
index b46206b..d8ad526 100644
--- a/App.vue
+++ b/App.vue
@@ -25,10 +25,17 @@
setTimeout(async () => {
const res = await this.$store.dispatch('getCurrentInfo');
// #ifndef PUB_CUSTOMER
- if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
- uni.reLaunch({
- url: '/pages/home/supplier-home'
- })
+ if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
+ if(this.currentInfo.type==='admin'){
+ uni.reLaunch({
+ url: '/sub_pages/partner/delivery/delivery-home'
+ })
+ }else{
+ uni.reLaunch({
+ url: '/pages/home/supplier-home'
+ })
+ }
+
} else {
uni.reLaunch({
url: '/pages/login/supplier-login'
@@ -395,7 +402,9 @@
.m-t-15 {
margin-top: 30rpx;
}
-
+ .p-t-12{
+ padding-top: 30rpx;
+ }
.m-t-icon {
margin-top: 8rpx;
}
@@ -767,7 +776,6 @@
.msg-tip {
font-size: 24rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 400;
color: #999999;
line-height: 34rpx;
@@ -885,7 +893,6 @@
border-radius: 62rpx;
font-size: 32rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 600;
color: #FFFFFF;
line-height: 80rpx;
@@ -902,7 +909,6 @@
border-radius: 62rpx;
border: 2rpx solid #666666;
font-size: 32rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 92rpx;
@@ -913,7 +919,6 @@
.close-parent {
position: relative;
font-size: 28rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 600;
color: #000000;
line-height: 40rpx;
--
Gitblit v1.9.3