|
@@ -36,9 +36,19 @@ Component({
|
|
|
item
|
|
|
} = e.currentTarget.dataset;
|
|
|
if (item.fileType == 'folder') {
|
|
|
- wx.navigateTo({
|
|
|
- url: '/pages/tabbar/smartStore/folder?item=' + JSON.stringify(item),
|
|
|
- })
|
|
|
+ let pages = getCurrentPages();
|
|
|
+ let prevPage = pages[pages.length - 1]; // 获取当前的页面栈
|
|
|
+ console.log(prevPage)
|
|
|
+ if (prevPage.route == "pages/tabbar/smartStore/index") {
|
|
|
+ wx.navigateTo({
|
|
|
+ url: '/pages/tabbar/smartStore/folder?item=' + JSON.stringify(item),
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ wx.redirectTo({
|
|
|
+ url: '/pages/tabbar/smartStore/folder?item=' + JSON.stringify(item),
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
} else {
|
|
|
cf.checkFile(item)
|
|
|
}
|