From 709a70c43dc01c1927c64a9d05f29170e6aec95e Mon Sep 17 00:00:00 2001
From: wangchenxing <877161328@qq.com>
Date: Sat, 4 Jan 2025 14:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E9=80=80=E6=8C=89=E9=92=AE=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |  4 +-
 pages/index.vue                               | 38 +++++++++++++++++--
 pages/login.vue                               |  9 +++--
 .../uview-ui/components/u-navbar/u-navbar.vue |  4 +-
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/main.js b/main.js
index 5777351..9540066 100644
--- a/main.js
+++ b/main.js
@@ -5,10 +5,10 @@ import plugins from './plugins' // plugins
 import './permission' // permission
 // 导入invite.js
 import invite from './utils/invite'
-// import VConsole from 'vconsole';
+import VConsole from 'vconsole';
  
 // 初始化vConsole
-// const vConsole = new VConsole();
+const vConsole = new VConsole();
 // 安装插件全局弹窗
 Vue.use(invite)
 Vue.use(plugins)
diff --git a/pages/index.vue b/pages/index.vue
index 03d997f..fc37544 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,12 +1,12 @@
 <template>
 
 	<view class="zhuye">
-		<meta name="viewport"
-			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+		<!-- <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> -->
 		<LoadingPage :loading="loading"></LoadingPage>
 
 		<!-- //导航栏 -->
-		<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="首页" :autoBack="true">
+		<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="首页" :autoBack="false">
 			<template #left>
 				<image src='../static/back.png' style="width: 36rpx;height: 36rpx;" @click="goback">
 				</image>
@@ -263,7 +263,37 @@
 		},
 		methods: {
 			goback() {
-				this.$router.go(-2)
+				
+				// this.$router.go(-3)
+				// window.history.back()
+				// window.JSBridge.exit();
+	
+		// 获取当前页面栈
+const pages = getCurrentPages();
+console.log(pages);  // 打印页面栈
+
+
+// 如果页面栈大于 1，执行返回操作
+
+if (pages.length > 1) {
+  // uni.navigateBack(1);
+window.history.back();
+  console.log("pages.length",pages.length);
+} else {
+  console.log('已经在首页，无法返回');
+window.history.back();
+console.log('已执行back');
+// this.$router.go(-2)
+// console.log('已执行$router');
+// uni.navigateBack(1);
+// console.log('已执行navigateBack');
+// window.JSBridge.exit();
+// console.log('已执行exit');
+// window.close();
+// console.log('已执行close');
+}
+
+
 			},
 			getYanLian() {
 				backlog().then(res => {
diff --git a/pages/login.vue b/pages/login.vue
index 6e15c19..9b18716 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -117,7 +117,10 @@ export default {
 		
 		//解密算法
 		decodeDes(message) {
-			console.log('00');
+			const options = uni.getLaunchOptionsSync(); // 获取启动时的参数
+			const fromPage = options.path; // 获取来源页面路径（如果有）
+			const params = options.query; // 获取 URL 中的 query 参数（如果有）
+			console.log('00+fromPage',fromPage);
 			console.log(message);
 			console.log('11');
 			//秘钥
@@ -185,8 +188,8 @@ export default {
 		},
 		// 密码登录
 		async pwdLogin(cas) {
-			// this.loginForm.cas = cas;
-			this.loginForm.cas = this.decodeDes(cas);
+			this.loginForm.cas = cas;
+			// this.loginForm.cas = this.decodeDes(cas);
 			this.$store
 				.dispatch('Login', this.loginForm)
 				.then(() => {
diff --git a/uni_modules/uview-ui/components/u-navbar/u-navbar.vue b/uni_modules/uview-ui/components/u-navbar/u-navbar.vue
index 2b206b7..1cb2d2a 100644
--- a/uni_modules/uview-ui/components/u-navbar/u-navbar.vue
+++ b/uni_modules/uview-ui/components/u-navbar/u-navbar.vue
@@ -7,7 +7,9 @@
 				height: $u.addUnit($u.getPx(height) + $u.sys().statusBarHeight,'px'),
 			}"
 		></view>
-		<view :class="[fixed && 'u-navbar--fixed']">
+		<view>
+		<!-- :class="[fixed && 'u-navbar--fixed']" -->
+
 			<u-status-bar
 				v-if="safeAreaInsetTop"
 				:bgColor="bgColor"