From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/App.vue | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/small-program/App.vue b/small-program/App.vue
index 931fcfe..8224997 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -6,41 +6,40 @@
...mapState(['userInfo','openid'])
},
onLaunch: function() {
- var that = this;
- if (!this.openid || this.openid =='') {
- uni.login({
- provider: 'weixin',
- success: async function (loginRes) {
- let { code } = loginRes;
- let res = await that.$u.api.wxLogin({ code })
- if (res && res.code === 200) {
- that.$store.commit('setToken', res.data.token)
- that.$store.commit('setOpenid', res.data.openid)
- that.$store.commit('setUserInfo', res.data.member)
+ // var that = this;
+ // if (!this.openid || this.openid =='') {
+ // uni.login({
+ // provider: 'weixin',
+ // success: async function (loginRes) {
+ // let { code } = loginRes;
+ // let res = await that.$u.api.wxLogin({ code })
+ // if (res && res.code === 200) {
+ // that.$store.commit('setToken', res.data.token)
+ // that.$store.commit('setOpenid', res.data.openid)
+ // that.$store.commit('setUserInfo', res.data.member)
- }
- }
- });
- } else {
- var that = this
- let res = this.$u.api.getMemberInfo({}).then(res =>{
- if (res && res.code === 200) {
- that.$store.commit('setUserInfo', res.data)
- } else {
- that.$store.commit('setToken','')
- that.$store.commit('setUserInfo',{})
- }
- })
- }
- uni.showShareMenu({
- withShareTicket: true,
- menus: ['shareAppMessage', 'shareTimeline']
- })
+ // }
+ // }
+ // });
+ // } else {
+ // var that = this
+ // let res = this.$u.api.getMemberInfo({}).then(res =>{
+ // if (res && res.code === 200) {
+ // that.$store.commit('setUserInfo', res.data)
+ // } else {
+ // that.$store.commit('setToken','')
+ // that.$store.commit('setUserInfo',{})
+ // }
+ // })
+ // }
+ // uni.showShareMenu({
+ // withShareTicket: true,
+ // menus: ['shareAppMessage', 'shareTimeline']
+ // })
},
onShow: function() {
- console.log('App Show')
- this.getLocaltionBiz()
+ // this.getLocaltionBiz()
},
onHide: function() {
console.log('App Hide')
--
Gitblit v1.9.3