|
@@ -1,5 +1,8 @@
|
|
// pages/deviceConnect0/deviceConnect0.ts
|
|
// pages/deviceConnect0/deviceConnect0.ts
|
|
const app = getApp();
|
|
const app = getApp();
|
|
|
|
+import route_constant from '../../utils/route_constant.js'
|
|
|
|
+import route_util from '../../utils/route_util.js';
|
|
|
|
+
|
|
Page({
|
|
Page({
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -19,8 +22,7 @@ Page({
|
|
},
|
|
},
|
|
isNotruter: false
|
|
isNotruter: false
|
|
},
|
|
},
|
|
- onShow() {
|
|
|
|
- },
|
|
|
|
|
|
+ onShow() {},
|
|
/**
|
|
/**
|
|
* 生命周期函数--监听页面加载
|
|
* 生命周期函数--监听页面加载
|
|
*/
|
|
*/
|
|
@@ -35,9 +37,7 @@ Page({
|
|
showCapsule: 1,
|
|
showCapsule: 1,
|
|
title: '连接配网',
|
|
title: '连接配网',
|
|
callback: () => {
|
|
callback: () => {
|
|
- wx.redirectTo({
|
|
|
|
- url: '/pages/index/index'
|
|
|
|
- });
|
|
|
|
|
|
+ route_util.goBackRoute(route_constant.indexRoot);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
})
|
|
})
|
|
@@ -127,9 +127,7 @@ Page({
|
|
},
|
|
},
|
|
notRoter() {
|
|
notRoter() {
|
|
getCurrentPages()[0].onLoad();
|
|
getCurrentPages()[0].onLoad();
|
|
- wx.redirectTo({
|
|
|
|
- url: '/pages/index/index'
|
|
|
|
- });
|
|
|
|
|
|
+ route_util.goBackRoute(route_constant.indexRoot);
|
|
},
|
|
},
|
|
/**
|
|
/**
|
|
* 生命周期函数--监听页面初次渲染完成
|
|
* 生命周期函数--监听页面初次渲染完成
|