1

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "卡叔电梯",
+    "name" : "智能电梯图纸生成",
     "appid" : "__UNI__3A16C1C",
     "description" : "",
     "versionName" : "1.0.0",

pages.json

@@ -16,19 +16,21 @@
   "pages": [
     //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 	{
-	  "path": "pages/login/login",
+	  "path": "pages/index/index",
+    "needLogin": true,
 	  "style": {
-	    "navigationBarTitleText": "登录"
+	    "navigationBarTitleText": "电梯图纸生成平台"
 	  }
 	},
 	{
-	  "path": "pages/index/index",
+	  "path": "pages/login/login",
 	  "style": {
-	    "navigationBarTitleText": "电梯图纸生成平台"
+	    "navigationBarTitleText": "登录"
 	  }
 	},
     {
     	"path" : "pages/order/order",
+		"needLogin": true,
     	"style" : 
     	{
     		"navigationBarTitleText" : "订单"
@@ -36,6 +38,7 @@
     },
     {
     	"path" : "pages/consumption/consumption",
+		"needLogin": true,
     	"style" : 
     	{
     		"navigationBarTitleText" : "消费"
@@ -43,10 +46,18 @@
     },
     {
     	"path" : "pages/mine/mine",
+		"needLogin": true,
     	"style" : 
     	{
     		"navigationBarTitleText" : "我的"
     	}
+    },
+	{
+	  "path": "pages/404/404",
+	  "style": {
+	    "navigationBarTitleText": "404",
+	    "navigationStyle": "custom"
+	  }
 	}
   ],
   "subPackages": [
@@ -57,8 +68,7 @@
         	"path" : "user-agreement/user-agreement",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "用户协议",
+        		"navigationBarTitleText" : "用户协议"
-				"navigationStyle": "custom"
         	}
         },
         {

pages/404/404.vue

@@ -0,0 +1,35 @@
+<template>
+  <div class="not-found">
+    <uv-navbar leftIconSize="40rpx" @leftClick="handleBack"></uv-navbar>
+    <uv-empty
+      mode="page"
+      textSize="20"
+      text="Page Not Found"
+      icon="/static/404.png"
+      width="380"
+      height="380"
+    ></uv-empty>
+  </div>
+</template>
+
+<script setup>
+import { HOME_PATH, isTabBarPath } from "@/router";
+
+function handleBack() {
+  uni.$uv.route({
+    type: isTabBarPath(HOME_PATH) ? "switchTab" : "redirectTo",
+    url: HOME_PATH,
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.not-found {
+  height: 100%;
+  overflow: auto;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+</style>

pages/index/index.vue

@@ -62,50 +62,91 @@
     <view class="section">
       <view class="section-title">设置参数</view>
       <view class="form">
-			<uv-form labelAlign="left" labelWidth="auto" labelPosition="left" :model="formField" :rules="rules"
+        <uv-form
-				ref="form">
+          labelAlign="left"
+          labelWidth="auto"
+          labelPosition="left"
+          :model="formField"
+          :rules="rules"
+          ref="form"
+        >
           <uv-form-item prop="phone" label="电梯类型">
-					<uv-input v-model="formField.phone" color="#000" border="none"
+            <uv-input
-						:placeholderStyle="{color:'#666778'}" placeholder="请输入">
+              v-model="formField.phone"
-					</uv-input>
+              color="#000"
+              border="none"
+              :placeholderStyle="{ color: '#666778' }"
+              placeholder="请输入"
+            ></uv-input>
           </uv-form-item>
           <uv-form-item prop="password" label="载重（kg）">
-					<uv-input v-model="formField.password" color="#000" border="none"
+            <uv-input
-						:placeholderStyle="{color:'#666778'}" placeholder="请输入">
+              v-model="formField.password"
-					</uv-input>
+              color="#000"
+              border="none"
+              :placeholderStyle="{ color: '#666778' }"
+              placeholder="请输入"
+            ></uv-input>
           </uv-form-item>
           <uv-form-item prop="password" label="井道宽度（mm）">
-					<uv-input type="digit" v-model="formField.password" color="#000" border="none"
+            <uv-input
-						:placeholderStyle="{color:'#666778'}" placeholder="请输入">
+              type="digit"
-					</uv-input>
+              v-model="formField.password"
+              color="#000"
+              border="none"
+              :placeholderStyle="{ color: '#666778' }"
+              placeholder="请输入"
+            ></uv-input>
           </uv-form-item>
           <uv-form-item prop="password" label="井道深度（mm）">
-					<uv-input type="digit" v-model="formField.password" color="#000" border="none"
+            <uv-input
-						:placeholderStyle="{color:'#666778'}" placeholder="请输入">
+              type="digit"
-					</uv-input>
+              v-model="formField.password"
+              color="#000"
+              border="none"
+              :placeholderStyle="{ color: '#666778' }"
+              placeholder="请输入"
+            ></uv-input>
           </uv-form-item>
           <uv-form-item prop="password" label="顶层高度（mm）">
-					<uv-input type="digit" v-model="formField.password" color="#000" border="none"
+            <uv-input
-						:placeholderStyle="{color:'#666778'}" placeholder="请输入">
+              type="digit"
-					</uv-input>
+              v-model="formField.password"
+              color="#000"
+              border="none"
+              :placeholderStyle="{ color: '#666778' }"
+              placeholder="请输入"
+            ></uv-input>
           </uv-form-item>
           <uv-form-item prop="password" label="底坑深度（mm）">
-					<uv-input type="digit" v-model="formField.password" color="#000" border="none"
+            <uv-input
-						:placeholderStyle="{color:'#666778'}" placeholder="请输入">
+              type="digit"
-					</uv-input>
+              v-model="formField.password"
+              color="#000"
+              border="none"
+              :placeholderStyle="{ color: '#666778' }"
+              placeholder="请输入"
+            ></uv-input>
           </uv-form-item>
           <uv-form-item prop="password">
-					<div style="margin-bottom: 4px;">备注说明</div>
+            <div style="margin-bottom: 4px">备注说明</div>
-					<uv-textarea v-model="formField.password" placeholder="请输入"></uv-textarea>
+            <uv-textarea
+              v-model="formField.password"
+              placeholder="请输入"
+            ></uv-textarea>
           </uv-form-item>
         </uv-form>
       </view>
-		
     </view>
 
     <!-- 底部按钮 -->
     <view class="bottom-actions">
-	  <uv-button :loading="generating" @click="viewHistory" text="生成图纸" color="#3F70FF"></uv-button>
+      <uv-button
+        :loading="generating"
+        @click="viewHistory"
+        text="生成图纸"
+        color="#3F70FF"
+      ></uv-button>
       <uv-button @click="viewHistory" text="查看记录"></uv-button>
     </view>
   </view>
@@ -122,11 +163,12 @@ import {
 } from "@dcloudio/uni-app";
 import { useAuthStore, useUserStore } from "@/store";
 import RPC from "@/utils/request";
+import { usePermission } from "@/hooks/usePermission";
 
 const authStore = useAuthStore();
 const userStore = useUserStore();
 
-const generating = ref(false)
+const generating = ref(false);
 
 // 响应式数据
 const selectedTemplate = ref("passenger");
@@ -136,12 +178,12 @@ const selectTemplate = (template) => {
   selectedTemplate.value = template;
 };
 
-const form = ref(null)
+const form = ref(null);
-	const formField = ref({
+const formField = ref({
-		phone: '',
+  phone: "",
-		password: '',
+  password: "",
-	})
+});
-	const rules = ref({
+const rules = ref({
   // 'phone': {
   // 	required: true,
   // 	message: '请填写手机号',
@@ -152,8 +194,7 @@ const form = ref(null)
   // 	message: '请填写验证码',
   // 	trigger: ['blur', 'change']
   // }
-	})
+});
-
 
 // 生成图纸
 const generateDrawing = async () => {
@@ -167,9 +208,7 @@ const generateDrawing = async () => {
 
   generating.value = true;
   try {
-    const params = {
+    const params = {};
-
-    };
 
     // 这里调用生成图纸的API
     // const result = await RPC.post('/api/generate-drawing', params)
@@ -200,7 +239,7 @@ const generateDrawing = async () => {
 
 // 查看历史记录
 const viewHistory = () => {
-	console.log(111)
+  console.log(111);
   uni.navigateTo({
     url: "/pagesA/generate-record/generate-record",
   });
@@ -227,6 +266,16 @@ onShareTimeline((data) => {
 onLoad(() => {
   console.log("index-onLoad");
 });
+	onShow(async () => {
+	  console.log("test page onShow");
+	  const hasPermission = await usePermission();
+	  console.log(hasPermission ? "已登录" : "跳转登录");
+	  // 以下开始写业务逻辑...
+	  if(!hasPermission) {
+		 authStore.signOut();
+		 uni.$uv.route("/pages/login/login");
+	  }
+	});
 </script>
 
 <style lang="scss" scoped>
@@ -235,6 +284,10 @@ onLoad(() => {
   min-height: 100vh;
   background-color: #f8f8f8;
   padding-bottom: 52px;
+
+  /* #ifdef H5 */
+  padding-bottom: 102px; /* H5环境下需要更多空间 (50px按钮 + 50px tabBar + 2px间距) */
+  /* #endif */
 }
 
 .header-section {
@@ -253,15 +306,15 @@ onLoad(() => {
     right: 0;
     background: rgba(0, 0, 0, 0.5);
     color: white;
-	width:70%;
+    width: 70%;
     transform: translate(0, -50%);
-	padding:20px 10px;
+    padding: 20px 10px;
 
     .header-title {
       font-size: 16px;
       font-weight: bold;
       margin-bottom: 8px;
-	  color: #BD9E85 ;
+      color: #bd9e85;
     }
 
     .header-subtitle {
@@ -330,13 +383,17 @@ onLoad(() => {
   padding: 0 16px;
   box-sizing: border-box;
   width: 100%;
+
+  /* #ifdef H5 */
+  bottom: 50px; /* H5环境下给tabBar留出空间 */
+  /* #endif */
 }
 </style>
 
 <style lang="scss">
-	.bottom-actions {
+.bottom-actions {
   .uv-button-wrapper {
     width: 48%;
   }
-	}
+}
 </style>

pages/mine/mine.vue

@@ -116,7 +116,7 @@
       >
         <view class="payment-info">
           <uv-icon
-            name="alipay-circle-fill"
+            name="/static/imgs/alipay.png"
             color="#1677ff"
             size="24"
           ></uv-icon>
@@ -532,6 +532,10 @@ onShow(() => {
   font-size: 14px;
   background: linear-gradient(180deg, #7b9cdb 0%, #f8f8f8 40%);
   padding-bottom: 120px;
+
+  /* #ifdef H5 */
+  padding-bottom: 170px; /* H5环境下需要更多空间 (底部按钮高度 + tabBar高度 + 间距) */
+  /* #endif */
 }
 
 .header {
@@ -734,6 +738,10 @@ onShow(() => {
   padding: 16px;
   border-top: 1px solid #e5e5e5;
 
+  /* #ifdef H5 */
+  bottom: 50px; /* H5环境下给tabBar留出空间 */
+  /* #endif */
+
   .agreement {
     text-align: center;
     font-size: 12px;

pagesA/recharge/recharge.vue

@@ -78,7 +78,7 @@
           @click="selectPayment('alipay')"
         >
           <view class="payment-info">
-            <uv-icon name="alipay-circle-fill" color="#1677ff" size="28"></uv-icon>
+            <uv-icon name="/static/imgs/alipay.png" color="#1677ff" size="28"></uv-icon>
             <view class="payment-details">
               <view class="payment-name">支付宝</view>
               <view class="payment-desc">便民生活，轻松支付</view>

pagesA/user-agreement/user-agreement.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="container">
-		<HeaderCustom title="用户协议" :showBack="true"></HeaderCustom>
 		<div class="contentBox">
 			<div class="part">
 				一、总则

plugins/permission.js

@@ -21,7 +21,7 @@ routes.forEach((item) => {
  * @returns
  */
 export function hasPerm(path = "") {
-  if (!isPathExists(path)) {
+  if (!isPathExists(path) && path !== '/') {
     uni.redirectTo({
       url: ERROR404_PATH,
     });
@@ -34,7 +34,7 @@ export function hasPerm(path = "") {
   if (!hasPermission) {
     // 将用户的目标路径传递过去，这样可以实现用户登录之后，直接跳转到目标页面
     uni.redirectTo({
-      url: `/pages/index/index`,
+      url: `${LOGIN_PATH}?redirect=${encodeURIComponent(path)}`,
     });
   }
   return hasPermission;