From 249a271a867df4802a8d59371e0ff10d3eb54298 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 八月 2024 18:07:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/App.vue | 67 +++++++++++----------------------
1 files changed, 23 insertions(+), 44 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 31e5e5c..0d25d8c 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -2,46 +2,7 @@
import { wxAuthorize, refreshToken } from '@/api'
export default {
onLaunch: function () {
- var that = this
- if (!that.$store.state.openid) {
- let url = window.location.href
- let code = ''
- if (url.indexOf('code=') !== -1) {
- const query = url.split('?')
- console.log('app-app', url)
- for (const q of query) {
- if (q.indexOf('code=') !== -1) {
- code = q.substring(q.indexOf('code=') + 5, q.length)
- }
- }
- wxAuthorize({
- code: code
- }).then(res => {
- console.log('app_ress', res)
- if (res.code === 200) {
- that.$store.commit('setOpenId', res.data.openid)
- if (res.data.member) {
- that.$store.commit('setMember', res.data.member)
- }
- }
- })
- } else {
- // const appID = 'wx4d7c10bdec51942b'
- // let uri = encodeURIComponent(url)
- // let authURL =
- // `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
- // window.location.href = authURL
- }
- }
- // 鍒锋柊token
- const token = uni.getStorageSync('token')
- if (token) {
- // refreshToken().then(res => {
- // if(res.code && res.code === 200){
- // this.$store.commit('setToken', res.data)
- // }
- // })
- }
+
},
onShow: function () {
console.log('App Show')
@@ -220,24 +181,42 @@
font-size: 28rpx;
color: #333333;
}
+.popupShow {
+ overflow: hidden;
+ position: fixed;
+ width: 100%;
+}
.placeholder6 {
color: #666666;
font-size: 28rpx;
}
-.primaryColor{
+.primaryColor {
color: $uni-color-primary;
+}
+.avatar {
+ width: 64rpx;
+ height: 64rpx;
+ border-radius: 50%;
+ overflow: hidden;
+ margin-right: 20rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background-color: $uni-color-primary;
+ color: #fff;
+ font-size: 30rpx;
}
.placeholder9 {
color: #999999;
font-size: 28rpx;
}
-.fs24{
+.fs24 {
font-size: 24rpx;
}
.mr24 {
margin-right: 24rpx;
}
-.mt24{
+.mt24 {
margin-top: 24rpx;
}
@@ -247,7 +226,7 @@
.ml12 {
margin-left: 12rpx;
}
-.mt6{
+.mt6 {
margin-top: 6rpx;
}
.mr6 {
--
Gitblit v1.9.3