diff --git a/.drone.yml b/.drone.yml
index 3d2c558..51fe1c1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,36 +17,36 @@ volumes:
path: /var/lib/data
steps:
- - name: restore-cache
- image: drillster/drone-volume-cache
- volumes:
- - name: cache
- path: /cache
- settings:
- restore: true
- mount:
- - ./node_modules
+ # - name: restore-cache
+ # image: drillster/drone-volume-cache
+ # volumes:
+ # - name: cache
+ # path: /cache
+ # settings:
+ # restore: true
+ # mount:
+ # - ./node_modules
- name: build
image: node:latest
pull: if-not-exists # default always
- volumes:
- - name: cache
- path: /root/.m2
+ # volumes:
+ # - name: cache
+ # path: /root/.m2
commands:
- npm config set registry http://registry.npm.taobao.org
- npm i
- - npm run build:dev
+ - npm run test
- - name: rebuild-cache
- image: drillster/drone-volume-cache
- volumes:
- - name: cache
- path: /cache
- settings:
- rebuild: true
- mount:
- - ./node_modules
+ # - name: rebuild-cache
+ # image: drillster/drone-volume-cache
+ # volumes:
+ # - name: cache
+ # path: /cache
+ # settings:
+ # rebuild: true
+ # mount:
+ # - ./node_modules
- name: deploy-scp
image: appleboy/drone-scp
@@ -61,7 +61,7 @@ steps:
key_path: /root/.ssh/id_rsa
rm: true # true则会删除目标目录重建
target: /home/tall/v4.0.0
- source: dist/**/*
+ source: dist/*
strip_components: 1 # 去除的目录层数,如果没有该选项,则拷贝过去是 target/xxx.jar,1代表去除target
# - name: run-ssh
@@ -124,7 +124,7 @@ steps:
- success
trigger:
- branch: develop
+ branch: feat
# - name: notify-dingtalk
# image: lddsb/drone-dingtalk-message
# environment:
diff --git a/App.vue b/App.vue
index a526b47..0368041 100644
--- a/App.vue
+++ b/App.vue
@@ -43,19 +43,18 @@ export default {
if (token && tokenIsAvailable) {
// 1.1 store里有token 且没过期直接:使用store的token
return token;
- } else {
- // 2. 根据userId获取token
- if (userId) {
- try {
- const { token } = await this.$store.dispatch('user/getTokenByUserId', userId);
- return token;
- } catch (error) {
- console.error('error: ', error);
- return null;
- }
- } else {
+ }
+ // 2. 根据userId获取token
+ if (userId) {
+ try {
+ const { token } = await this.$store.dispatch('user/getTokenByUserId', userId);
+ return token;
+ } catch (error) {
+ console.error('error: ', error);
return null;
}
+ } else {
+ return null;
}
},
@@ -166,4 +165,5 @@ export default {
page {
height: 100%;
}
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c913aa4..720d2ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
- | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75)
- | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)
- | 使用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)
- | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..cb2986f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# 时物链条
+
+[](http://101.201.226.163:3001/TALL/TALL-MUI-4)
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index f851f5a..038cb4a 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -1,7 +1,7 @@
// 默认主题文件
.theme-default {
background-color: #007aff;
- color: #fff;
+ // color: #fff;
.u-card {
font-size: 24px !important;
color: #0f0;
@@ -13,4 +13,7 @@
color: #fff !important;
}
}
+ button{
+ border: none!important;
+ }
}
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index d740eca..c343551 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/components/Render/Render.vue b/components/Render/Render.vue
index 5f83039..a88b66e 100644
--- a/components/Render/Render.vue
+++ b/components/Render/Render.vue
@@ -1,8 +1,9 @@
-
+
+
+
diff --git a/components/TimeLine/component/TimeBox.vue b/components/TimeLine/component/TimeBox.vue
index e82a89b..b40e172 100644
--- a/components/TimeLine/component/TimeBox.vue
+++ b/components/TimeLine/component/TimeBox.vue
@@ -15,13 +15,14 @@
-
+
+
-
-
-
-
-
-
-
+ -->
+
+
+
+
+
-
-
+
+
+
@@ -65,7 +68,6 @@ import TimeStatus from './TimeStatus.vue';
import TaskTools from './TaskTools.vue';
import Skeleton from '@/components/Skeleton/Skeleton.vue';
-
const data = reactive({
currentComponent: '',
styleType: 0,
diff --git a/pages/project/project.vue b/pages/project/project.vue
index aaa1cc0..2584a2f 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -1,5 +1,5 @@
-
+
@@ -16,7 +16,7 @@
测试切换主题
-
+
-
+
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index 1e501b0..a005c2f 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -1,9 +1,18 @@
+
p-deliver
+
-
+
diff --git a/plugins/p-delivery-history/p-delivery-history.vue b/plugins/p-delivery-history/p-delivery-history.vue
index 928fd6b..3ced255 100644
--- a/plugins/p-delivery-history/p-delivery-history.vue
+++ b/plugins/p-delivery-history/p-delivery-history.vue
@@ -1,5 +1,6 @@
+
@@ -39,6 +40,7 @@
+
-
+
+
diff --git a/plugins/p-delivery-history/p-delivery-history1.vue b/plugins/p-delivery-history/p-delivery-history1.vue
deleted file mode 100644
index f97cb1c..0000000
--- a/plugins/p-delivery-history/p-delivery-history1.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
-
-
- {{ list.name }}
- {{ $moment(+list.time).format('YYYY-MM-DD HH:mm:ss') }}
-
-
- {{
- list.content
- }}
- {{ list.content }}
-
-
-
-
- {{ checker.checkerName }}
- (我)
-
-
- 通过
- 驳回
- {{ checker.score }}分
- 未审核
-
-
- 通过
-
- 驳回
-
-
-
- {{ checker.remark }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/p-manage-member/p-manage-member.vue b/plugins/p-manage-member/p-manage-member.vue
index 220e966..26a6d83 100644
--- a/plugins/p-manage-member/p-manage-member.vue
+++ b/plugins/p-manage-member/p-manage-member.vue
@@ -1,6 +1,17 @@
+
成员管理
+
+
+
diff --git a/plugins/p-manage-project/p-manage-project.vue b/plugins/p-manage-project/p-manage-project.vue
index 65a16bb..9b305cd 100644
--- a/plugins/p-manage-project/p-manage-project.vue
+++ b/plugins/p-manage-project/p-manage-project.vue
@@ -1,6 +1,17 @@
+
项目管理
+
+
+
diff --git a/plugins/p-manage-role/p-manage-role.vue b/plugins/p-manage-role/p-manage-role.vue
index 51558a0..1567a21 100644
--- a/plugins/p-manage-role/p-manage-role.vue
+++ b/plugins/p-manage-role/p-manage-role.vue
@@ -1,6 +1,17 @@
+
角色管理
+
+
+
diff --git a/plugins/p-manage-task/p-manage-task.vue b/plugins/p-manage-task/p-manage-task.vue
index 575e828..73a4a39 100644
--- a/plugins/p-manage-task/p-manage-task.vue
+++ b/plugins/p-manage-task/p-manage-task.vue
@@ -1,6 +1,17 @@
+
任务管理
+
+
+
diff --git a/plugins/p-subproject/p-subproject.vue b/plugins/p-subproject/p-subproject.vue
index a53419c..2228352 100644
--- a/plugins/p-subproject/p-subproject.vue
+++ b/plugins/p-subproject/p-subproject.vue
@@ -1,6 +1,6 @@
-
+
{{ item.name }}
@@ -51,4 +51,11 @@ function openProject(project) {
}
-
+
diff --git a/plugins/p-subtasks/p-subtasks.vue b/plugins/p-subtasks/p-subtasks.vue
index 1edc4e0..b9b8a36 100644
--- a/plugins/p-subtasks/p-subtasks.vue
+++ b/plugins/p-subtasks/p-subtasks.vue
@@ -1,5 +1,5 @@
-
+
{{ item.name }}
@@ -28,4 +28,11 @@ async function getSonTask() {
getSonTask();
-
+
diff --git a/plugins/p-task-countdown/p-task-countdown.vue b/plugins/p-task-countdown/p-task-countdown.vue
index ee7bf8f..a334968 100644
--- a/plugins/p-task-countdown/p-task-countdown.vue
+++ b/plugins/p-task-countdown/p-task-countdown.vue
@@ -1,10 +1,19 @@
+
任务倒计时插件
+
-
+
diff --git a/plugins/p-task-description/p-task-description.vue b/plugins/p-task-description/p-task-description.vue
index bd4bdc9..8b37892 100644
--- a/plugins/p-task-description/p-task-description.vue
+++ b/plugins/p-task-description/p-task-description.vue
@@ -1,9 +1,20 @@
+
{{ task.description }}
+
+
+
diff --git a/plugins/p-task-duration-delay/p-task-duration-delay.vue b/plugins/p-task-duration-delay/p-task-duration-delay.vue
index ab9aba4..8495b4f 100644
--- a/plugins/p-task-duration-delay/p-task-duration-delay.vue
+++ b/plugins/p-task-duration-delay/p-task-duration-delay.vue
@@ -1,5 +1,5 @@
-
+
@@ -21,3 +21,12 @@ const realDuration = computed(() => props.task.realDuration);
const planDuration = computed(() => props.task.planDuration);
+
+
diff --git a/plugins/p-task-start-time-delay/p-task-start-time-delay.vue b/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
index df4daeb..4a05c20 100644
--- a/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
+++ b/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
@@ -1,10 +1,12 @@
+
{{ $time.formatDuration(+realStart - +planStart) }}
+
+
+
diff --git a/plugins/p-task-title/p-task-title.vue b/plugins/p-task-title/p-task-title.vue
index 2cf8195..53f259f 100644
--- a/plugins/p-task-title/p-task-title.vue
+++ b/plugins/p-task-title/p-task-title.vue
@@ -1,10 +1,19 @@
-
+
{{ task.name }}
-
+
+
+
diff --git a/plugins/p-upload-deliverable/p-upload-deliverable.vue b/plugins/p-upload-deliverable/p-upload-deliverable.vue
index 951ab3f..64309af 100644
--- a/plugins/p-upload-deliverable/p-upload-deliverable.vue
+++ b/plugins/p-upload-deliverable/p-upload-deliverable.vue
@@ -1,6 +1,6 @@
-
+
@@ -87,4 +87,11 @@ async function submit() {
}
-
+
diff --git a/plugins/p-wbs-import/p-wbs-import.vue b/plugins/p-wbs-import/p-wbs-import.vue
index 8b1b9de..9f04c8d 100644
--- a/plugins/p-wbs-import/p-wbs-import.vue
+++ b/plugins/p-wbs-import/p-wbs-import.vue
@@ -1,5 +1,5 @@
-
+
{{ task.name }}
{{ task.name }}
@@ -69,3 +69,12 @@ async function handleUpload() {
}
}
+
+