Merge pull request 'temp' (#28) from temp into develop

Reviewed-on: https://dd.tall.wiki/gitea/wally/TALL-MUI-3/pulls/28 build 修改了package.json里的包
4 years ago · 130c1496ae
6 changed files with 17 additions and 61 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,4 @@
-# 0.1.0 (2021-07-25)
+# 0.1.0 (2021-07-26)

 ### 🌟 新功能
 范围|描述|commitId
@ -16,6 +16,7 @@
 - | 引入dayjs | 29b8b93
 - | 提交到本地 | 9cbe411
 - | 插件数据获取 | 5b91bdc
+ - | 日常任务插件调整 | c1881f9
 - | 时间基准线，默认插件 | a33ba1e
 - | 时间轴修改状态时提示框增加 | e841392
 - | 时间轴界面 | 33927e9
@ -26,30 +27,6 @@
 - | 添加时间轴上下滚动 | 2b81bbc
 - | 角色栏实现 | 94cd671
 - | 配置默认插件接口 | f0c177d
- - | 标题栏变化 | [3898cfe](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/3898cfe)
- - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0fcd9d)
- - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0500cb4)
- - | 插件数据获取 | [5b91bdc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/5b91bdc)
- - | 存token | [b8a178d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/b8a178d)
- - | 定期任务面板骨架屏添加 | [b2698c0](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/b2698c0)
- - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/94cd671)
- - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/69e7931)
- - | 配置默认插件接口 | [f0c177d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f0c177d)
- - | 全局插件及默认插件位置修改 | [6c80d08](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/6c80d08)
- - | 日常任务插件调整 | [c1881f9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c1881f9)
- - | 时间基准线，默认插件 | [a33ba1e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a33ba1e)
- - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/33927e9)
- - | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e841392)
- - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9cbe411)
- - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2b81bbc)
- - | 引入dayjs | [29b8b93](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/29b8b93)
- - | db store | [6414c4f](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/6414c4f)
- - | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e)
- - | post 封装 | [da52e94](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/da52e94)
- - | tall插件封装 | [1bcb920](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1bcb920)
- - | ws storage | [21b3a06](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/21b3a06)
- 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ed3d644)
- pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/de01343)


 ### 🎨 代码样式
@ -67,18 +44,6 @@
 - | 更新代码 | 1f40a76
 - | 添加插件数据 | 2f11b42
 - | 组件新建 | 89c0035
- - | 代码格式细节调整 | [cb2532b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/cb2532b)
- - | 更新代码 | [8c27e68](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/8c27e68)
- - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1f40a76)
- - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4aba872)
- - | 日常任务修改 | [dfa7ee2](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/dfa7ee2)
- - | 删除插件携带的多余文件 | [0f392bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0f392bb)
- - | 删除多余字段 | [5ae3973](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/5ae3973)
- - | 添加插件数据 | [2f11b42](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2f11b42)
- - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/54bca09)
- - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/21ac4bb)
- - | 修改角色样式 | [73e268e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/73e268e)
- - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/89c0035)


 ### 🐛 Bug 修复
@ -87,11 +52,16 @@
 - | 上下滑动加载定期任务 | 4090d89
 - | 上下滚动时间轴 | d533a01
 - | 下拉加载定期任务传参，时间格式化修改 | 0b95a0e
+ - | 任务开始时间延迟插件 | 992a313
 - | 修改main | 749ae9a
+ - | 修改报错 | 531c14d
 - | 修改角色栏组件 | a54c601
 - | 定期任务接口 | aa4981c
 - | 定期任务插件 | 92b3254
 - | 提示信息显示bug及日常任务收缩问题 | f2f06c5
+ - | 插件bug解决 | 41257eb
+ - | 日常任务html数据查验 | 880ce5c
+ - | 日常任务插件遍历时的key值修改 | cd26285
 - | 时间轴上下滑动 | 4d0ae46
 - | 时间轴上下滚动数据加载bug修改 | e82ede4
 - | 时间轴插件 | 225d3cc
