优化登录页跳转 完善qrToken

env/.env

@@ -7,18 +7,18 @@ VITE_WX_APPID = 'wx46467fc3f5573a68'
 # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
 VITE_APP_PUBLIC_BASE = /printer-h5/
 
-VITE_SERVER_BASEURL = 'http://tnas-f2b3:8505'
-VITE_UPLOAD_BASEURL = 'http://tnas-f2b3:8505/upload'
+VITE_SERVER_BASEURL = 'https://service.1ai.ltd/maoer-api'
+VITE_UPLOAD_BASEURL = 'https://ukw0y1.laf.run/upload'
 
 # 有些同学可能需要在微信小程序里面根据 develop、trial、release 分别设置上传地址，参考代码如下。
 # 下面的变量如果没有设置，会默认使用 VITE_SERVER_BASEURL or VITE_UPLOAD_BASEURL
-# VITE_SERVER_BASEURL__WEIXIN_DEVELOP = 'http://tnas-f2b3:8505'
-# VITE_SERVER_BASEURL__WEIXIN_TRIAL = 'http://tnas-f2b3:8505'
-# VITE_SERVER_BASEURL__WEIXIN_RELEASE = 'http://tnas-f2b3:8505'
+# VITE_SERVER_BASEURL__WEIXIN_DEVELOP = 'https://service.1ai.ltd/maoer-api'
+# VITE_SERVER_BASEURL__WEIXIN_TRIAL = 'https://service.1ai.ltd/maoer-api'
+# VITE_SERVER_BASEURL__WEIXIN_RELEASE = 'https://service.1ai.ltd/maoer-api'
 
-# VITE_UPLOAD_BASEURL__WEIXIN_DEVELOP = 'http://tnas-f2b3:8505/upload'
-# VITE_UPLOAD_BASEURL__WEIXIN_TRIAL = 'http://tnas-f2b3:8505/upload'
-# VITE_UPLOAD_BASEURL__WEIXIN_RELEASE = 'http://tnas-f2b3:8505/upload'
+# VITE_UPLOAD_BASEURL__WEIXIN_DEVELOP = 'https://ukw0y1.laf.run/upload'
+# VITE_UPLOAD_BASEURL__WEIXIN_TRIAL = 'https://ukw0y1.laf.run/upload'
+# VITE_UPLOAD_BASEURL__WEIXIN_RELEASE = 'https://ukw0y1.laf.run/upload'
 
 # h5是否需要配置代理
 VITE_APP_PROXY = false

src/pages/connect/index.vue

@@ -69,8 +69,8 @@ import { useToast } from 'wot-design-uni'
 const loading = ref(false)
 const deviceImg = ref('/static/images/device.png')
 const toast = useToast()
-// const targetWifi = "maoer-printer-hub"
-const targetWifi = "ZBA_1813"
+const targetWifi = "maoer-printer-hub"
+// const targetWifi = "ZBA_1813"
 const checkWiFiFlag = ref(false)
 const checkIPFlag = ref(false)
 // 已连接的wifi信息

src/pages/index/index.vue

@@ -82,6 +82,7 @@
 <script lang="ts" setup>
 import { useUserStore } from '@/store'
 import { useToast } from 'wot-design-uni'
+import { toLogin } from '@/utils'
 
 defineOptions({
   name: 'Home',
@@ -137,11 +138,17 @@ function toUserHub() {
     })
   } else {
     toast.warning('请先前往登录')
+    toLogin(1500)
   }
 }
 
 function toPrint() {
+  if (isLogined.value) {
 
+  } else {
+    toast.warning('请先前往登录')
+    toLogin(1500)
+  }
 }
 
 function toConnect() {

src/pages/login/index.vue

@@ -39,11 +39,16 @@ const isLogout = ref(false)
 const username = ref<string>('') // 用户名
 const password = ref<string>('') // 密码
 const token = ref<string>('') // 令牌
+const qrToken = ref<string>('') // web端扫小程序码 登录带入的令牌
 
 async function init() {
   token.value = ""
   const code = await getLoginCode()
-  loginByCode({ code }).then((res) => {
+  let params = {
+    code,
+    qrToken: qrToken.value
+  }
+  loginByCode(params).then((res) => {
     if (res.code == 0 ) {
       switch (res.body.res) {
         case "0":
@@ -113,7 +118,8 @@ function onGetPhoneNumber(detail) {
 function handlePhoneNumberLogin(code) {
   let params = {
     code,
-    token: token.value || ''
+    token: token.value || '',
+    qrToken: qrToken.value || '',
   }
   bingPhoneByCode(params).then((res) => {
     if (res.code == 0 && res.body.res == 0) {
@@ -128,6 +134,7 @@ function handlePhoneNumberLogin(code) {
 
 onLoad((option: any) => {
   isLogout.value = option.isLogout == "1"
+  qrToken.value = option.scene || ""
   if(!isLogout.value) init()
 })
 </script>
@@ -175,7 +182,6 @@ onLoad((option: any) => {
     display: flex;
     flex-direction: column;
     width: 100%;
-    height: 300rpx;
     text-align: center;
     line-height: 28rpx;
     font-size: 24rpx;

src/pages/personal/index.vue

@@ -17,7 +17,8 @@
         :height="40"
         :src="userInfo.avatar"
       />
-      <view class="head-name">{{ userInfo.name }}</view>
+      <view class="head-name">{{ isLogined ? "微信用户" : "请登录" }}</view>
+      <!-- <view class="head-name">{{ userInfo.name }}</view> -->
     </view>
     <view class="main-content mt6">
       <view class="content-item line-b" @click="toAddUserHub">
@@ -28,7 +29,7 @@
         <view>退出登录</view>
         <wd-icon name="arrow-right" size="20px" color="#808080"></wd-icon>
       </view>
-      <view v-else class="content-item" @click="toLogin">
+      <view v-else class="content-item" @click="toLogin()">
         <view>前往登录</view>
         <wd-icon name="arrow-right" size="20px" color="#808080"></wd-icon>
       </view>
@@ -40,6 +41,7 @@
 import { logout } from '@/service/api/index'
 import { useUserStore } from '@/store'
 import { useToast } from 'wot-design-uni'
+import { toLogin } from '@/utils'
 
 // 获取屏幕边界到安全区域距离
 const { safeAreaInsets } = uni.getSystemInfoSync()
@@ -57,6 +59,7 @@ function toAddUserHub() {
     })
   } else {
     toast.warning('请先前往登录')
+    toLogin(1500)
   }
 }
 
@@ -72,13 +75,7 @@ function handleLogout() {
   // })
   useUserStore().clearUserInfo()
   toast.success('退出登录成功')
-  toLogin()
-}
-
-function toLogin() {
-  uni.reLaunch({
-    url: `/pages/login/index?isLogout=1`,
-  })
+  toLogin(1500)
 }
 
 function initFn() {

src/service/api/index.ts

@@ -1,7 +1,6 @@
 import { http } from '@/utils/http'
 
 // ---------------------- 用户相关 ----------------------
-
 /** 小程序登录--静默自动登录 */
 export const loginByCode = (data: any) => {
   return http<any>({

src/utils/index.ts

@@ -220,4 +220,13 @@ export function uniqueItems(items: any) {
     (item: any, index: any, self: any) => index === self.findIndex((t: any) => t.id === item.id),
   )
   return uniqueData
+}
+
+// 跳转至登录页(不自动登录)
+export function toLogin(duration = 0) {
+  setTimeout(() => {
+    uni.reLaunch({
+      url: `/pages/login/index?isLogout=1`,
+    })
+  }, duration)
 }