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

Reviewed-on: https://dd.tall.wiki/gitea/wally/TALL-MUI-3/pulls/29

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 0.1.0 (2021-07-26)
+# 0.1.0 (2021-07-28)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -10,6 +10,7 @@
  - | tall插件封装 | 1bcb920
  - | ws storage | 21b3a06
  - | 全局插件及默认插件位置修改 | 6c80d08
+ - | 字体大小更改 | 82cfdd4
  - | 存token | b8a178d
  - | 定期任务面板骨架屏添加 | b2698c0
  富文本插件 | 富文本插件demo测试 | ed3d644
@@ -26,6 +27,7 @@
  - | 模拟接口测试 | 69e7931
  - | 添加时间轴上下滚动 | 2b81bbc
  - | 角色栏实现 | 94cd671
+ - | 距调整pc端 | 5069aa1
  - | 配置默认插件接口 | f0c177d
 
 
@@ -62,6 +64,7 @@
  - | 插件bug解决 | 41257eb
  - | 日常任务html数据查验 | 880ce5c
  - | 日常任务插件遍历时的key值修改 | cd26285
+ - | 日常任务插件面板高度修改 | 249f9e4
  - | 时间轴上下滑动 | 4d0ae46
  - | 时间轴上下滚动数据加载bug修改 | e82ede4
  - | 时间轴插件 | 225d3cc
@@ -69,26 +72,6 @@
  - | 角色栏修改 | 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)
- - | 上下滑动加载定期任务 | [4090d89](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4090d89)
- - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/225d3cc)
- - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ca78d02)
- - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e82ede4)
- - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4d0ae46)
- - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f2f06c5)
- - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0b95a0e)
- - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/531c14d)
- - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a54c601)
- - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/749ae9a)
 
 
 ### 📝 文档
@@ -103,6 +86,7 @@
  - | project 代码健壮性完善 | a3202c5
  template | eslint prettier sass uview tailwindcss | 9c966a1
  - | 下滑时间轴添加备注 | 4fd20e3
+ - | 界面样式调整 | 4367249
 
 
 ### 🚀 性能优化
@@ -123,11 +107,14 @@
  - | api 封装 | 8dcb8a2
  - | env host修改 | a79a4a5
  - | merge globals | b0957cc
+ - | merge wrr | 5ccc7a5
  - | mock | 51c24a5
+ package manifest | 去掉了摇树 | f7c1dd4
  pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | 875fab4
  - | uview-ui | a9ea34b
  信息配置 | 配置eslint等配置 | 7421443
  - | 修复不能build的问题 | 0b7b91e
+ - | 删除多余的构建的命令 | 3f4eb2f
 
 
 范围|描述|commitId
@@ -135,3 +122,4 @@
  - | style:index | 978f272
  - | !2 基础模板v1.1.0 | f5e61dd
  - | init | c0f1deb
+

package-lock.json

@@ -3514,15 +3514,25 @@
             "color-convert": "^2.0.1"
           }
         },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995384030&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
-          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
+        "css-loader": {
+          "version": "3.6.0",
+          "resolved": "https://registry.nlark.com/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1626725891008&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
+          "integrity": "sha1-Lkssfm4tJ/jI8o9hv/zS5ske9kU=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "camelcase": "^5.3.1",
+            "cssesc": "^3.0.0",
+            "icss-utils": "^4.1.1",
+            "loader-utils": "^1.2.3",
+            "normalize-path": "^3.0.0",
+            "postcss": "^7.0.32",
+            "postcss-modules-extract-imports": "^2.0.0",
+            "postcss-modules-local-by-default": "^3.0.2",
+            "postcss-modules-scope": "^2.2.0",
+            "postcss-modules-values": "^3.0.0",
+            "postcss-value-parser": "^4.1.0",
+            "schema-utils": "^2.7.0",
+            "semver": "^6.3.0"
           }
         },
         "color-convert": {
@@ -3878,11 +3888,7 @@
           "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz?cache=0&sync_timestamp=1626830452707&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.3.3.tgz",
           "integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
           },
           "dependencies": {
             "loader-utils": {
@@ -3899,7 +3905,6 @@
             }
           }
         }
