fix:兼容普通二维码跳转
This commit is contained in:
+2
-2
@@ -1,7 +1,7 @@
|
||||
// export const URL = "https://my.gxfs123.com/api" //正式服务器-弃用
|
||||
// export const URL = "https://manager.fdzpower.com/api" //正式服务器
|
||||
export const URL = "https://manager.fdzpower.com/api" //正式服务器
|
||||
// export const URL = "https://fansdev.gxfs123.com/api" //测试服务器
|
||||
export const URL = "http://192.168.5.58:8080" //本地调试
|
||||
// export const URL = "http://192.168.5.58:8080" //本地调试
|
||||
// export const URL = "http://127.0.0.1:8080" //本地调试
|
||||
|
||||
export const appid = "wx2165f0be356ae7a9" //微信小程序appid
|
||||
|
||||
+21
-1
@@ -181,6 +181,27 @@
|
||||
|
||||
// 生命周期 onLoad 钩子
|
||||
onLoad(async (options) => {
|
||||
console.log('options', options)
|
||||
|
||||
// 普通链接二维码进入时,参数通常在 options.q(且为编码后的完整 URL)
|
||||
if (!options.deviceNo && options.q) {
|
||||
const fullUrl = decodeURIComponent(options.q)
|
||||
const queryStr = fullUrl.includes('?') ? fullUrl.split('?')[1] : ''
|
||||
if (queryStr) {
|
||||
const params = queryStr.split('&').reduce((acc, pair) => {
|
||||
if (!pair) return acc
|
||||
const idx = pair.indexOf('=')
|
||||
const rawKey = idx >= 0 ? pair.slice(0, idx) : pair
|
||||
const rawVal = idx >= 0 ? pair.slice(idx + 1) : ''
|
||||
const key = decodeURIComponent(rawKey || '').trim()
|
||||
const val = decodeURIComponent(rawVal || '').trim()
|
||||
if (key) acc[key] = val
|
||||
return acc
|
||||
}, {})
|
||||
if (params.deviceNo) options.deviceNo = params.deviceNo
|
||||
}
|
||||
}
|
||||
|
||||
if (options.deviceNo != uni.getStorageSync('deviceId') || !uni.getStorageSync('deviceId')) {
|
||||
deviceId.value = options.deviceNo
|
||||
uni.setStorageSync('deviceId', options.deviceNo)
|
||||
@@ -427,7 +448,6 @@
|
||||
if (inUseRes && inUseRes.code === 200 && inUseRes.data) {
|
||||
const order = inUseRes.data
|
||||
// 如果有正在进行的订单,跳转到归还页面,带上设备ID
|
||||
console.log('1111111111');
|
||||
uni.redirectTo({
|
||||
url: `/subPackages/service/return/index?deviceId=${deviceId.value}`
|
||||
})
|
||||
|
||||
@@ -100,10 +100,10 @@
|
||||
} catch (error) {
|
||||
// 只处理真正的错误,不是"没有订单"的情况
|
||||
if (error.message && (
|
||||
error.message.includes('未识别到设备编号') ||
|
||||
error.message.includes('网络请求失败') ||
|
||||
error.message.includes('服务器错误')
|
||||
) ) {
|
||||
error.message.includes('未识别到设备编号') ||
|
||||
error.message.includes('网络请求失败') ||
|
||||
error.message.includes('服务器错误')
|
||||
)) {
|
||||
console.error('扫码检查订单失败:', error);
|
||||
uni.showToast({
|
||||
title: error.message || this.$t('device.processFailed'),
|
||||
@@ -117,17 +117,19 @@
|
||||
|
||||
// 无论什么情况,都跳转到一个可用页面
|
||||
setTimeout(() => {
|
||||
if (option && option.deviceNo) {
|
||||
uni.redirectTo({
|
||||
url: `/pages/device/detail?deviceNo=${option.deviceNo}`
|
||||
});
|
||||
} else {
|
||||
if (option && option.deviceNo) {
|
||||
uni.redirectTo({
|
||||
url: `/pages/device/detail?deviceNo=${option.deviceNo}`
|
||||
});
|
||||
} else {
|
||||
// uni.switchTab({
|
||||
// url:'/pages/index/index'
|
||||
// })
|
||||
// 如果连deviceNo都没有,则返回首页
|
||||
uni.reLaunch({ url: '/pages/index/index' });
|
||||
}
|
||||
// 如果连deviceNo都没有,则返回首页
|
||||
uni.reLaunch({
|
||||
url: '/pages/index/index'
|
||||
});
|
||||
}
|
||||
}, 2000);
|
||||
} finally {
|
||||
uni.hideLoading();
|
||||
|
||||
Reference in New Issue
Block a user