@ -99,11 +69,13 @@
 - | 角色栏修改 | 19228d6
 - | 解决时间轴报错 | da1eece
 - | 骨架屏替换 | e9fdd71
+ - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/41257eb)
 - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/92b3254)
 - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/aa4981c)
 - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e9fdd71)
 - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/19228d6)
 - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/da1eece)
+ - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/992a313)
 - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/cd26285)
 - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/880ce5c)
 - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/d533a01)
@ -155,6 +127,7 @@
 pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | 875fab4
 - | uview-ui | a9ea34b
 信息配置 | 配置eslint等配置 | 7421443
+ - | 修复不能build的问题 | 0b7b91e


 范围|描述|commitId
@ -162,7 +135,3 @@
 - | style:index | 978f272
 - | !2 基础模板v1.1.0 | f5e61dd
 - | init | c0f1deb
-
- - | style:index | [978f272](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/978f272)
- - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f5e61dd)
- - | init | [c0f1deb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0f1deb)
--- a/package.json
+++ b/package.json
@ -10,6 +10,7 @@
    "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve --mode development",
    "dev:mock": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve --mode mock",
    "build:h5-test": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build --mode development",
+    "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build --mode production",
    "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
    "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
    "build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build",
--- a/src/components/Globals/Globals.vue
+++ b/src/components/Globals/Globals.vue
@ -1,9 +1,9 @@
 <template>
  <view class="m-2">
-    <u-card :show-foot="false" :show-head="false" :style="{ height: isShrink ? '96rpx' : '300rpx' }" border-radius="25" margin="0">
+    <u-card :show-foot="false" :show-head="false" :style="{ height: isShrink ? '106rpx' : '340rpx' }" border-radius="25" margin="0">
      <view slot="body">
-        <scroll-view :scrollY="true" :style="{ height: isShrink ? '40rpx' : '240rpx' }">
-          <skeleton :banner="false" :loading="!tasks.length" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton>
+        <scroll-view :scrollY="true" :style="{ height: isShrink ? '50rpx' : '280rpx' }">
+          <skeleton :banner="false" :loading="!tasks.length" :row="4" animate class="u-line-2 skeleton"></skeleton>
          <view class="grid gap-2">
            <template v-for="item in tasks">
              <template v-if="item.plugins">
--- a/src/manifest.json
+++ b/src/manifest.json
@ -85,7 +85,7 @@
    },
    "optimization": {
      "treeShaking": {
-        "enable": true
+        "enable": false
      }
    }
  }
--- a/src/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
+++ b/src/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
@ -1,10 +1,8 @@
 <template>
-  <!-- <view v-if="item.realStart && item.planStart"> -->
-  <view>
+  <view v-if="item.realStart && item.planStart">
    <!-- 任务开始时间延迟插件 -->
    <!-- 超时 -->
-    <!-- <span>{{ $t.time.formatBeginTime((+item.realStart) - (+item.planStart)) }}</span> -->
-    <span>{{ $t.time.formatDuration(1626843599995 - 1626757200000) }}</span>
+    <span>{{ $t.time.formatDuration(+item.realStart - +item.planStart) }}</span>
  </view>
 </template>

--- a/src/utils/time.js
+++ b/src/utils/time.js
@ -241,17 +241,6 @@ const formatObjectTimeToMs = (days = 0, hours = 0, minutes = 0, seconds = 0) =>
  return days * 24 * 60 * 60 * 1000 + hours * 60 * 60 * 1000 + minutes * 60 * 1000 + seconds * 1000;
 };

-const setDuringTime = time => {
-  // 小时
-  const hour = time / (60 * 60);
-  // 分钟
-  const min = time / 60 - hour * 60;
-  // 秒
-  const sec = time - hour * 60 * 60 - min * 60;
-  const result = hour + '时' + min + '分' + sec + '秒';
-  return result;
-};
-
 /**
 * 计算过滤 周期
 * @param {string} time 周期字符串
@ -318,5 +307,4 @@ export default {
  formatObjectTimeToMs,
  computeCycle,
  formatStartTimeToCycleTime,
-  setDuringTime,
 };