-      }
     },
     "@vue/cli-shared-utils": {
       "version": "4.5.13",
@@ -12100,7 +12105,7 @@
           "integrity": "sha1-DwB18bslRHZs9zumpuKt/ryxPy0=",
           "dev": true,
           "requires": {
-            "resolve-from": "^5.0.0"
+            "p-locate": "^4.1.0"
           }
         },
         "resolve-from": {
@@ -13088,76 +13093,12 @@
           "version": "1.1.4",
           "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
           "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-4.1.0.tgz",
-          "integrity": "sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz",
-          "integrity": "sha1-Gvujlq/WdqbUJQTQpno6frn2KqA=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-4.1.0.tgz",
-          "integrity": "sha1-o0KLtwiLOmApL2aRkni3wpetTwc=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-4.0.0.tgz",
-          "integrity": "sha1-UTvb4tO5XXdi6METfvoZXGxhtbM=",
-          "dev": true
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/slash/download/slash-3.0.0.tgz",
-          "integrity": "sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "yargs": {
-          "version": "15.4.1",
-          "resolved": "https://registry.nlark.com/yargs/download/yargs-15.4.1.tgz?cache=0&sync_timestamp=1626358476652&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs%2Fdownload%2Fyargs-15.4.1.tgz",
-          "integrity": "sha1-DYehbeAa7p2L7Cv7909nhRcw9Pg=",
-          "dev": true,
-          "requires": {
             "cliui": "^6.0.0",
             "decamelize": "^1.2.0",
             "find-up": "^4.1.0",
             "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
             "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
             "string-width": "^4.2.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
@@ -17674,7 +17615,8 @@
     "right-pad": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/right-pad/download/right-pad-1.0.1.tgz",
-      "integrity": "sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA="
+      "integrity": "sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=",
+      "dev": true
     },
     "rimraf": {
       "version": "2.7.1",
@@ -20151,6 +20093,94 @@
         "vue-style-loader": "^4.1.0"
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.3.3",
+      "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz?cache=0&sync_timestamp=1626830452707&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.3.3.tgz",
+      "integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995384030&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
+          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
+        "hash-sum": {
+          "version": "2.0.0",
+          "resolved": "https://registry.nlark.com/hash-sum/download/hash-sum-2.0.0.tgz",
+          "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.3.tgz",

package.json

@@ -8,43 +8,18 @@
     "lint": "vue-cli-service lint",
     "fix": "vue-cli-service lint --fix",
     "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",
-    "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
-    "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
-    "build:mp-kuaishou": "cross-env NODE_ENV=production UNI_PLATFORM=mp-kuaishou vue-cli-service uni-build",
-    "build:mp-qq": "cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build",
-    "build:mp-toutiao": "cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build",
-    "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build",
-    "build:quickapp-native": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-native vue-cli-service uni-build",
-    "build:quickapp-webview": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview vue-cli-service uni-build",
-    "build:quickapp-webview-huawei": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build",
-    "build:quickapp-webview-union": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview-union vue-cli-service uni-build",
     "cz": "npm run log && git add . && git cz",
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
-    "dev:mp-360": "cross-env NODE_ENV=development UNI_PLATFORM=mp-360 vue-cli-service uni-build --watch",
-    "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch",
-    "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch",
-    "dev:mp-kuaishou": "cross-env NODE_ENV=development UNI_PLATFORM=mp-kuaishou vue-cli-service uni-build --watch",
-    "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch",
-    "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch",
     "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch",
-    "dev:quickapp-native": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-native vue-cli-service uni-build --watch",
-    "dev:quickapp-webview": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview vue-cli-service uni-build --watch",
-    "dev:quickapp-webview-huawei": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build --watch",
-    "dev:quickapp-webview-union": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-union vue-cli-service uni-build --watch",
     "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
     "log": "conventional-changelog --config ./node_modules/vue-cli-plugin-commitlint/lib/log -i CHANGELOG.md -s -r 0",
-    "serve:quickapp-native": "node node_modules/@dcloudio/uni-quickapp-native/bin/serve.js",
     "test:android": "cross-env UNI_PLATFORM=app-plus UNI_OS_NAME=android jest -i",
     "test:h5": "cross-env UNI_PLATFORM=h5 jest -i",
     "test:ios": "cross-env UNI_PLATFORM=app-plus UNI_OS_NAME=ios jest -i",
-    "test:mp-baidu": "cross-env UNI_PLATFORM=mp-baidu jest -i",
     "test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
   },
   "dependencies": {

src/components/Plugin/Plugin.vue

@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view class="u-font-14">
     <view style="height: 100%" v-if="pluginContent">
       <view v-if="pluginContent.html">
         <view style="height: 100%" v-html="pluginContent.html"></view>

src/components/Roles/Roles.vue

@@ -4,7 +4,7 @@
       <scroll-view :enable-flex="true" :scroll-left="scrollLeft" :throttle="false" scroll-with-animation scroll-x>
         <view class="tab-box">
           <view :key="index" @click="changeIndex(item.id, index)" class="tab-item" v-for="(item, index) in roles">
-            <view :class="setColor(item.mine, item.id)" class="tab-children u-skeleton-fillet">{{ item.name }}</view>
+            <view :class="setColor(item.mine, item.id)" class="tab-children u-skeleton-fillet u-font-14">{{ item.name }}</view>
           </view>
         </view>
       </scroll-view>

src/components/TimeLine/TimeLine.vue

@@ -13,9 +13,9 @@
     id="scroll"
   >
     <!-- 时间轴 -->
-    <u-divider bg-color="#f3f4f6" class="pt-5" v-if="topEnd">到顶啦</u-divider>
+    <u-divider bg-color="#f3f4f6" class="pt-5" fontSize="14px" v-if="topEnd">到顶啦</u-divider>
     <TimeBox />
-    <u-divider bg-color="#f3f4f6" class="pb-5" v-if="bottomEnd">到底啦</u-divider>
+    <u-divider bg-color="#f3f4f6" class="pb-5" fontSize="14px" v-if="bottomEnd">到底啦</u-divider>
   </scroll-view>
 </template>
 

src/components/TimeLine/component/TimeBox.vue

@@ -1,23 +1,23 @@
 <template>
-  <view class="px-3 py-5">
+  <view class="column">
     <view :key="index" v-for="(item, index) in tasks">
       <view class="flex">
         <TimeStatus :content="JSON.stringify(item.process)" :status="item.process" />
-        <view class="flex justify-between items-center flex-1 ml-2">
+        <view class="flex items-center justify-between flex-1 ml-2 task-column">
           <view>
             <span>{{ $moment(+item.planStart).format('MM-DD HH:mm') }}</span>
           </view>
           <view>
-            <view class="flex justify-between" style="min-width: 180rpx">
-              <u-icon custom-prefix="custom-icon" name="C-bxl-redux" size="34"></u-icon>
-              <u-icon custom-prefix="custom-icon" name="attachment" size="42"></u-icon>
-              <u-icon custom-prefix="custom-icon" name="moneycollect" size="40"></u-icon>
+            <view class="flex justify-between" style="min-width: 90px">
+              <u-icon custom-prefix="custom-icon" name="C-bxl-redux" size="17px"></u-icon>
+              <u-icon custom-prefix="custom-icon" name="attachment" size="21px"></u-icon>
+              <u-icon custom-prefix="custom-icon" name="moneycollect" size="20px"></u-icon>
             </view>
           </view>
         </view>
       </view>
-      <view class="border-l-2 border-gray-300 ml-3.5 my-2">
-        <view class="ml-4 overflow-hidden shadow-lg task-box">
+      <view class="border-l-2 border-gray-300 plugin">
+        <view class="ml-3 overflow-hidden shadow-lg task-box">
           <u-card
             :show-foot="false"
             :show-head="false"
@@ -100,4 +100,22 @@ export default {
 .task-box {
   border-radius: 24rpx;
 }
+.column {
+  padding: 24px 14px;
+}
+.task-column {
+  height: 33px;
+}
+.plugin {
+  margin-top: 8px;
+  margin-bottom: 8px;
+  margin-left: 15px;
+}
+/deep/ .ml-2 {
+  margin-left: 16px;
+}
+
+/deep/ .ml-3 {
+  margin-left: 20px;
+}
 </style>

src/components/TimeLine/component/TimeStatus.vue

@@ -1,34 +1,34 @@
 <template>
-  <view>
-    <view @tap="changeStatus($event, 0)" class="flex items-center justify-center text-blue-400 rounded-full h-7 w-7" v-if="status === 0">
-      <view class="circular text-center">
-        <u-icon color="#2979ff" name="checkmark" size="30"></u-icon>
-      </view>
-      <!-- <u-circle-progress
-        :percent="100"
-        active-color="#2979ff"
-        bg-color="rgba(255,255,255,0)"
-        borderWidth="4"
-        width="66"
-      >
+  <view class="u-font-14">
+    <view
+      class="flex items-center justify-center text-blue-400 rounded-full icon-column"
+      v-if="status === 0"
+      @tap="changeStatus($event, 0)"
+    >
+      <u-circle-progress :percent="100" active-color="#2979ff" bgColor="rgba(255,255,255,0)" borderWidth="4" width="66">
         <view class="u-progress-content">
           <view class="u-progress-dot"></view>
           <view class="u-progress-info">
             <u-icon name="checkmark" size="30"></u-icon>
           </view>
         </view>
-      </u-circle-progress>-->
+      </u-circle-progress>
     </view>
-    <view @tap="changeStatus($event, 1)" class="flex items-center justify-center text-black rounded-full h-7 w-7" v-if="status === 1">
-      <u-circle-progress :percent="80" active-color="#2979ff" bg-color="rgba(255,255,255,0)" borderWidth="6" width="66">
+
+    <view class="flex items-center justify-center text-black rounded-full icon-column" v-if="status === 1" @tap="changeStatus($event, 1)">
+      <u-circle-progress :percent="80" active-color="#2979ff" bgColor="rgba(255,255,255,0)" borderWidth="6" width="66">
         <view class="u-progress-content">
           <view class="u-progress-dot"></view>
           <view class="u-progress-info">{{ time }}</view>
         </view>
       </u-circle-progress>
     </view>
-    <view @tap="changeStatus($event, 2)" class="flex items-center justify-center text-gray-400 rounded-full h-7 w-7" v-if="status === 2">
-      <u-circle-progress :percent="40" active-color="#2979ff" bg-color="rgba(255,255,255,0)" borderWidth="6" width="66">
+    <view
+      class="flex items-center justify-center text-gray-400 rounded-full icon-column"
+      v-if="status === 2"
+      @tap="changeStatus($event, 2)"
+    >
+      <u-circle-progress :percent="40" active-color="#2979ff" bgColor="rgba(255,255,255,0)" borderWidth="6" width="66">
         <view class="u-progress-content">
           <view class="u-progress-dot"></view>
           <view class="u-progress-info">
@@ -38,8 +38,8 @@
       </u-circle-progress>
     </view>
     <view
+      class="flex items-center justify-center font-black text-red-800 rounded-full icon-column"
       @tap="changeStatus($event, 3)"
-      class="flex items-center justify-center font-black text-red-800 rounded-full h-7 w-7"
       v-if="status === 3"
     >
       <u-circle-progress :percent="80" active-color="#2979ff" bg-color="rgba(255,255,255,0)" borderWidth="6" width="66">
@@ -106,12 +106,13 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-.circular {
-  width: 62rpx;
-  height: 62rpx;
-  border-radius: 50%;
-  border: 6rpx solid #2979ff;
-  line-height: 56rpx;
+<style scoped lang="scss">
+.icon-column {
+  height: 33px;
+  width: 33px;
+}
+.one {
+  height: 33px;
+  width: 33px;
 }
 </style>

src/components/Title/Title.vue

@@ -1,14 +1,14 @@
 <template>
   <view>
-    <u-navbar back-text="返回">
+    <u-navbar :is-back="false" back-text="返回">
       <view class="flex justify-center flex-1">
-        <view>{{ project.name }}</view>
+        <view>我是标题</view>
       </view>
       <view class="mr-2" slot="right">
-        <u-icon class="m-1" name="xuanzhong2" custom-prefix="custom-icon" size="38"></u-icon>
-        <u-icon class="m-1" name="shuaxin1" custom-prefix="custom-icon" size="38"></u-icon>
-        <u-icon class="m-1" name="home" custom-prefix="custom-icon" size="38"></u-icon>
-        <u-icon class="m-1" name="xuanxiang" custom-prefix="custom-icon" size="38"></u-icon>
+        <u-icon class="m-1" name="xuanzhong2" custom-prefix="custom-icon" size="20px" @click="lwbs"></u-icon>
+        <u-icon class="m-1" name="shuaxin1" custom-prefix="custom-icon" size="20px" @click="projectOverview"></u-icon>
+        <u-icon class="m-1" name="home" custom-prefix="custom-icon" size="20px" @click="statistics"></u-icon>
+        <u-icon class="m-1" name="xuanxiang" custom-prefix="custom-icon" size="20px" @click="operation"></u-icon>
       </view>
     </u-navbar>
   </view>
@@ -22,5 +22,24 @@ export default {
   },
 
   computed: mapState('home', ['project']),
+
+  methods: {
+    // LWBS提示
+    lwbs() {
+      this.$t.ui.showToast('LWBS');
+    },
+    //项目概览
+    projectOverview() {
+      this.$t.ui.showToast('项目概览');
+    },
+    //统计
+    statistics() {
+      this.$t.ui.showToast('统计');
+    },
+    //操作
+    operation() {
+      this.$t.ui.showToast('操作');
+    },
+  },
 };
 </script>

src/pages/project/project.vue

@@ -1,8 +1,8 @@
 <template>
-  <view :style="{ height: height }" class="flex flex-col overflow-hidden">
+  <view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14">
     <!-- 标题栏 -->
     <Title />
-    <view class="container flex flex-col flex-1 overflow-hidden bg-gray-100">
+    <view class="container flex flex-col flex-1 overflow-hidden bg-gray-100" style="margin: auto">
       <!-- 角色栏 -->
       <Roles @getTasksByRole="getTasksByRole" />
       <Globals :tasks="allPlugins.concat(timePlugins)" />