From afdda50cc54231b4fa788041adadb49cc239da23 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 31 十二月 2024 16:11:41 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/home/home.js | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 500fa59..a70fd1b 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,7 +1,6 @@
import {
fetchHome
} from '../../services/home/home';
-import moment from 'moment'
import {
loginInfo
} from '../../assets/js/login';
@@ -649,10 +648,16 @@
success(res) {
console.log(res);
if (res.errMsg == "scanCode:ok" && res.path || res.result) {
- let path = res.path || res.result
- wx.redirectTo({
- url: '/' + path,
- })
+ if (res.path) {
+ let path = res.path || res.result
+ wx.redirectTo({
+ url: '/' + path,
+ })
+ } else {
+ wx.redirectTo({
+ url: '/pages/scanResult/index?result=' + res.result,
+ })
+ }
}
}
})
--
Gitblit v1.9.1