Browse Source

Merge branch 'feat' of ssh://101.201.226.163:50022/TALL/TALL-MUI-4 into feat

test2
wally 4 years ago
parent
commit
905f86cd93
  1. 63
      CHANGELOG.md
  2. 5
      pages/detailWebview/detailWebview.vue
  3. 12
      plugins/p-finance-audit/p-finance-audit.vue
  4. 1
      utils/ui.js

63
CHANGELOG.md

@ -2,6 +2,69 @@
### 🌟 新功能 ### 🌟 新功能
| 范围 | 描述 | commitId |
| -------------- | ------------------------------------ | ------------------------------------------------------------------------ |
| - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) |
| - | 财务条插件的进度条和上方悬浮按钮界面 | [8322e92](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8322e92) |
| 财务 | 细节调整;根据任务获取财务条信息 | [414106a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/414106a) |
| - | 插件的填写提交,编辑与删除 | [84390d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/84390d5) |
| - | 插件的填写与提交,修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252) |
| - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b) |
| - | 插件 api | [08bdf74](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/08bdf74) |
| - | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0) |
| - | 登录按钮 | [527b0e5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/527b0e5) |
| - | 登录图标、日历页今日 | [7de419d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7de419d) |
| - | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b) |
| - | 给财务条传参数 | [5ff7706](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ff7706) |
| - | 给财务条详情页传参 | [fa92a11](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fa92a11) |
| - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) |
| - | 工作台按钮 | [6e434e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6e434e6) |
| - | 工作台功能 | [b674733](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b674733) |
| - | 广告页、引导页 | [fe87d00](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fe87d00) |
| - | 广告页、引导页 | [1c89806](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1c89806) |
| - | 广告页、引导页改为组件 | [2be7903](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2be7903) |
| - | 缓存改变 | [9685d55](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9685d55) |
| - | 获取交付物信息 | [5ae68e2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ae68e2) |
| - | 获取手机唯一码 | [3f60cf8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3f60cf8) |
| - | 将时间轴改成 swiper 滑动 | [12384f9](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12384f9) |
| - | 解决时间轴日常任务不显示问题 | [c532a93](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c532a93) |
| - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) |
| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) |
| - | 设置项目域名 | [1a835f1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1a835f1) |
| - | 设置状态栏 | [9871356](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9871356) |
| - | 审核插件的基本信息展示 | [aa4f17f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa4f17f) |
| - | 审核插件的通过与驳回功能 | [03a7c35](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a7c35) |
| - | 时间轴调整 | [81d2500](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/81d2500) |
| - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) |
| - | 时间轴页面 | [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) |
| - | 刷新 token 重新运行 api | [02fb4bf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/02fb4bf) |
| - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) |
| - | 未登录调用项目列表接口 | [aab6489](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aab6489) |
| - | 细节调整;解开查所有成员的 api | [ee18175](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ee18175) |
| - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) |
| - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) |
| - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d) |
| - | 引导页、广告页 | [4aa76ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4aa76ff) |
| - | 域名配置 | [b68272d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b68272d) |
| - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) |
| - | 主体颜色 | [bb5c0e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bb5c0e3) |
| - | 注册、用户协议 | [68e9189](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/68e9189) |
| - | 状态栏、导入 | [f30bac2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f30bac2) |
| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) |
| - | app 端请求路径不对 | [b31fa14](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b31fa14) |
| deliver 交付物 | 点击交付物链接 webview 打开链接 | [daa59f1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/daa59f1) |
| - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) |
| - | get 请求 | [3a61439](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3a61439) |
| project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) |
| theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) |
| - | token 过期策略 | [8f16ae1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f16ae1) |
| - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) |
| 范围 | 描述 | commitId | | 范围 | 描述 | commitId |
| -------------- | ------------------------------------ | ------------------------------------------------------------------------ | | -------------- | ------------------------------------ | ------------------------------------------------------------------------ |
| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) | | - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) |

5
pages/detailWebview/detailWebview.vue

@ -14,12 +14,11 @@ onLoad(options => {
return; return;
} }
if (options.url) { if (options.url) {
console.log('options.url', options.url);
src.value = options.url; src.value = options.url;
} }
if (options.name) { if (options.name) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({ title: options.name || '详情页' });
title: options.name || '详情页',
});
} }
}); });
</script> </script>

12
plugins/p-finance-audit/p-finance-audit.vue

@ -14,19 +14,11 @@ const { projectId, projectName, token } = useGenerateWebviewParam();
// DEBUG: // DEBUG:
function openAudit() { function openAudit() {
uni.$ui.openDetail({ uni.$ui.openDetail({ url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
url: 'https://www.tall.wiki/finance/index',
name: '财务审批',
token,
projectId,
id: task.id,
pn: projectName,
tn: task.name,
});
} }
// DEBUG: // DEBUG:
function openStatistical() { function openStatistical() {
uni.$ui.openDetail({ url: 'https://www.taobao.com', name: '财务统计' }); uni.$ui.openDetail({ url: `http://121.36.3.207/finance/financial-approval?name=财务统计&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
} }
</script> </script>

1
utils/ui.js

@ -67,7 +67,6 @@ export default {
throw new Error('缺少url参数'); throw new Error('缺少url参数');
} }
const query = stringify(options); const query = stringify(options);
console.log('query: ', query);
const path = `/pages/detailWebview/detailWebview?${query}`; const path = `/pages/detailWebview/detailWebview?${query}`;
uni.navigateTo({ url: path }); uni.navigateTo({ url: path });
}, },

Loading…
Cancel
Save