From deb9ea974706fc70f838c27227ccbeec935be10f Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 29 八月 2024 22:42:41 +0800
Subject: [PATCH] 1
---
App.vue | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/App.vue b/App.vue
index d028cdd..e44d83f 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,38 @@
import storage from '@/plugins/storage.js'
export default {
- onLaunch: function(options) {
+ onLaunch: async function(options) {
+ var query = options.q && decodeURIComponent(options.q) || ''
+ var querydto = {}
+ if (query) {
+ try {
+ var keyvalues = query.split("?")[1].split("&")
+ for (var item of keyvalues) {
+ var tarr = item.split("=")
+ querydto[tarr[0]] = tarr[1]
+ }
+ } catch (e) {
+ console.error('error', e)
+ }
+ }
+ try {
+ if (!querydto.partnerUserId) {
+ if (options.query && options.query.scene) {
+ //说明是特殊小程序二维码扫码跳转的
+ var keyvalues = decodeURIComponent(options.query.scene).split("&")
+ for (var item of keyvalues) {
+ var tarr = item.split("=")
+ querydto[tarr[0]] = tarr[1]
+ }
+ }
+ }
+
+ } catch (e) {
+ console.error('error2', e)
+ }
+
+ console.log('app query222', options, query, '\n@@\n ', querydto)
+
console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
console.log('App Launch')
@@ -21,14 +52,21 @@
}
});
// #ifdef MP
- if (true && storage.getItem('token')) {
+ if (true && storage.getItem('token')) {
+ const res = await this.$store.dispatch('getCurrentInfo');
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.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'
@@ -45,9 +83,19 @@
}
// #endif
// #ifdef PUB_CUSTOMER
- uni.reLaunch({
- url: '/pages/home/home'
- })
+ // 需要处理一下，判断是跳转登录还是原封不动
+ if (!!querydto.partnerUserId) {
+ //需要去注册页面
+ console.log('options', options)
+ //说明走的是特殊微信小程序，那么就要专门处理了
+
+
+ } else {
+ // uni.reLaunch({
+ // url: '/pages/home/home'
+ // })
+ }
+
// #endif
},
@@ -234,12 +282,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 {
@@ -387,6 +442,10 @@
.m-t-15 {
margin-top: 30rpx;
+ }
+
+ .p-t-12 {
+ padding-top: 30rpx;
}
.m-t-icon {
@@ -760,7 +819,6 @@
.msg-tip {
font-size: 24rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 400;
color: #999999;
line-height: 34rpx;
@@ -878,7 +936,6 @@
border-radius: 62rpx;
font-size: 32rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 600;
color: #FFFFFF;
line-height: 80rpx;
@@ -895,7 +952,6 @@
border-radius: 62rpx;
border: 2rpx solid #666666;
font-size: 32rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 92rpx;
@@ -906,7 +962,6 @@
.close-parent {
position: relative;
font-size: 28rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 600;
color: #000000;
line-height: 40rpx;
@@ -1085,7 +1140,7 @@
margin-right: 20rpx;
border: 2rpx solid #FFFFFF;
background-size: 100% 100%;
- background-color: #fff;
+ background-color: #fff;
}
.store-name {
@@ -1095,6 +1150,7 @@
line-height: 40rpx;
margin-top: 20rpx;
}
+
.store-name.t1 {
color: #666;
}
@@ -1106,6 +1162,7 @@
line-height: 34rpx;
margin-top: 8rpx;
}
+
.store-address.t1 {
color: #666;
}
@@ -1120,6 +1177,7 @@
color: #5B8C71;
line-height: 52rpx;
text-align: center;
+ margin-top: 30rpx;
}
.store-sc {
@@ -1132,6 +1190,7 @@
color: #FFFFFF;
line-height: 64rpx;
display: flex;
+ margin-top: 20rpx;
.icon-view {
// margin-top: 8rpx;
--
Gitblit v1.9.3