From 4325c47ca5173a12db9edde5026fdbd1347bc025 Mon Sep 17 00:00:00 2001
From: liy <1492230202@qq.com>
Date: Tue, 21 May 2024 10:30:16 +0800
Subject: [PATCH] 1

---
 App.vue               |  7 +++++++
 common/config.js      |  2 +-
 pages.json            |  5 ++++-
 pages/home/home.vue   |  9 ++++++++-
 pages/login/login.vue |  4 ++--
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/App.vue b/App.vue
index 186dd4a..44573f0 100644
--- a/App.vue
+++ b/App.vue
@@ -1,8 +1,15 @@
 <script>
+	import service from '@/service/service.js'
 	export default {
 		onLaunch: function() {
 
 			let that = this
+			// if(!service.getUser()){
+			// 	uni.navigateTo({
+			// 		url: "/pages/login/login"
+			// 	})
+			// 	return
+			// }
 			this.gain()
 		},
 		onShow: function() {},
diff --git a/common/config.js b/common/config.js
index bf8f9bc..c401f11 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,4 +1,4 @@
-let BASE_URL = 'http://zhmz.rsxmzj.cn:8536';
+let BASE_URL = 'https://zhmz.rsxmzj.cn';
 
 // let BASE_URL='http://192.168.179.221:8536';
 
diff --git a/pages.json b/pages.json
index ce4f634..51938ce 100644
--- a/pages.json
+++ b/pages.json
@@ -2,7 +2,8 @@
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/home/home",
 			"style": {
 				"navigationStyle": "custom"
@@ -15,6 +16,8 @@
 				"enablePullDownRefresh": false
 			}
 		},
+
+
 		{
 			"path": "pages/funeral/funeral",
 			"style": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 33b00f1..42112fd 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -282,6 +282,7 @@
 <script>
 	import md5 from "../../common/md5.js";
 	import BASE_URL from "@/common/config.js"
+	import service from '@/service/service.js'
 	export default {
 		data() {
 			return {
@@ -327,7 +328,13 @@
 			}
 		},
 		onLoad() {
-			uni.hideTabBar();
+			// if(!service.getUser()){
+			// 	uni.navigateTo({
+			// 		url: "/pages/login/login"
+			// 	})
+			// 	return
+			// }
+			// uni.hideTabBar();
 			this.getlist()
 		},
 		methods: {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index bdb40cc..415cdaf 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -99,9 +99,9 @@
 			gain() {
 				// const token = uni.getStorageSync("token");
 				// if (!token) return
-				this.API.getplie({
+				this.API.getplie1({
 					pageNum: 1,
-					pageSize: 8000
+					pageSize: 80000
 				}).then(response => {
 					console.log(response, '界桩')
 					let box1 = []
--
libgit2 0.21.4