From 6b1413d3375b2db6096bd10e5516a47d5b43f8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BD=AA?= <libiao199803@163.com>
Date: Mon, 14 Apr 2025 09:07:59 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=88=B7=E5=8D=A1?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/apiList.js            |  4 ++++
 api/env.js                |  6 +++--
 pages/index/cleanPlan.vue | 47 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/api/apiList.js b/api/apiList.js
index 43764ab..5479d62 100644
--- a/api/apiList.js
+++ b/api/apiList.js
@@ -51,3 +51,7 @@ export const UploadFiles = (formData) =>
 // 上传
 export const UploadArea = (data) =>
   request.post("/api/App/UploadArea", data);
+
+  // 获取待上传区域
+  export const GetAwaitUploadAreaApi = (data) =>
+  request.get("/api/App/GetAwaitUploadArea", data);
\ No newline at end of file
diff --git a/api/env.js b/api/env.js
index e37f13e..5baa9a0 100644
--- a/api/env.js
+++ b/api/env.js
@@ -2,10 +2,12 @@ let BASE_URL
 //开发环境中
 if (process.env.NODE_ENV === 'development') {
   // 开发环境
-  BASE_URL = 'http://10.30.2.228:8556'  //开发环境请求地址
+  // BASE_URL = 'http://10.30.2.228:8556'  //开发环境请求地址
+  BASE_URL = 'http://sl.vrgon.com:8005'  //开发环境请求地址
 } else {
   // 生产环境
-  BASE_URL = 'http://10.30.2.228:8556'  //生成环境请求地址
+  // BASE_URL = 'http://10.30.2.228:8556'  //生成环境请求地址
+  BASE_URL = 'http://sl.vrgon.com:8005'  //生成环境请求地址
 }
  
 export default BASE_URL
\ No newline at end of file
diff --git a/pages/index/cleanPlan.vue b/pages/index/cleanPlan.vue
index 2e8ca1a..12f2ac9 100644
--- a/pages/index/cleanPlan.vue
+++ b/pages/index/cleanPlan.vue
@@ -67,8 +67,8 @@
         </view>
       </view>
     </view>
-    <button @click="nfcResFn(true)">刷卡成功</button>
-    <button @click="nfcResFn(false)">刷卡失败</button>
+    <!-- <button @click="nfcResFn(true)">刷卡成功</button> -->
+    <!-- <button @click="nfcResFn(false)">刷卡失败</button> -->
     <!-- nfc刷卡成功弹窗 -->
     <u-popup v-model="successShow" mode="center" :round="30">
       <view class="success-box">
@@ -100,7 +100,7 @@
             />
           </view>
           <view class="content-title">
-            NFC卡异常或丢失，可尝试重新刷卡或提交卡片异常信息
+            {{errorMsg}}
           </view>
           <view class="btn-box">
             <view class="btn-cancel" @click="errorShow = false">暂不</view>
@@ -113,7 +113,7 @@
 </template>
 
 <script>
-import { GetPlanInfoAreaList, GetTodayPlanList } from "@/api/apiList";
+import { GetPlanInfoAreaList, GetTodayPlanList,GetAwaitUploadAreaApi } from "@/api/apiList";
 
 import { minutesToTime } from "@/utils/utils";
 
