소스 검색

feature: 对蓝牙、wifi、4G连接界面方法类合并

332777428@qq.com 3 달 전
부모
커밋
f0146cb1b5
2개의 변경된 파일9개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      pages/pageB/connectBle/connectBle.js
  2. 5 0
      utils/constant.js

+ 4 - 4
pages/pageB/connectBle/connectBle.js

@@ -2,8 +2,8 @@ const {
   BtHelper
 } = require('../../../devices/bt_helper');
 
-import routeRoot from '../../../utils/routeRoot.js'
-import routeUtil from '../../../utils/routeUtil.js';
+const constant = require('../../../utils/constant.js');
+
 Page({
   data: {
     connectDevice: {},
@@ -65,7 +65,7 @@ Page({
     var connectDevice = that.data.connectDevice;
     var isTheSame = getCurrentPages()[0].isTheSameBlue(connectDevice);
     if (isTheSame) {
-      routeUtil.goBackRoute(routeRoot.index);
+      constant.routeUtil.goBackRoute(constant.routeRoot.index);
       return;
     }
 
@@ -82,7 +82,7 @@ Page({
         device.state = 'online';
         device.imageUrl = device.img;
         getCurrentPages()[0].addBlueDevice(device);
-        routeUtil.goBackRoute(routeRoot.index);
+        constant.routeUtil.goBackRoute(constant.routeRoot.index);
       }
     }, true);
   },

+ 5 - 0
utils/constant.js

@@ -12,6 +12,9 @@ const store = require('../utils/store.js');
 const timeUtil = require('../utils/timeUtil.js');
 const apiUtil = require('../utils/apiUtil.js');
 const eventBus = require('../utils/eventBus.js');
+const routePath = require('../utils/routePath.js');
+const routeRoot = require('../utils/routeRoot.js');
+
 
 ///utils/lexin
 const lexinDevices = require('../utils/lexin/devices.js');
@@ -25,6 +28,8 @@ const lexinMessage = require('../utils/lexin/message.js');
 
 
 module.exports = {
+  routeRoot: routeRoot,
+  routePath: routePath,
   eventBus: eventBus,
   lexinMessage: lexinMessage,
   lexinConnect: lexinConnect,