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