diff --git a/README.md b/README.md
index d87429903bccfc18e97ef03e98b7a8274417875e..117c169d2841d3e32392afec1f7c7ac8234dea5f 100644
--- a/README.md
+++ b/README.md
@@ -142,6 +142,7 @@ uni-starter服务端使用[uni-config-center](https://ext.dcloud.net.cn/plugin?i
列举不需要强制登陆即可访问的页面完整路径(支持正则)
#### 配置示例
配置文件:`项目根目录/uni-starter.config.js`
+
```js
"router": {
"needLogin" : [
@@ -303,7 +304,7 @@ uni-starter集成了这个功能,你只需直接在`项目根目录/uni-starte
- 而路由跳转方法不仅有`uni.navigateTo`还有`uni.redirectTo`,`uni.reLaunch`,`uni.switchTab`;
- 另外我们还希望控制直接跳转至哪种登陆类型
所以在uni-starter框架中我们这样定义:
-> uni-starter/common/appInit.js 的第228-280行
+uni-starter/common/appInit.js 的第228-280行
```js
const {"router": {needLogin,login} } = uniStarterConfig //需要登录的页面
let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
diff --git a/changelog.md b/changelog.md
index dfb0fcf8986b4e0b0915e6bc9c00e2d0a0d76ee3..da609cacdd7e080e6a6a52f2271d6f50d2c50015 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,5 @@
+## 1.1.18(2021-10-14)
+使用2.0版`uni-share`。当显示分享窗口时,监听返回操作(如:物理返回,全面屏手机侧滑)关闭分享窗口,而不是关闭当前页面。
## 1.1.17(2021-10-12)
- 更新文档
- 修复list页面where条件中缺少&符,导致的错误
diff --git a/manifest.json b/manifest.json
index c35e90c03612fb89a1faef3123cfb88bc17eff32..dc459f38dcbb404993d7713887a99a4715887a9b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,272 +1,224 @@
{
- "name": "统一应用基本项目",
- "appid": "__UNI__D53040B",
- "description": "云端一体应用快速开发模版",
- "versionName": "1.0.0",
- "versionCode": "100",
- "transformPx": false,
- "app-plus": {
- "locales": {
- "en": {
- // 英文
- "name": "uni-starter", // 应用名称
- "android": {
- "strings": {
- //Android平台自定义字符串
- "CustomKey": "CustomValue"
- }
- },
- "ios": {
- "privacyDescription": {
- //iOS平台隐私访问描述信息
- "NSPhotoLibraryUsageDescription": "access to the user’s photo library(read)"
- },
- "infoPlist": {
- //iOS平台自定义InfoPlist.strings
- "CustomKey": "CustomValue"
- }
- }
- },
- "zh": {
- // 中文(简体)
- "name": "统一应用基本项目" // 应用名称
- }
- },
- "privacy": {
- "prompt": "template",
- "template": {
- "title": "服务协议和隐私政策",
- "message": " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
- "buttonAccept": "同意",
- "buttonRefuse": "暂不同意"
- }
- },
- "compatible": {
- "ignoreVersion": true
- },
- "usingComponents": true,
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": false,
- "waiting": true,
- "autoclose": true,
- "delay": 0
- },
- "modules": {
- "Fingerprint": {},
- "Share": {},
- "OAuth": {},
- "FaceID": {},
- "Geolocation": {},
- "Push": {}
- },
- "distribute": {
- "android": {
- "permissions": [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ],
- "abiFilters": [
- "armeabi-v7a",
- "arm64-v8a",
- "x86"
- ]
- },
- "ios": {
- "capabilities": {
- "entitlements": {
- "com.apple.developer.associated-domains": [
- "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com"
- ]
- }
- }
- },
- "sdkConfigs": {
- "oauth": {
- "apple": {},
- "weixin": {
- "appid": "",
- "appsecret": "",
- "UniversalLinks": ""
- },
- "univerify": {}
- },
- "privacy": {
- "prompt": "template",
- "template": {
- "title": "服务协议和隐私政策",
- "message": " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
- "buttonAccept": "同意",
- "buttonRefuse": "暂不同意"
- }
- },
- "compatible": {
- "ignoreVersion": true
- },
- "usingComponents": true,
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": false,
- "waiting": true,
- "autoclose": true,
- "delay": 0
- },
- "modules": {
- "Fingerprint": {},
- "OAuth": {},
- "FaceID": {},
- "Push": {},
- "Geolocation": {}
- },
- "distribute": {
- "android": {
- "permissions": [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ],
- "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
- },
- "ios": {
- "capabilities": {
- "entitlements": {
- "com.apple.developer.associated-domains": [
- "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com"
- ]
- }
- }
- },
- "sdkConfigs": {
- "oauth": {
- "apple": {},
- "univerify": {}
- },
- "ad": {},
- "share": {
- "weixin": {
- "appid": "",
- "UniversalLinks": ""
- }
- },
- "geolocation": {
- "baidu": {
- "__platform__": ["ios", "android"],
- "appkey_ios": "请填写地图的key",
- "appkey_android": "请填写地图的key"
- }
- },
- "push": {
- "unipush": {}
- },
- "payment": {}
- },
- "icons": {
- "android": {
- "hdpi": "",
- "xhdpi": "",
- "xxhdpi": "",
- "xxxhdpi": ""
- },
- "ios": {
- "appstore": "",
- "ipad": {
- "app": "",
- "app@2x": "",
- "notification": "",
- "notification@2x": "",
- "proapp@2x": "",
- "settings": "",
- "settings@2x": "",
- "spotlight": "",
- "spotlight@2x": ""
- },
- "iphone": {
- "app@2x": "",
- "app@3x": "",
- "notification@2x": "",
- "notification@3x": "",
- "settings@2x": "",
- "settings@3x": "",
- "spotlight@2x": "",
- "spotlight@3x": ""
- }
- }
- },
- "splashscreen": {
- "iosStyle": "common",
- "androidStyle": "common"
- }
- },
- "nvueLaunchMode": ""
- },
- "quickapp": {},
- "mp-weixin": {
- "appid": "",
- "setting": {
- "urlCheck": false,
- "es6": false
- },
- "usingComponents": true,
- "betterScopedSlots": true,
- "permission": {
- "scope.userLocation": {
- "desc": "演示在onShow生命周期获取地理位置"
- }
- }
- },
- "mp-alipay": {
- "usingComponents": true
- },
- "mp-baidu": {
- "usingComponents": true
- },
- "mp-toutiao": {
- "usingComponents": true
- },
- "uniStatistics": {
- "enable": false
- },
- "h5": {
- "template": "",
- "sdkConfigs": {
- "maps": {
- "qqmap": {
- "key": ""
- }
- }
- }
- },
- "_spaceID": "",
- "vueVersion": "2"
- }
- }
+ "name": "统一应用基本项目",
+ "appid": "请点击重新获取",
+ "description": "云端一体应用快速开发模版",
+ "versionName": "1.0.0",
+ "versionCode": "100",
+ "transformPx": false,
+ "app-plus": {
+ "locales": {
+ "en": {
+ // 英文
+ "name": "uni-starter", // 应用名称
+ "android": {
+ "strings": {
+ //Android平台自定义字符串
+ "CustomKey": "CustomValue"
+ }
+ },
+ "ios": {
+ "privacyDescription": {
+ //iOS平台隐私访问描述信息
+ "NSPhotoLibraryUsageDescription": "access to the user’s photo library(read)"
+ },
+ "infoPlist": {
+ //iOS平台自定义InfoPlist.strings
+ "CustomKey": "CustomValue"
+ }
+ }
+ },
+ "zh": {
+ // 中文(简体)
+ "name": "统一应用基本项目" // 应用名称
+ }
+ },
+ "privacy": {
+ "prompt": "template",
+ "template": {
+ "title": "服务协议和隐私政策",
+ "message": " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
+ "buttonAccept": "同意",
+ "buttonRefuse": "暂不同意"
+ }
+ },
+ "compatible": {
+ "ignoreVersion": true
+ },
+ "usingComponents": true,
+ "nvueStyleCompiler": "uni-app",
+ "compilerVersion": 3,
+ "splashscreen": {
+ "alwaysShowBeforeRender": false,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
+ },
+ "modules": {
+ "Fingerprint": {
+ },
+ "Share": {
+ },
+ "OAuth": {
+ },
+ "FaceID": {
+ },
+ "Geolocation": {
+ },
+ "Push": {
+ }
+ },
+ "distribute": {
+ "android": {
+ "permissions": [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ],
+ "abiFilters": [
+ "armeabi-v7a",
+ "arm64-v8a",
+ "x86"
+ ]
+ },
+ "ios": {
+ "capabilities": {
+ "entitlements": {
+ "com.apple.developer.associated-domains": [
+ "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com"
+ ]
+ }
+ }
+ },
+ "sdkConfigs": {
+ "oauth": {
+ "apple": {
+ },
+ "weixin": {
+ "appid": "",
+ "appsecret": "",
+ "UniversalLinks": ""
+ },
+ "univerify": {
+ }
+ },
+ "ad": {
+ },
+ "share": {
+ "weixin": {
+ "appid": "",
+ "UniversalLinks": ""
+ }
+ },
+ "geolocation": {
+ "baidu": {
+ "__platform__": [
+ "ios",
+ "android"
+ ],
+ "appkey_ios": "请填写地图的key",
+ "appkey_android": "请填写地图的key"
+ }
+ },
+ "push": {
+ "unipush": {
+ }
+ },
+ "payment": {
+ }
+ },
+ "icons": {
+ "android": {
+ "hdpi": "",
+ "xhdpi": "",
+ "xxhdpi": "",
+ "xxxhdpi": ""
+ },
+ "ios": {
+ "appstore": "",
+ "ipad": {
+ "app": "",
+ "app@2x": "",
+ "notification": "",
+ "notification@2x": "",
+ "proapp@2x": "",
+ "settings": "",
+ "settings@2x": "",
+ "spotlight": "",
+ "spotlight@2x": ""
+ },
+ "iphone": {
+ "app@2x": "",
+ "app@3x": "",
+ "notification@2x": "",
+ "notification@3x": "",
+ "settings@2x": "",
+ "settings@3x": "",
+ "spotlight@2x": "",
+ "spotlight@3x": ""
+ }
+ }
+ },
+ "splashscreen": {
+ "iosStyle": "common",
+ "androidStyle": "common"
+ }
+ },
+ "nvueLaunchMode": ""
+ },
+ "quickapp": {
+ },
+ "mp-weixin": {
+ "appid": "",
+ "setting": {
+ "urlCheck": false,
+ "es6": false
+ },
+ "usingComponents": true,
+ "betterScopedSlots": true,
+ "permission": {
+ "scope.userLocation": {
+ "desc": "演示在onShow生命周期获取地理位置"
+ }
+ }
+ },
+ "mp-alipay": {
+ "usingComponents": true
+ },
+ "mp-baidu": {
+ "usingComponents": true
+ },
+ "mp-toutiao": {
+ "usingComponents": true
+ },
+ "uniStatistics": {
+ "enable": false
+ },
+ "h5": {
+ "template": "",
+ "sdkConfigs": {
+ "maps": {
+ "qqmap": {
+ "key": ""
+ }
+ }
+ },
+ "router": {
+ "base": ""
+ }
+ },
+ "_spaceID": "",
+ "vueVersion": "2"
}
diff --git a/package.json b/package.json
index ad4c6e3227e9dc1b2d94b8456758be1b6cd2a87f..14b9d56237429c41203c89a8af79a3e049344f11 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"id": "uni-starter",
"displayName": "uni-starter",
- "version": "1.1.17",
+ "version": "1.1.18",
"description": "云端一体应用快速开发基本项目模版",
"keywords": [
"login",
diff --git a/pages/list/detail.vue b/pages/list/detail.vue
index d08c5ea4325d768c8fa1c328c652c4e2f80417e7..7dead5474a273feee81976aa6a632db9f20abd31 100644
--- a/pages/list/detail.vue
+++ b/pages/list/detail.vue
@@ -50,14 +50,22 @@