merge
This commit is contained in:
194
App.vue
194
App.vue
@@ -1,103 +1,103 @@
|
||||
<script>
|
||||
import {
|
||||
getVersions
|
||||
} from './apis/interfaces/versions'
|
||||
import {
|
||||
getVersions
|
||||
} from './apis/interfaces/versions'
|
||||
|
||||
export default {
|
||||
onShow() {
|
||||
// 已经登录过且携带了参数 有弹窗且
|
||||
setTimeout(() => {
|
||||
if (uni.getStorageSync('token')) {
|
||||
if (plus.runtime.arguments.split('?')[1]) {
|
||||
let shareId = plus.runtime.arguments.split('?')[1].split('invitation')[0]
|
||||
if (shareId != '' && shareId != undefined) {
|
||||
uni.showModal({
|
||||
title: ' 温馨提示',
|
||||
content: '有人邀请您一起拼团',
|
||||
cancelColor: '#999',
|
||||
cancelText: '再想想',
|
||||
confirmColor: '#34ce98',
|
||||
confirmText: '立即拼团',
|
||||
success: (res) => {
|
||||
uni.hideLoading()
|
||||
if (res.confirm) {
|
||||
plus.runtime.arguments = null;
|
||||
plus.runtime.arguments = '';
|
||||
uni.navigateTo({
|
||||
url: '/pages/group-book/success/success?access=1&id=' +
|
||||
shareId
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}, 100);
|
||||
},
|
||||
onLaunch: function() {
|
||||
//#ifdef APP-PLUS
|
||||
// 获取系统版本号
|
||||
// getVersions({
|
||||
// platform: plus.os.name,
|
||||
// version : plus.runtime.version
|
||||
// }).then(res => {
|
||||
// if (res.update) {
|
||||
// uni.showModal({
|
||||
// title : "更新提示",
|
||||
// content : res.note || '版本更新信息',
|
||||
// confirmText : "更新",
|
||||
// showCancel : !res.info.must,
|
||||
// success : modalRes => {
|
||||
// if (modalRes.confirm) {
|
||||
// if (plus.os.name == "Android") {
|
||||
// uni.showToast({
|
||||
// title: '新版本下载中,将在下载完成后自动为您安装更新包',
|
||||
// icon: 'none'
|
||||
// })
|
||||
// uni.downloadFile({
|
||||
// url: res.info.download,
|
||||
// success: apkPick => {
|
||||
// plus.runtime.install(apkPick
|
||||
// .tempFilePath, '',
|
||||
// installRES => {
|
||||
// // 安装完成用于提示新版本引导,暂时无用
|
||||
// }, installERR => {
|
||||
// // 安装失败
|
||||
// })
|
||||
// },
|
||||
// fail(err) {
|
||||
// uni.showToast({
|
||||
// title: '安装包下载失败,请检查您的网络或稍后重试',
|
||||
// icon: 'none'
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// // plus.runtime.openURL(res.info.download, err => {
|
||||
// // console.log(err)
|
||||
// // }, 'com.android.browser');
|
||||
// } else {
|
||||
// uni.showToast({
|
||||
// title: 'IOS应用暂未上架,请打开测试(TestFlight)工具点击更新',
|
||||
// icon: 'none'
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// }).catch(err => {
|
||||
// uni.showToast({
|
||||
// title: err.message,
|
||||
// icon: 'none'
|
||||
// })
|
||||
// })
|
||||
//#endif
|
||||
},
|
||||
}
|
||||
export default {
|
||||
onShow() {
|
||||
// 已经登录过且携带了参数 有弹窗且
|
||||
setTimeout(() => {
|
||||
if (uni.getStorageSync('token')) {
|
||||
if (plus.runtime.arguments.split('?')[1]) {
|
||||
let shareId = plus.runtime.arguments.split('?')[1].split('invitation')[0]
|
||||
if (shareId != '' && shareId != undefined) {
|
||||
uni.showModal({
|
||||
title: ' 温馨提示',
|
||||
content: '有人邀请您一起拼团',
|
||||
cancelColor: '#999',
|
||||
cancelText: '再想想',
|
||||
confirmColor: '#34ce98',
|
||||
confirmText: '立即拼团',
|
||||
success: (res) => {
|
||||
uni.hideLoading()
|
||||
if (res.confirm) {
|
||||
plus.runtime.arguments = null;
|
||||
plus.runtime.arguments = '';
|
||||
uni.navigateTo({
|
||||
url: '/pages/group-book/success/success?access=1&id=' +
|
||||
shareId
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}, 100);
|
||||
},
|
||||
onLaunch: function() {
|
||||
//#ifdef APP-PLUS
|
||||
// 获取系统版本号
|
||||
getVersions({
|
||||
platform: plus.os.name,
|
||||
version: plus.runtime.version
|
||||
}).then(res => {
|
||||
if (res.update) {
|
||||
uni.showModal({
|
||||
title : "更新提示",
|
||||
content : res.note || '版本更新信息',
|
||||
confirmText : "更新",
|
||||
showCancel : !res.info.must,
|
||||
success: modalRes => {
|
||||
if (modalRes.confirm) {
|
||||
if (plus.os.name == "Android") {
|
||||
uni.showToast({
|
||||
title: '新版本下载中,将在下载完成后自动为您安装更新包',
|
||||
icon: 'none'
|
||||
})
|
||||
uni.downloadFile({
|
||||
url: res.info.download,
|
||||
success: apkPick => {
|
||||
plus.runtime.install(apkPick
|
||||
.tempFilePath, '',
|
||||
installRES => {
|
||||
// 安装完成用于提示新版本引导,暂时无用
|
||||
}, installERR => {
|
||||
// 安装失败
|
||||
})
|
||||
},
|
||||
fail(err) {
|
||||
uni.showToast({
|
||||
title: '安装包下载失败,请检查您的网络或稍后重试',
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
})
|
||||
// plus.runtime.openURL(res.info.download, err => {
|
||||
// console.log(err)
|
||||
// }, 'com.android.browser');
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: 'IOS应用暂未上架,请打开测试(TestFlight)工具点击更新',
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
uni.showToast({
|
||||
title: err.message,
|
||||
icon: 'none'
|
||||
})
|
||||
})
|
||||
//#endif
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
@import "uview-ui/index.scss";
|
||||
@import "@/static/iconfont.css";
|
||||
@import "uview-ui/index.scss";
|
||||
@import "@/static/iconfont.css";
|
||||
</style>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name" : "共力生态",
|
||||
"appid" : "__UNI__DE7B0E6",
|
||||
"description" : "共力生态",
|
||||
"versionName" : "1.0.44",
|
||||
"versionName" : "1.0.46",
|
||||
"versionCode" : 100,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
|
||||
14
unpackage/dist/build/app-plus/app-service.js
vendored
14
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
6
unpackage/dist/build/app-plus/app-view.js
vendored
6
unpackage/dist/build/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/build/app-plus/manifest.json
vendored
2
unpackage/dist/build/app-plus/manifest.json
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/dev/app-plus/app-service.js
vendored
2
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/dev/app-plus/manifest.json
vendored
2
unpackage/dist/dev/app-plus/manifest.json
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user