From 9871356013df6f440b864cfe6f67025411beb938 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Mon, 17 Jan 2022 11:33:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md          |  19 ++-----
 manifest.json         |   7 ++-
 pages/index/index.vue |  26 ++++++++-
 utils/request.js      | 124 +++++++++++++++++++++---------------------
 4 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e62f4cc..adbd4e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,8 @@
-# 1.0.0 (2022-01-14)
+# 1.0.0 (2022-01-17)
 
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
- - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
- - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
- project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
- theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
- - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
- - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
- - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527)
- - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
- - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
  - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
  - | 插件的填写提交，编辑与删除 | [84390d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/84390d5)
  - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252)
@@ -19,6 +10,7 @@
  - | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0)
  - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
  - | 获取手机唯一码 | [3f60cf8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3f60cf8)
+ - | 将时间轴改成swiper滑动 | [12384f9](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12384f9)
  - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
  - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
  - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005)
@@ -55,6 +47,7 @@
 --|--|--
  - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
  - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
+ - | 日历列表H5在手机端不显示 | [0b4ae72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b4ae72)
  - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
  - | 上个提交导致的bug | [7524b24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7524b24)
  - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
@@ -69,11 +62,6 @@
 ### 📦 持续集成
 范围|描述|commitId
 --|--|--
- - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
- - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
- - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
- - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3)
- - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598)
  - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
  - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
  - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3)
@@ -113,3 +101,4 @@
 范围|描述|commitId
 --|--|--
  - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49)
+
diff --git a/manifest.json b/manifest.json
index 2da28b9..74b2437 100644
--- a/manifest.json
+++ b/manifest.json
@@ -81,7 +81,12 @@
             "splashscreen" : {
                 "androidStyle" : "common"
             }
-        }
+        },
+		"safearea": {  
+		    "bottom": {  
+		        "offset": "none"  
+		    }  
+		}
     },
     /* 快应用特有相关 */
     "quickapp" : {},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 56d371a..4012f4a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,10 +1,21 @@
 <template>
+  <!-- 这里是适配的状态栏的代码 -->
+  <view class="statbar">
+    <view class="status_bar"></view>
+  </view>
+
   <!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
   <view class="flex flex-col h-full bg-gray-50">
     <view class="relative">
     <!-- <view class="relative" @touchmove="onMove"> -->
       <!-- 日历 -->
-      <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
+      <Calendar
+        @selected-change="onDateChange"
+        :show-back="true"
+        ref="calendar"
+        @handleFindPoint="handleFindPoint"
+      />
+      
       <!-- 上传 导入wbs -->
       <Upload @success="onUploadSuccess" @error="onUploadError" />
     </view>
@@ -119,7 +130,18 @@
   }
 </script>
 
-<style>
+<style lang="scss" scoped>
+  .statbar {
+    width: 750rpx;
+    height: var(--status-bar-height);
+
+    .status_bar {
+      height: var(--status-bar-height);
+      width: 100%;
+      position: absolute;
+    }
+  }
+
   .content {
     display: flex;
     flex-direction: column;
diff --git a/utils/request.js b/utils/request.js
index 793f925..4a75fd8 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,73 +1,73 @@
 import store from '@/store/index.js';
 import storage from '@/utils/storage.js';
 import ui from '@/utils/ui.js';
-
+
 export function setupHttp(app) {
-	app.config.globalProperties.$u.http.setConfig({
-		baseUrl: '',
-		showLoading: true, // 是否显示请求中的loading
-		loadingText: '玩命加载中...',
-		loadingTime: 800,
-		loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
-		// 配置请求头信息
-		header: {
-			'content-type': 'application/json;charset=UTF-8'
-		},
-	});
+  app.config.globalProperties.$u.http.setConfig({
+    baseUrl: '',
+    showLoading: true, // 是否显示请求中的loading
+    loadingText: '玩命加载中...',
+    loadingTime: 800,
+    loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
+    // 配置请求头信息
+    header: {
+      'content-type': 'application/json;charset=UTF-8'
+    },
+  });
+
+  // 请求拦截部分，如配置，每次请求前都会执行
+  app.config.globalProperties.$u.http.interceptor.request = config => {
+    const token = store.state.user.token || storage.getStorageSync('anyringToken');
+    if (token) {
+      config.header.Authorization = `Bearer ${token}`;
+    }
 
-	// 请求拦截部分，如配置，每次请求前都会执行
-	app.config.globalProperties.$u.http.interceptor.request = config => {
-		const token = store.state.user.token || storage.getStorageSync('anyringToken');
-		if (token) {
-			config.header.Authorization = `Bearer ${token}`;
-		}
-
-    uni.getSystemInfo({
-      success: function (res) {
-        config.header.deviceId = res.deviceId;
-      }
+    uni.getSystemInfo({
+      success: function(res) {
+        config.header.deviceId = res.deviceId;
+      }
     })
 
-		return config;
-	};
+    return config;
+  };
 
-	// 响应拦截，如配置，每次请求结束都会执行本方法
-	app.config.globalProperties.$u.http.interceptor.response = res => {
-		if (res.code === 200) {
-			// res为服务端返回值，可能有code，result等字段
-			// 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到
-			// 如果配置了originalData为true，请留意这里的返回值
-      if (res.tokenObj.token) {
-        storage.setStorageSync('anyringToken', res.tokenObj.token || '');
-        store.commit('user/setToken', res.tokenObj.token);
-      }
+  // 响应拦截，如配置，每次请求结束都会执行本方法
+  app.config.globalProperties.$u.http.interceptor.response = res => {
+    if (res.code === 200) {
+      // res为服务端返回值，可能有code，result等字段
+      // 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到
+      // 如果配置了originalData为true，请留意这里的返回值
+      if (res.tokenObj.token) {
+        storage.setStorageSync('anyringToken', res.tokenObj.token || '');
+        store.commit('user/setToken', res.tokenObj.token);
+      }
 
-			return res.data;
-		} else if (res.code === 401) {
-			// 假设201为token失效，这里跳转登录
-			ui.showToast('验证失败，请重新登录');
-			setTimeout(() => {
-				// 此为uView的方法，详见路由相关文档
-				uni.navigateTo({
-					url: '/pages/user/login'
-				})
-			}, 1500);
-			return false;
-		} else {
-			// 如果返回false，则会调用Promise的reject回调，
-			// 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值
-			return false;
-		}
-	};
+      return res.data;
+    } else if (res.code === 401) {
+      // 假设201为token失效，这里跳转登录
+      ui.showToast('验证失败，请重新登录');
+      setTimeout(() => {
+        // 此为uView的方法，详见路由相关文档
+        uni.navigateTo({
+          url: '/pages/user/login'
+        })
+      }, 1500);
+      return false;
+    } else {
+      // 如果返回false，则会调用Promise的reject回调，
+      // 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值
+      return false;
+    }
+  };
 
-	app.config.globalProperties.$u.post = (url, param = {}, header = {}) => {
-		return app.config.globalProperties.$u.http.request({
-			url,
-			method: 'POST',
-			header,
-			data: {
-				param
-			},
-		});
-	};
+  app.config.globalProperties.$u.post = (url, param = {}, header = {}) => {
+    return app.config.globalProperties.$u.http.request({
+      url,
+      method: 'POST',
+      header,
+      data: {
+        param
+      },
+    });
+  };
 }