From 72cae1ec15cb0fb584730c4ad0638b5adcdc4d0b Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Mon, 30 Jun 2025 10:15:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env.development | 4 +- manifest.config.ts | 2 + src/App.vue | 16 ++ src/manifest.json | 3 +- src/pages.json | 9 + src/pages/linktoapp/index.vue | 208 ++++++++++++++++++ src/pages/login/login.vue | 4 +- src/types/uni-pages.d.ts | 1 + src/uni_modules/uni-link/changelog.md | 17 ++ .../uni-link/components/uni-link/uni-link.vue | 128 +++++++++++ src/uni_modules/uni-link/package.json | 87 ++++++++ src/uni_modules/uni-link/readme.md | 11 + 12 files changed, 485 insertions(+), 5 deletions(-) create mode 100644 src/pages/linktoapp/index.vue create mode 100644 src/uni_modules/uni-link/changelog.md create mode 100644 src/uni_modules/uni-link/components/uni-link/uni-link.vue create mode 100644 src/uni_modules/uni-link/package.json create mode 100644 src/uni_modules/uni-link/readme.md diff --git a/env/.env.development b/env/.env.development index 3a1bb1c..5daa96a 100644 --- a/env/.env.development +++ b/env/.env.development @@ -7,9 +7,9 @@ VITE_SHOW_SOURCEMAP = true # 是否启用读取配置文件 min #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' -VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' +#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' +VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' diff --git a/manifest.config.ts b/manifest.config.ts index 2a74033..9bed492 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -76,6 +76,8 @@ export default defineManifestConfig({ '', '', ], + // app外连接访问 by 闵 + schemes : "szcxapp" }, /* ios打包配置 */ ios: {}, diff --git a/src/App.vue b/src/App.vue index a987fbc..19738a7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,12 +7,28 @@ import { getLocation, useUpdateApp } from '@/utils'; export default { onLaunch: function (options) { + console.log(options) // 检查更新 useUpdateApp().checkAppUpdate() // 定位 getLocation() + // 处理外部唤醒逻辑 min + if (options.path && options.query) { + const path = options.path; // 获取路径，如 "pages/home/index" + const query = options.query; // 获取参数，如 {id: 123} + uni.navigateTo({ + url: `/${path}?${Object.keys(query).map(k => `${k}=${query[k]}`).join('&')}` + }); + } }, onShow: function (options) { + + var args= plus.runtime.arguments; + if(args){ + // 处理args参数，如直达到某新页面等 + } + console.log(args) + //改造了一下，加了白名单验证 //为了实现实流检定的证书验证页面 //jiang 20250605 diff --git a/src/manifest.json b/src/manifest.json index 7affead..0171a5a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -44,7 +44,8 @@ "abiFilters": [ "armeabi-v7a", "arm64-v8a" - ] + ], + "schemes": "szcxapp" }, "ios": {}, "sdkConfigs": { diff --git a/src/pages.json b/src/pages.json index 7fa1038..16b6a25 100644 --- a/src/pages.json +++ b/src/pages.json @@ -85,6 +85,15 @@ "navigationBarTitleText": "主页" } }, + { + "path": "pages/linktoapp/index", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "跳转到APP" + } + }, { "path": "pages/message/message", "type": "page", diff --git a/src/pages/linktoapp/index.vue b/src/pages/linktoapp/index.vue new file mode 100644 index 0000000..6b87665 --- /dev/null +++ b/src/pages/linktoapp/index.vue @@ -0,0 +1,208 @@ + +{ + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '跳转到APP', + }, +} + + + + + + + \ No newline at end of file diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 72d8ac9..d1cbda1 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -105,9 +105,9 @@ let pw = Base64.encode(encodeURIComponent(password.value)) loading.value = true /*生产环境 begin */ - // loginApi({ username: un, password: pw }) + loginApi({ username: un, password: pw }) /*开发环境 begin */ - loginApi({ username: userName.value, password: password.value, captcha: 'app' }) + // loginApi({ username: userName.value, password: password.value, captcha: 'app' }) .then((res : any) => { if (res.success) { const { result } = res diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 9ab397e..d2f20ab 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -8,6 +8,7 @@ interface NavigateToOptions { "/pages/annotation/annotationDetail" | "/pages/annotation/annotationList" | "/pages/index/index" | + "/pages/linktoapp/index" | "/pages/message/message" | "/pages/more/more" | "/pages/onlinePreview/detail" | diff --git a/src/uni_modules/uni-link/changelog.md b/src/uni_modules/uni-link/changelog.md new file mode 100644 index 0000000..2cfbf59 --- /dev/null +++ b/src/uni_modules/uni-link/changelog.md @@ -0,0 +1,17 @@ +## 1.0.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-link](https://uniapp.dcloud.io/component/uniui/uni-link) +## 1.1.7（2021-11-08） +## 0.0.7（2021-09-03） +- 修复 在 nvue 下不显示的 bug +## 0.0.6（2021-07-30） +- 新增 支持自定义插槽 +## 0.0.5（2021-06-21） +- 新增 download 属性，H5平台下载文件名 +## 0.0.4（2021-05-12） +- 新增 组件示例地址 +## 0.0.3（2021-03-09） +- 新增 href 属性支持 tel:|mailto: + +## 0.0.2（2021-02-05） +- 调整为uni_modules目录规范 diff --git a/src/uni_modules/uni-link/components/uni-link/uni-link.vue b/src/uni_modules/uni-link/components/uni-link/uni-link.vue new file mode 100644 index 0000000..27c5468 --- /dev/null +++ b/src/uni_modules/uni-link/components/uni-link/uni-link.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/uni_modules/uni-link/package.json b/src/uni_modules/uni-link/package.json new file mode 100644 index 0000000..77b1986 --- /dev/null +++ b/src/uni_modules/uni-link/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-link", + "displayName": "uni-link 超链接", + "version": "1.0.0", + "description": "uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打", + "keywords": [ + "uni-ui", + "uniui", + "link", + "超链接", + "" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "y", + "联盟": "y" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/src/uni_modules/uni-link/readme.md b/src/uni_modules/uni-link/readme.md new file mode 100644 index 0000000..7f09e94 --- /dev/null +++ b/src/uni_modules/uni-link/readme.md @@ -0,0 +1,11 @@ + + +## Link 链接 +> **组件名：uni-link** +> 代码块： `uLink` + + +uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-link) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file From 1a2752d9724340d06f14728d1ce4ee97dc1ddb41 Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Fri, 4 Jul 2025 14:12:32 +0800 Subject: [PATCH 2/7] 1 --- src/App.vue | 3 ++- src/pages/linktoapp/index.vue | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/App.vue b/src/App.vue index 19738a7..1292763 100644 --- a/src/App.vue +++ b/src/App.vue @@ -34,7 +34,8 @@ //jiang 20250605 // 定义白名单页面 const publicPages = [ - '/pages/sljd/index' + '/pages/sljd/index', + '/pages/linktoapp/index' ] // 检查当前页面是否在白名单中 diff --git a/src/pages/linktoapp/index.vue b/src/pages/linktoapp/index.vue index 6b87665..277ffb4 100644 --- a/src/pages/linktoapp/index.vue +++ b/src/pages/linktoapp/index.vue @@ -22,9 +22,9 @@ - - - + + + 跳转失败？请尝试： @@ -67,6 +67,7 @@ const trySchemeJump = () => { }, 1000) } + // Android Intent方式跳转 const tryIntentJump = () => { const iframe = document.getElementById('intentIframe') From 72420dea52403d5fd65a81feb25b6c955b8e962c Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Wed, 23 Jul 2025 15:30:51 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AF=B7=E9=94=80=E5=81=87=E5=8A=B3?= =?UTF-8?q?=E8=B5=84=E5=91=98=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8=E5=8A=B3=E8=B5=84=E5=91=98?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=9C=AC=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=8A=B3=E8=B5=84=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages-humanResource/absence/add.vue | 26 +++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue index 9c15442..76e9b69 100644 --- a/src/pages-humanResource/absence/add.vue +++ b/src/pages-humanResource/absence/add.vue @@ -11,9 +11,9 @@ - - - + + + { return { value: item.name, @@ -345,12 +345,14 @@ }, 2000) } else { model.hr = res.result[0].username - hrData.value = res.result.map(item => { - return { - label: item.realname, - value: item.username - } - }) + if (!code) { + hrData.value = res.result.map(item => { + return { + label: item.realname, + value: item.username + } + }) + } } }) } From 65ac3e68301d77990657dc5e2121090cab06bcd3 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Thu, 24 Jul 2025 11:01:55 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=AF=B7=E9=94=80=E5=81=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=8F=AF=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=8A=B3=E8=B5=84=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages-humanResource/absence/add.vue | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue index 76e9b69..c92f8b9 100644 --- a/src/pages-humanResource/absence/add.vue +++ b/src/pages-humanResource/absence/add.vue @@ -338,21 +338,16 @@ roleId: '1554379432313397250', orgCode: code }).then(res => { - if (res.result.length == 0) { - toast.warning('请切换工作单位!') - setTimeout(() => { - uni.navigateBack() - }, 2000) - } else { + if (res.result.length > 0) { model.hr = res.result[0].username - if (!code) { - hrData.value = res.result.map(item => { - return { - label: item.realname, - value: item.username - } - }) - } + } + if (!code) { + hrData.value = res.result.map(item => { + return { + label: item.realname, + value: item.username + } + }) } }) } From 73634e78ec8864c6313f9144303e9ae68520a867 Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Thu, 24 Jul 2025 17:23:59 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env.development | 2 +- env/.env.production | 4 -- src/api/plan/index.ts | 10 +++++ src/components/Mupload/Mupload.vue | 13 +++--- src/pages-bpm/planReview/index.vue | 65 ++++++++++++++++++++++++++++++ src/pages.json | 4 ++ src/pages/login/login.vue | 4 +- src/types/uni-pages.d.ts | 1 + 8 files changed, 91 insertions(+), 12 deletions(-) create mode 100644 src/api/plan/index.ts create mode 100644 src/pages-bpm/planReview/index.vue diff --git a/env/.env.development b/env/.env.development index 8293b47..ddf4bdc 100644 --- a/env/.env.development +++ b/env/.env.development @@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = true # 是否启用读取配置文件 min #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' -VITE_SERVER_BASEURL = 'http://10.75.15.246:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' #websocket连接url-测试用 VITE_WEBSOCKET_URL = 'ws://10.75.15.246:8899/mqttprod/ws/simple' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' diff --git a/env/.env.production b/env/.env.production index 2984c4d..812226c 100644 --- a/env/.env.production +++ b/env/.env.production @@ -8,9 +8,5 @@ VITE_SHOW_SOURCEMAP = false #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' - - - - #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi' diff --git a/src/api/plan/index.ts b/src/api/plan/index.ts new file mode 100644 index 0000000..ad7523c --- /dev/null +++ b/src/api/plan/index.ts @@ -0,0 +1,10 @@ +import { http } from '@/utils/http'; + +/*通过id查询公文数据*/ +export function queryByIdBpm(id : string) { + return http({ + url: '/cxcjhcwjswxjh/cxcJhcwJswxjh/queryByIdBpm', + method: 'GET', + data: { id } + }) +} diff --git a/src/components/Mupload/Mupload.vue b/src/components/Mupload/Mupload.vue index 147b209..e5e29b5 100644 --- a/src/components/Mupload/Mupload.vue +++ b/src/components/Mupload/Mupload.vue @@ -1,10 +1,10 @@