From 90c1699301174e4d1f1946f9a045635c917d9e77 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Thu, 27 Jan 2022 15:06:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=9A=90=E8=97=8F=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85=E9=A1=B5=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                 |   1 +
 hooks/project/useGetTasks.js |   2 +-
 pages/index/index.vue        |  44 ++++++-------
 utils/cacheAndRequest.js     | 120 +++++++++++++++++------------------
 4 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6c0066..e1b928d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
  - | 插件的填写提交，编辑与删除 | [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)
  - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
+ - | 插件api | [08bdf74](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/08bdf74)
  - | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0)
  - | 登录图标、日历页今日 | [7de419d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7de419d)
  - | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b)
diff --git a/hooks/project/useGetTasks.js b/hooks/project/useGetTasks.js
index 23171ce..3b00a96 100644
--- a/hooks/project/useGetTasks.js
+++ b/hooks/project/useGetTasks.js
@@ -159,7 +159,7 @@ export default function useGetTasks() {
       store.commit('task/setUpTasks', newTasks);
     }
     if (next) {
-      const newTasks = uni.$task.setPlaceholderTasks(+obj.tasks[tasks.length - 1].planStart, false, obj.timeGranularity, next);
+      const newTasks = uni.$task.setPlaceholderTasks(+obj.tasks[obj.tasks.length - 1].planStart, false, obj.timeGranularity, next);
       store.commit('task/setDownTasks', newTasks);
     }
     return tasks.value;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7b83775..517cde6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,37 +1,35 @@
 <template>
+  <!-- 这里是适配的状态栏的代码 -->
+  <view class="statbar">
+    <view class="status_bar"></view>
+  </view>
+
   <!-- #ifdef APP-PLUS -->
   <!-- 广告 -->
   <Adv v-if="isOpenApp"></Adv>
 
   <!-- 引导页 -->
-  <Guide v-if="!firstOpenApp"></Guide>
+  <Guide></Guide>
   <!-- #endif -->
 
-  <view>
-    <!-- 这里是适配的状态栏的代码 -->
-    <view class="statbar">
-      <view class="status_bar"></view>
-    </view>
-
-    <!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
-    <theme 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" />
+  <!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
+  <theme 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" />
 
-        <!-- 上传 导入wbs -->
-        <Upload @success="onUploadSuccess" @error="onUploadError" />
-      </view>
+      <!-- 上传 导入wbs -->
+      <Upload @success="onUploadSuccess" @error="onUploadError" />
+    </view>
 
-      <u-button class="mt-4" @click="toLogin">登录</u-button>
-      <!-- 项目列表 -->
-      <Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
+    <u-button class="mt-4" @click="toLogin">登录</u-button>
+    <!-- 项目列表 -->
+    <Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
 
-      <!-- 全局提示框 -->
-      <u-top-tips ref="uTips"></u-top-tips>
-    </theme>
-  </view>
+    <!-- 全局提示框 -->
+    <u-top-tips ref="uTips"></u-top-tips>
+  </theme>
 </template>
 
 <script setup>
