From 7b7eee803e543b963ccd764386b07a2a8d7d5292 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期四, 20 十月 2022 15:51:08 +0800
Subject: [PATCH] uplongin
---
src/views/home/index.vue | 41 +++-----------------
src/views/login/index.vue | 41 +++++++++++++++++++-
2 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index c9fa6b1..0f484ac 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -122,20 +122,18 @@
</div>
</template>
<script lang="ts" setup>
- import { onMounted,computed,ref } from 'vue'
- import { ajaxGet } from '@/utils/axios'
- // import { useCounterStore } from '@/stores/counter'
- import { Image as VanImage,Tabbar as VanTabbar , TabbarItem as VanTabbarItem} from 'vant'
- import {useRoute,useRouter} from 'vue-router'
+ import { onMounted,ref } from 'vue'
+ import { userInfoStore } from '@/stores/userInfo'
+ import { Image as VanImage,Tabbar as VanTabbar , TabbarItem as VanTabbarItem } from 'vant'
+ import {useRouter} from 'vue-router'
import meun1 from './assets/meun1.png'
import meun2 from './assets/meun2.png'
import meun3 from './assets/meun3.png'
import meun4 from './assets/meun4.png'
import List1 from './assets/row1.png'
import Black from './assets/Black.png'
- const route = useRoute()
const router=useRouter()
- // const counter = useCounterStore()
+ const userInfo = userInfoStore()
const active=ref('home')
const tabChang=(index:any)=>{
if (index==='home'){
@@ -148,35 +146,10 @@
console.log('sss')
router.push(url)
}
- const isWechat = () => {
- return String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === 'micromessenger'
- }
onMounted(() => {
- if (isWechat()){
- console.log('初始化',route)
- const queryInfo=route.query
- const {code}=queryInfo
- console.log(code)
- if (code){
- ajaxGet('wechat/code',{code}).then((re:any)=>{
- console.log(re)
- })
- }
- else {
- const appid = 'wx790bd67db6206070' // 微信APPid
- const local = window.location.href
- window.location.href =
- 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
- appid +
- '&redirect_uri=' +
- encodeURIComponent(local) +
- '&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect'
-
- }
- } else {
- console.log('不是微信浏览器')
+ if (userInfo.info.openid===''){
+ router.push('login')
}
-
})
</script>
<style scoped lang="css" src="./assets/index.scss" />
\ No newline at end of file
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 59c258e..19823e3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,18 +1,20 @@
<script lang="ts" setup>
import { Dialog } from 'vant'
- import { useRouter } from 'vue-router'
- import { ref } from 'vue'
+ import { ref,onMounted } from 'vue'
+ import {useRoute,useRouter} from 'vue-router'
+ import { ajaxGet } from '@/utils/axios'
// import { Session } from '@/utils/storage'
import { Toast } from 'vant'
import logo from 'assets/logo.png'
import shoujiLogin from 'assets/yijianLogin.png'
import pswdLogin from 'assets/pswdLogin.png'
+ const route = useRoute()
+ const router=useRouter()
const username = ref('')
const password = ref('')
const visible=ref(1)
const seconds=ref(60)
const loadingBUt=ref(false)
- const router = useRouter()
const ruleForm2=ref({
newPassword:'',
pass:'',
@@ -83,6 +85,39 @@
ruleForm3.value.userPhone=''
ruleForm3.value.validateCode=''
}
+ const isWechat = () => {
+ return String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === 'micromessenger'
+ }
+ onMounted(()=>{
+ if (isWechat()){
+ console.log('初始化',route)
+ const queryInfo=route.query
+ const {code}=queryInfo
+ console.log(code)
+ if (code){
+ ajaxGet('wechat/code',{code}).then((re:any)=>{
+ console.log(re)
+ })
+ }
+ else {
+ const appid = 'wx790bd67db6206070' // 微信APPid
+ const local = window.location.href
+ window.location.href =
+ 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
+ appid +
+ '&redirect_uri=' +
+ encodeURIComponent(local) +
+ '&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect'
+
+ }
+ } else {
+ console.log('不是微信浏览器')
+ Toast({
+ message: '请在微信中打开浏览',
+ position: 'top',
+ })
+ }
+ })
</script>
<template>
--
Gitblit v1.8.0