From efa9bfe98ba906e4c9b8f49c89f5da162a46bb0f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 13 一月 2025 10:21:24 +0800
Subject: [PATCH] 1.微信一键登录：新增“同意用户协议”之后才可登录
---
App.vue | 100 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 77 insertions(+), 23 deletions(-)
diff --git a/App.vue b/App.vue
index c721ede..25b3b94 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,52 @@
import storage from '@/plugins/storage.js'
export default {
- onLaunch: function(options) {
+ onLaunch: async function(options) {
+ //清除一些缓存
+ this.$storage.removeItem('cache_home_show_coupon')
+ var defaultaddress = this.$storage.getItem("defaultaddress")
+ if(defaultaddress){
+ // this.$store.dispatch('getCurrentInfo');
+ this.$store.commit('setAddressDesc', (defaultaddress || ''))
+
+ }
+
+ // #ifdef PUB_PARTNER
+ // this.$storage.removeItem('cache_partner_info')
+ // #endif
+
+ 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 || options.scene) {
+ //说明是特殊小程序二维码扫码跳转的
+ var keyvalues = decodeURIComponent(options.query && options.query.scene || options.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')
@@ -22,20 +67,20 @@
});
// #ifdef MP
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) {
- if(this.currentInfo.type==='admin'){
- uni.reLaunch({
- url: '/sub_pages/partner/delivery/delivery-home'
- })
- }else{
- 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'
@@ -52,9 +97,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
},
@@ -82,7 +137,7 @@
@import "uview-ui/index.scss";
/* #ifndef APP-NVUE */
- @import '@/static/customicons.css';
+ // @import '@/static/customicons.css';
// 设置整个项目的背景色
page {
@@ -402,9 +457,11 @@
.m-t-15 {
margin-top: 30rpx;
}
- .p-t-12{
- padding-top: 30rpx;
+
+ .p-t-12 {
+ padding-top: 30rpx;
}
+
.m-t-icon {
margin-top: 8rpx;
}
@@ -776,7 +833,6 @@
.msg-tip {
font-size: 24rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 400;
color: #999999;
line-height: 34rpx;
@@ -894,7 +950,6 @@
border-radius: 62rpx;
font-size: 32rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 600;
color: #FFFFFF;
line-height: 80rpx;
@@ -911,7 +966,6 @@
border-radius: 62rpx;
border: 2rpx solid #666666;
font-size: 32rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 92rpx;
@@ -922,7 +976,6 @@
.close-parent {
position: relative;
font-size: 28rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 600;
color: #000000;
line-height: 40rpx;
@@ -1260,4 +1313,5 @@
background-color: #20613D;
}
}
-</style>
\ No newline at end of file
+</style>
+
--
Gitblit v1.9.3