From af2a86dbbe05d74b00a6e7bdc426e26bb0453654 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 31 七月 2024 11:35:34 +0800
Subject: [PATCH] fix bug
---
App.vue | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/App.vue b/App.vue
index d028cdd..c721ede 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'
@@ -234,12 +241,19 @@
padding-top: 40rpx;
padding-bottom: 40rpx;
font-size: var(--title_font_size2);
+ color: #20613D;
+ font-weight: 600;
}
.title-before-blue:before {
- content: "|";
- color: #3140A2;
+ content: "||";
+
margin-right: 20rpx;
+ color: #20613D;
+ margin-right: 20rpx;
+ min-width: 20rpx;
+ background-color: #20613D;
+ border-radius: 6rpx;
}
.blue {
@@ -388,7 +402,9 @@
.m-t-15 {
margin-top: 30rpx;
}
-
+ .p-t-12{
+ padding-top: 30rpx;
+ }
.m-t-icon {
margin-top: 8rpx;
}
@@ -1085,7 +1101,7 @@
margin-right: 20rpx;
border: 2rpx solid #FFFFFF;
background-size: 100% 100%;
- background-color: #fff;
+ background-color: #fff;
}
.store-name {
@@ -1095,6 +1111,7 @@
line-height: 40rpx;
margin-top: 20rpx;
}
+
.store-name.t1 {
color: #666;
}
@@ -1106,6 +1123,7 @@
line-height: 34rpx;
margin-top: 8rpx;
}
+
.store-address.t1 {
color: #666;
}
@@ -1120,6 +1138,7 @@
color: #5B8C71;
line-height: 52rpx;
text-align: center;
+ margin-top: 30rpx;
}
.store-sc {
@@ -1132,6 +1151,7 @@
color: #FFFFFF;
line-height: 64rpx;
display: flex;
+ margin-top: 20rpx;
.icon-view {
// margin-top: 8rpx;
--
Gitblit v1.9.3