@@ -157,6 +157,7 @@ export default {
       successShow: false,
       // 刷卡失败弹窗
       errorShow: false,
+      errorMsg:'NFC卡异常或丢失，可尝试重新刷卡或提交卡片异常信息',
       dataInfo: {
         planName: "",
         areas: [],
@@ -189,13 +190,49 @@ export default {
   methods: {
     minutesToTime,
 
-    nfcResFn(data) {
+   async nfcResFn(data) {
+      if (!data) {
+        return uni.showToast({ title: "未传入参数 initFn", icon: "none" });
+     }
+      // uni.showModal({
+      //   title: "查看initFn",
+      //   content: JSON.stringify(data) || "未传入参数 initFn",
+      //   showCancel: true,
+      //   success: function (res) {},
+      // });
+      let cardID = data.cardID;
+      let nimei = data.nimei;
+      const req = {
+        Nimei:nimei
+        // Nimei:'"78F04BC3E9A6DE4782C11A2346F39C68'
+      }
+      const res = await GetAwaitUploadAreaApi(req)
+      console.log(res,'res---')
+      // 刷卡失败
+      if(!res.succeed){
+        console.log("%c%s", "color:red", "刷卡失败");
+        // 提示信息
+        this.errorMsg = res.error || "NFC卡异常或丢失，可尝试重新刷卡或提交卡片异常信息";
+        this.errorShow = true;
+        // 同时关闭成功弹窗
+        this.successShow = false;
+        return 
+      }
+      // 刷卡成功
+      this.successShow = true;
+      // 同时关闭失败弹窗
+      this.errorShow = false;
+      return 
       if (data) {
         console.log("%c%s", "color:red", "nfc刷卡成功");
         this.successShow = true;
+        // 同时关闭失败弹窗
+        this.errorShow = false;
       } else {
         console.log("%c%s", "color:red", "刷卡失败");
         this.errorShow = true;
+        // 同时关闭成功弹窗
+        this.successShow = false;
       }
     },
     // 上传图片

From 696afb1a59d9ecf314ff9381fc86e6914431d1a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BD=AA?= <libiao199803@163.com>
Date: Mon, 14 Apr 2025 09:22:42 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=AE=89=E5=8D=93=E4=B8=B4=E6=97=B6=E6=B5=8B=E8=AF=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 83a5309..967594e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,8 @@
 <template>
   <view class="content">
+  <view style="border:1px solid red;height:50rpx;">
+  			<u-button type="primary" @click="testFn">调试录入卡片</u-button>
+  </view>
     <daySelect @dateChange="onDateChange" />
     <view v-if="isToday" class="task-info">
       <view class="title">今日任务</view>
@@ -133,6 +136,33 @@ export default {
   },
 
   methods: {
+    testFn(){
+        let u = navigator.userAgent;
+        let isAndroid =
+          u.indexOf("Android") > -1 || u.indexOf("Adr") > -1; //android
+        // let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios
+        try {
+          if (isAndroid && AndroidJs) {
+            console.log("%c%s", "color:red", "安卓--调用方法");
+            const reqRow = {
+              name: "input",
+              data: "",
+            };
+            AndroidJs.func(JSON.stringify(reqRow)); // 给安卓传参
+          } else {
+            console.log("%c%s", "color:red", "苹果--调用方法");
+            const reqRow = {
+              name: "back-iphone",
+              data: "",
+            };
+            window.webkit.messageHandlers.func.postMessage(
+              JSON.stringify(reqRow)
+            ); // 给ios 传参
+          }
+        } catch (e) {
+          console.log(e, "e-----判断安卓苹果类型出错");
+        }
+    },
     onDateChange({ date, isToday }) {
       // 对接完登陆后解开
       // return

From 024daa062a52d15d05633c1d5f1dbf2b7971c3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BD=AA?= <libiao199803@163.com>
Date: Mon, 14 Apr 2025 09:23:50 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=89=E5=8D=93=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 2 +-
 utils/request.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 967594e..65a405a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="content">
   <view style="border:1px solid red;height:50rpx;">
-  			<u-button type="primary" @click="testFn">调试录入卡片</u-button>
+  			<u-button type="error" @click="testFn">调试录入卡片</u-button>
   </view>
     <daySelect @dateChange="onDateChange" />
     <view v-if="isToday" class="task-info">
diff --git a/utils/request.js b/utils/request.js
index 98b9ca0..119986c 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -61,7 +61,7 @@ const baseRequest = async (url, method, data = {}, loading = true) => {
                   if (isAndroid && AndroidJs) {
                     console.log("%c%s", "color:red", "安卓--调用返回方法");
                     const reqRow = {
-                      name: "back-android",
+                      name: "logout",
                       data: "",
                     };
                     AndroidJs.func(JSON.stringify(reqRow)); // 给安卓传参

From 6af89f9f75b85c43b24e23264164f27219d47615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BD=AA?= <libiao199803@163.com>
Date: Mon, 14 Apr 2025 10:47:49 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=85=8D=E5=90=88=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue               | 3 ++-
 pages/index/index.vue | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/App.vue b/App.vue
index de47cc9..8c2876b 100644
--- a/App.vue
+++ b/App.vue
@@ -6,7 +6,7 @@ import appUpdate from "@/components/appUpdate/appUpdate.js";
 export default {
   onLaunch: function () {
     console.log("%c%s", "color:red", "onLaunch---");
-    // uni.showLoading({ title: "等待参数传入" });
+    uni.showLoading({ title: "加载中" });
     // uni.setStorageSync("token", "");
     window.initFn = this.initFn;
     // this.initFn();
@@ -63,6 +63,7 @@ export default {
   onHide: function () {},
   methods: {
     initFn(data) {
+      uni.hideLoading(); // 关闭 Loading
       if (!data) {
         return uni.showToast({ title: "未传入参数 initFn", icon: "none" });
       }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 65a405a..f9be6c3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,8 @@
 <template>
   <view class="content">
-  <view style="border:1px solid red;height:50rpx;">
+  <view v-if="true" style="display:flex">
   			<u-button type="error" @click="testFn">调试录入卡片</u-button>
+  			<u-button type="error" @click="test1Fn">调试token过期</u-button>
   </view>
     <daySelect @dateChange="onDateChange" />
     <view v-if="isToday" class="task-info">
@@ -163,9 +164,11 @@ export default {
           console.log(e, "e-----判断安卓苹果类型出错");
         }
     },
+    test1Fn(){
+      uni.setStorageSync("token", "Bearer ");
+      this.getPlanByDate();
+    },
     onDateChange({ date, isToday }) {
-      // 对接完登陆后解开
-      // return
       this.isToday = isToday;
       this.currentDate = date;
       this.getPlanByDate();

From ba7cf7562eefc8fd9074bb25fe2e1dede8313a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BD=AA?= <libiao199803@163.com>
Date: Mon, 14 Apr 2025 14:29:21 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=99=BB=E9=99=86=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore            |  1 +
 api/apiList.js        |  4 ++
 pages.json            |  6 +++
 pages/login/login.vue | 90 +++++++++++++++++++++++++++++++++++++++++++
 pages/user/index.vue  | 13 ++++++-
 5 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 pages/login/login.vue

diff --git a/.gitignore b/.gitignore
index 4ab3641..f0b6d1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .history
 unpackage/dist
+node_modules
\ No newline at end of file
diff --git a/api/apiList.js b/api/apiList.js
index 2b8cb79..2c075e2 100644
--- a/api/apiList.js
+++ b/api/apiList.js
@@ -52,3 +52,7 @@ export const UploadFiles = (fileList, params) =>
   request.get("/api/App/GetAwaitUploadArea", data);
 // 修改上传接口定义
 export const UploadArea = (data) => request.post("/api/App/UploadArea", data);
+
+// 登录
+export const loginApi = (data) =>
+  request.post("/api/Login/Login", data);
\ No newline at end of file
diff --git a/pages.json b/pages.json
index c29a4b4..30ddd67 100644
--- a/pages.json
+++ b/pages.json
@@ -10,6 +10,12 @@
         "navigationBarTitleText": ""
       }
     },
+    {
+      "path": "pages/login/login",
+      "style": {
+        "navigationBarTitleText": "调试登陆"
+      }
+    },
     {
       "path": "pages/index/index",
       "style": {
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..e93daa2
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,90 @@
+<template>
+  <view class="content">
+    <view
+      style="margin-top: 50rpx; display: flex; align-items: center; padding-right: 50rpx"
+    >
+      <view style="margin-right: 50rpx">账号</view>
+      <u-input v-model="phone" border placeholder="账号"></u-input>
+    </view>
+    <view
+      style="margin-top: 50rpx; display: flex; align-items: center; padding-right: 50rpx"
+    >
+      <view style="margin-right: 50rpx">账号</view>
+      <u-input v-model="pwd" border placeholder="密码"></u-input>
+    </view>
+    <u-button type="primary" @click="loginFn" style="margin-top: 50rpx">登陆</u-button>
+    <u-button type="primary" @click="login1Fn" style="margin-top: 50rpx"
+      >登陆13800451500</u-button
+    >
+    <u-button type="primary" @click="login2Fn" style="margin-top: 50rpx"
+      >登陆18174010562</u-button
+    >
+  </view>
+</template>
+<script>
+import bcrypt from "bcryptjs";
+import { loginApi } from "@/api/apiList";
+export default {
+  data() {
+    return {
+      phone: "13800451500",
+      pwd: "123456",
+    };
+  },
+  mounted() {
+    // console.log("%c%s", "color:red", "mounted--");
+    uni.hideLoading(); // 关闭 Loading
+  },
+  onLoad() {},
+  methods: {
+    login1Fn() {
+      this.phone = "13800451500";
+      this.pwd = "123456";
+      this.loginFn();
+    },
+    login2Fn() {
+      this.phone = "18174010562";
+      this.pwd = "123456";
+      this.loginFn();
+    },
+    async loginFn() {
+      let salt = bcrypt.genSaltSync(12);
+      console.log("666");
+      let req = {
+        phone: this.phone,
+        password: bcrypt.hashSync(this.pwd, salt),
+      };
+      console.log(req, "req--");
+      const res = await loginApi(req);
+      console.log(res, "res--");
+      if (!res.succeed) {
+        uni.showToast({
+          title: res.error || "登录失败",
+          icon: "none",
+        });
+        return;
+      }
+      let token = res.data;
+      uni.setStorageSync("token", "Bearer " + token);
+      uni.switchTab({
+        url: "/pages/index/index",
+        success() {
+          console.log("跳转成功");
+          window.initFn = null; // 清除全局函数
+        },
+        fail(err) {
+          console.error("跳转失败", err);
+        },
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.content {
+  height: 100vh; // 确保容器有明确高度
+  // background-color: skyblue;
+  overflow: hidden;
+  padding-bottom: 100rpx;
+}
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 477a410..b720f9e 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -3,7 +3,7 @@
     <!-- 设置 -->
     <view class="head">
       <view class="personInfo">
-        <view>{{ baseInfo.name }}</view>
+        <view @click="handleClick">{{ baseInfo.name }}</view>
         <view class="account">{{ baseInfo.personType }}</view>
       </view>
       <view class="avatar-box">
@@ -84,7 +84,7 @@ export default {
         time: "2025/4/2-2026/4/2",
         personType: "保洁员",
       },
-
+     clickCount: 0, // 用于记录点击次数
       version: "",
 
       cellList: [
@@ -133,6 +133,15 @@ export default {
   },
 
   methods: {
+    handleClick() {
+      this.clickCount++; // 每次点击增加点击次数
+      if (this.clickCount === 6) {
+        this.clickCount = 0; // 执行完函数后重置点击次数
+        uni.navigateTo({
+          url: "/pages/login/login"
+        });
+      }
+    },
     upload_avatar() {
       const _this = this;
       uni.chooseImage({