diff --git a/utils/cacheAndRequest.js b/utils/cacheAndRequest.js
index 246a517..a7a95ef 100644
--- a/utils/cacheAndRequest.js
+++ b/utils/cacheAndRequest.js
@@ -39,25 +39,25 @@ export default {
    * @param {number} endTime 截止时间
    */
   getProjects(startTime, endTime, fn) {
-    let remote = false;
+    // let remote = false;
 
-    if (store.getters.useStorage) {
-      // 有缓存 且 服务端数据未返回 就先返回缓存
-      uni.$cache
-        .getProjectsByDay(startTime, endTime)
-        .then(data => {
-          !remote && fn(null, data);
-        })
-        .catch(err => !remote && fn(err));
-    }
+    // if (store.getters.useStorage) {
+    //   // 有缓存 且 服务端数据未返回 就先返回缓存
+    //   uni.$cache
+    //     .getProjectsByDay(startTime, endTime)
+    //     .then(data => {
+    //       !remote && fn(null, data);
+    //     })
+    //     .catch(err => !remote && fn(err));
+    // }
 
     uni.$u.api
       .getProjects(startTime, endTime)
       .then(data => {
-        remote = true;
+        // remote = true;
         fn(null, data);
         // 存api到cache里
-        uni.$cache.putProjects(data);
+        // uni.$cache.putProjects(data);
       })
       .catch(err => fn(err));
 
@@ -80,24 +80,24 @@ export default {
    * @param {object} params 提交的参数
    */
   findShowRole(params, fn) {
-    let remote = false;
-    // 有缓存 且 服务端数据未返回 就先返回缓存
-    uni.$cache
-      .getShowRole(params.projectId)
-      .then(data => {
-        !remote && fn(null, data);
-      })
-      .catch(err => !remote && fn(err));
+    // let remote = false;
+    // // 有缓存 且 服务端数据未返回 就先返回缓存
+    // uni.$cache
+    //   .getShowRole(params.projectId)
+    //   .then(data => {
+    //     !remote && fn(null, data);
+    //   })
+    //   .catch(err => !remote && fn(err));
 
     waitTokenRequest(() => {
       // 拿到api数据后 再用api的数据
       uni.$u.api
         .findShowRole(params)
         .then(data => {
-          remote = true;
+          // remote = true;
           fn(null, data);
           // 存api到cache里
-          uni.$cache.putShowRole(params.projectId, data);
+          // uni.$cache.putShowRole(params.projectId, data);
         })
         .catch(err => fn(err));
     });
@@ -108,25 +108,25 @@ export default {
    * @param {object} params 提交的参数
    */
   getRegularTask(params, fn) {
-    let remote = false;
-    // 有缓存 且 服务端数据未返回 就先返回缓存
-    uni.$cache
-      .getStorageRegularTask(params)
-      .then(data => {
-        !remote && fn(null, data);
-      })
-      .catch(err => !remote && fn(err));
+    // let remote = false;
+    // // 有缓存 且 服务端数据未返回 就先返回缓存
+    // uni.$cache
+    //   .getStorageRegularTask(params)
+    //   .then(data => {
+    //     !remote && fn(null, data);
+    //   })
+    //   .catch(err => !remote && fn(err));
 
     waitTokenRequest(() => {
       // 拿到api数据后 再用api的数据
       uni.$u.api
         .getRegularTask(params)
         .then(data => {
-          remote = true;
+          // remote = true;
 
           fn(null, uni.$u.deepClone(data));
           // 存api到cache里
-          uni.$cache.putStorageRegularTask(params, data);
+          // uni.$cache.putStorageRegularTask(params, data);
         })
         .catch(err => fn(err));
     });
@@ -137,24 +137,24 @@ export default {
    * @param {object} params 提交的参数
    */
   getPermanent(params, fn) {
-    let remote = false;
+    // let remote = false;
     // 有缓存 且 服务端数据未返回 就先返回缓存
-    uni.$cache
-      .getStoragePermanent(params)
-      .then(data => {
-        !remote && fn(null, data);
-      })
-      .catch(err => !remote && fn(err));
+    // uni.$cache
+    //   .getStoragePermanent(params)
+    //   .then(data => {
+    //     !remote && fn(null, data);
+    //   })
+    //   .catch(err => !remote && fn(err));
 
     waitTokenRequest(() => {
       // 拿到api数据后 再用api的数据
       uni.$u.api
         .getPermanent(params)
         .then(data => {
-          remote = true;
+          // remote = true;
           fn(null, data);
           // 存api到cache里
-          uni.$cache.putStoragePermanent(params, data);
+          // uni.$cache.putStoragePermanent(params, data);
         })
         .catch(err => fn(err));
     });
@@ -165,24 +165,24 @@ export default {
    * @param {object} params 提交的参数
    */
   getGlobal(params, fn) {
-    let remote = false;
-    // 有缓存 且 服务端数据未返回 就先返回缓存
-    uni.$cache
-      .getDailyTask(params)
-      .then(data => {
-        !remote && fn(null, data);
-      })
-      .catch(err => !remote && fn(err));
+    // let remote = false;
+    // // 有缓存 且 服务端数据未返回 就先返回缓存
+    // uni.$cache
+    //   .getDailyTask(params)
+    //   .then(data => {
+    //     !remote && fn(null, data);
+    //   })
+    //   .catch(err => !remote && fn(err));
 
     waitTokenRequest(() => {
       // 拿到api数据后 再用api的数据
       uni.$u.api
         .getGlobal(params)
         .then(data => {
-          remote = true;
+          // remote = true;
           fn(null, data);
           // 存api到cache里
-          uni.$cache.putDailyTask(params, data);
+          // uni.$cache.putDailyTask(params, data);
         })
         .catch(err => fn(err));
     });
@@ -193,24 +193,24 @@ export default {
    * @param {object} params 提交的参数
    */
   getOtherPlugin(params, fn) {
-    let remote = false;
+    // let remote = false;
     // 有缓存 且 服务端数据未返回 就先返回缓存
-    uni.$cache
-      .getPlugin(params.pluginId)
-      .then(data => {
-        !remote && fn(null, data);
-      })
-      .catch(err => !remote && fn(err));
+    // uni.$cache
+    //   .getPlugin(params.pluginId)
+    //   .then(data => {
+    //     !remote && fn(null, data);
+    //   })
+    //   .catch(err => !remote && fn(err));
 
     waitTokenRequest(() => {
       // 拿到api数据后 再用api的数据
       uni.$u.api
         .getOtherPlugin(params)
         .then(data => {
-          remote = true;
+          // remote = true;
           fn(null, data);
           // 存api到cache里
-          uni.$cache.putPlugin(params.pluginId, data);
+          // uni.$cache.putPlugin(params.pluginId, data);
         })
         .catch(err => fn(err));
     });