diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f3f357..e21f35a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ ### 📦 持续集成 范围|描述|commitId --|--|-- + - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) diff --git a/apis/plugin.js b/apis/plugin.js new file mode 100644 index 0000000..7d18f99 --- /dev/null +++ b/apis/plugin.js @@ -0,0 +1,10 @@ +import Config from '@/common/js/config.js' + +const apiUrl = Config.apiUrl; +const defaultwbs = `${apiUrl}`; + +export function setupPlugin(app) { + uni.$u.api = { ...uni.$u.api } || {}; + // 获取插件信息 + uni.$u.api.getOtherPlugin = param => uni.$u.post(`${defaultwbs}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`); +}; diff --git a/apis/wbs.js b/apis/wbs.js index 2816f08..d3d0a20 100644 --- a/apis/wbs.js +++ b/apis/wbs.js @@ -3,5 +3,5 @@ import Config from "@/common/js/config.js" export function setupWbs(app) { uni.$u.api = { ...uni.$u.api } || {}; // 导入wbs - uni.$u.api.import = formData => this.$upload.chooseAndUpload(`${Config.apiUrl}/wbs`, formData); + uni.$u.api.import = formData => uni.$upload.chooseAndUpload(`${Config.apiUrl}/wbs`, formData); } \ No newline at end of file diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss index 62fc09b..aff246f 100644 --- a/common/styles/tailwind.scss +++ b/common/styles/tailwind.scss @@ -2425,6 +2425,18 @@ grid-auto-flow: column dense; } +.gap-1{ + gap: 0.25rem; +} + +.gap-2{ + gap: 0.5rem; +} + +.gap-3{ + gap: 0.75rem; +} + .auto-rows-auto { grid-auto-rows: auto; } diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss index 29733e9..f851f5a 100644 --- a/common/styles/theme/default.scss +++ b/common/styles/theme/default.scss @@ -1,8 +1,16 @@ // 默认主题文件 .theme-default { - background-color: #333; + background-color: #007aff; + color: #fff; .u-card { font-size: 24px !important; color: #0f0; } + .u-navbar { + background-color: #007aff !important; + color: #fff; + .uicon-nav-back { + color: #fff !important; + } + } } diff --git a/common/styles/theme/test.scss b/common/styles/theme/test.scss index e29dddc..33db59c 100644 --- a/common/styles/theme/test.scss +++ b/common/styles/theme/test.scss @@ -5,4 +5,7 @@ font-size: 24px !important; background-color: #ff0 !important; } + .u-navbar { + background-color: #ff0 !important; + } } diff --git a/components/ChooseChecker/ChooseChecker.vue b/components/ChooseChecker/ChooseChecker.vue new file mode 100644 index 0000000..e4bbe93 --- /dev/null +++ b/components/ChooseChecker/ChooseChecker.vue @@ -0,0 +1,89 @@ + + + diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue index e8d5f9c..07c37c9 100644 --- a/components/Globals/Globals.vue +++ b/components/Globals/Globals.vue @@ -11,8 +11,7 @@ > diff --git a/plugins/p-upload-deliverable/p-upload-deliverable.vue b/plugins/p-upload-deliverable/p-upload-deliverable.vue new file mode 100644 index 0000000..a9f6053 --- /dev/null +++ b/plugins/p-upload-deliverable/p-upload-deliverable.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/plugins/p-wbs-import/p-wbs-import.vue b/plugins/p-wbs-import/p-wbs-import.vue new file mode 100644 index 0000000..bbdedb4 --- /dev/null +++ b/plugins/p-wbs-import/p-wbs-import.vue @@ -0,0 +1,71 @@ + + + diff --git a/store/task/actions.js b/store/task/actions.js index 2ff1f56..15a5909 100644 --- a/store/task/actions.js +++ b/store/task/actions.js @@ -5,7 +5,9 @@ const actions = { * @param {string} roleId 角色id */ getPermanent({ commit }, param) { + commit('setShowGlobalSkeleton', true); uni.$catchReq.getPermanent(param, (err, data) => { + commit('setShowGlobalSkeleton', false); if (err) { console.error('err: ', err); } else { @@ -20,7 +22,9 @@ const actions = { * @param {object} param 请求参数 roleId, timeNode, timeUnit */ getGlobal({ commit }, param) { + commit('setShowGlobalSkeleton', true); uni.$catchReq.getGlobal(param, (err, data) => { + commit('setShowGlobalSkeleton', false); if (err) { console.error('err: ', err); } else { diff --git a/store/task/mutations.js b/store/task/mutations.js index 01d9dd7..af17063 100644 --- a/store/task/mutations.js +++ b/store/task/mutations.js @@ -225,6 +225,15 @@ const mutations = { state.showSkeleton = show; }, + /** + * 设置日常任务骨架屏是否显示 + * @param {Object} state + * @param {Boolean} show + */ + setShowGlobalSkeleton(state, show) { + state.showGlobalSkeleton = show; + }, + /** * 是否设置时间轴自动滚动的位置 * @param {Object} state diff --git a/store/task/state.js b/store/task/state.js index 023378d..ae3cca5 100644 --- a/store/task/state.js +++ b/store/task/state.js @@ -18,6 +18,7 @@ const state = { dailyTasks: [], // 日常任务 tasks: [], // 所有的定期任务 showSkeleton: false, // 定期任务骨架屏 + showGlobalSkeleton: false, // 日常任务骨架屏 newProjectInfo: {}, showScrollTo: false, // 是否可以设置时间轴自动滚动的位置 }; diff --git a/utils/cacheAndRequest.js b/utils/cacheAndRequest.js index f04baa7..cb0598a 100644 --- a/utils/cacheAndRequest.js +++ b/utils/cacheAndRequest.js @@ -83,7 +83,6 @@ export default { uni.$cache .getStorageRegularTask(params) .then(data => { - console.log('cache data: ', data); !remote && fn(null, data); }) .catch(err => !remote && fn(err)); @@ -93,7 +92,6 @@ export default { uni.$u.api .getRegularTask(params) .then(data => { - console.log('api data: ', uni.$u.deepClone(data)); remote = true; fn(null, uni.$u.deepClone(data)); diff --git a/utils/upload.js b/utils/upload.js index 91139d3..60e4d25 100644 --- a/utils/upload.js +++ b/utils/upload.js @@ -55,8 +55,8 @@ export default { */ chooseAndUpload(url, formData = {}, extension = ['.xls', '.xlsx'], name = 'param') { uni.hideLoading(); - clearTimeout(timer); let timer = null; + clearTimeout(timer); return new Promise((resolve, reject) => { const token = uni.$storage.getStorageSync('anyringToken'); if (!token) {