Browse Source

fix: 登录验证码获取

test2
xuesinan 4 years ago
parent
commit
83866e5d09
  1. 1
      CHANGELOG.md
  2. 6
      apis/plugin.js
  3. 10
      components/Plugin/Plugin.vue
  4. 2
      hooks/project/useInit.js
  5. 3
      pages/project/project.vue
  6. 4
      plugins/p-deliver/p-deliver.vue

1
CHANGELOG.md

@ -76,6 +76,7 @@
--|--|-- --|--|--
- | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
- | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714) - | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714)
- | 登录页验证码获取 | [108e322](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/108e322)
- | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5) - | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5)
交付物 | 修复检查人选择组件之间相互影响的bug | [435c0bd](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/435c0bd) 交付物 | 修复检查人选择组件之间相互影响的bug | [435c0bd](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/435c0bd)
交付物 | 重构交付物审核部分,修复审核bug | [5fd8889](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5fd8889) 交付物 | 重构交付物审核部分,修复审核bug | [5fd8889](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5fd8889)

6
apis/plugin.js

@ -1,18 +1,18 @@
import { computed } from 'vue';
import Config from '@/common/js/config.js'; import Config from '@/common/js/config.js';
import { computed } from 'vue';
import store from '@/store/index.js'; import store from '@/store/index.js';
const { apiUrl } = Config.apiUrl; const { apiUrl } = Config.apiUrl;
// const defaultwbs = `${apiUrl}/defaultwbs`; // const defaultwbs = `${apiUrl}/defaultwbs`;
const domain = computed(() => store.state.domain); const domain = computed(() => store.state.domain);
console.log('domain: ', domain.value);
export function setupPlugin(app) { export function setupPlugin(app) {
uni.$u.api = { ...uni.$u.api } || {}; uni.$u.api = { ...uni.$u.api } || {};
// 获取插件信息 // 获取插件信息
// uni.$u.api.getOtherPlugin = param => // uni.$u.api.getOtherPlugin = param =>
// uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`); // uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`);
uni.$u.api.getOtherPlugin = param => uni.$u.api.getOtherPlugin = param => uni.$u.post(`${apiUrl}/opt/business/businessPluginById?businessPluginId=${param.businessPluginId}`);
uni.$u.post(`${apiUrl}/opt/business/businessPluginById?businessPluginId=${param.businessPluginId}`);
// 查询子任务 // 查询子任务
uni.$u.api.findSonTask = param => uni.$u.post(`${domain.value}/task/findSonTask`, param); uni.$u.api.findSonTask = param => uni.$u.post(`${domain.value}/task/findSonTask`, param);

10
components/Plugin/Plugin.vue

@ -1,8 +1,8 @@
<template> <template>
<view class="u-font-14 rounded-md bg-white p-2" style="height: 100%" @click="setStorage"> <view class="u-font-14 rounded-md bg-white" style="height: 100%" @click="setStorage">
<!-- <plugin-default /> --> <!-- <plugin-default /> -->
<!-- <component :task="task" :is="pluginComponent"></component> --> <!-- <component :task="task" :is="pluginComponent"></component> -->
<p-task-title :task="task" v-if="pluginId === '1'" /> <p-task-title :task="task" v-if="pluginId === '1'" class="p-2" />
<!-- <p-task-description :task="task" v-if="pluginId === '2'" /> <!-- <p-task-description :task="task" v-if="pluginId === '2'" />
<p-task-duration-delay :task="task" v-if="pluginId === '3'" /> <p-task-duration-delay :task="task" v-if="pluginId === '3'" />
<p-task-start-time-delay :task="task" v-if="pluginId === '4'" /> <p-task-start-time-delay :task="task" v-if="pluginId === '4'" />
@ -19,9 +19,9 @@
<!-- 交付物插件 --> <!-- 交付物插件 -->
<p-deliver v-else-if="pluginId === '15'" /> <p-deliver v-else-if="pluginId === '15'" />
<p-source-manage v-else-if="pluginId === '16'" /> <p-source-manage v-else-if="pluginId === '16'" class="p-2" />
<p-finance-audit v-else-if="pluginId === '17'" /> <p-finance-audit v-else-if="pluginId === '17'" class="p-2" />
<p-finance v-else-if="pluginId === '18'" /> <p-finance v-else-if="pluginId === '18'" class="p-2" />
<Render v-else :task="task" :pluginId="pluginId" :styleType="styleType" :pluginTaskId="pluginTaskId" :param="param" /> <Render v-else :task="task" :pluginId="pluginId" :styleType="styleType" :pluginTaskId="pluginTaskId" :param="param" />
</view> </view>
</template> </template>

2
hooks/project/useInit.js

@ -96,7 +96,7 @@ export default function useInit() {
// 根据项目id获取角色列表 // 根据项目id获取角色列表
getRoles(params); getRoles(params);
// 根据项目id获取成员列表 // 根据项目id获取成员列表
// store.dispatch('role/getAllMembers', { projectId: options.p }); store.dispatch('role/getAllMembers', { projectId: options.p });
} }
} }

3
pages/project/project.vue

@ -127,7 +127,7 @@ watch(globals, () => {
const arr = [...allTasks.value]; const arr = [...allTasks.value];
arr[index].global = [...globals.value]; arr[index].global = [...globals.value];
store.commit('task/setAllTasks', arr); store.commit('task/setAllTasks', arr);
}) });
// //
function getGlobalData() { function getGlobalData() {
@ -190,7 +190,6 @@ function setScrollPosition() {
uni.$storage.setStorageSync('taskId', ''); // uni.$storage.setStorageSync('taskId', ''); //
} else { } else {
if (allTasks.value[roleIndex.value].task && allTasks.value[roleIndex.value].task.length) { if (allTasks.value[roleIndex.value].task && allTasks.value[roleIndex.value].task.length) {
} else { } else {
allTasks.value[roleIndex.value].task = []; allTasks.value[roleIndex.value].task = [];
} }

4
plugins/p-deliver/p-deliver.vue

@ -1,9 +1,9 @@
<template> <template>
<view> <view>
<!-- 上传提交 --> <!-- 上传提交 -->
<p-deliver-upload v-if="isMine && deliver" @upload-success="getDeliverData"></p-deliver-upload> <p-deliver-upload v-if="isMine && deliver" @upload-success="getDeliverData" class="p-2"></p-deliver-upload>
<p-deliver-check v-if="deliver" @check-success="getDeliverData"></p-deliver-check> <p-deliver-check v-if="deliver" @check-success="getDeliverData" class="p-2"></p-deliver-check>
</view> </view>
</template> </template>

Loading…
Cancel
Save