feature: 对连接第一个界面方法类合并

pages/pageB/deviceConnect0/deviceConnect0.js

@@ -1,8 +1,5 @@
 const app = getApp();
-import strings from '../../../utils/strings.js';
-import routeUtil from '../../../utils/routeUtil.js';
-import routePath from '../../../utils/routePath.js'
-import routeRoot from '../../../utils/routeRoot.js'
+const constant = require('../../../utils/constant.js');
 
 Page({
   data: {
@@ -23,13 +20,13 @@ Page({
   onLoad(options) {
     var that = this;
     var param = options.param;
-    if (!strings.isEmpty(param)) {
+    if (!constant.strings.isEmpty(param)) {
       param = JSON.parse(param);
       that.data.connectDevice = param;
-      if (!strings.isEmpty(param.typeList)) {
+      if (!constant.strings.isEmpty(param.typeList)) {
         var typeList = param.typeList;
         typeList = typeList.filter((v) => v.connectType == 3);
-        if (!strings.isEmpty(typeList)) {
+        if (!constant.strings.isEmpty(typeList)) {
           that.setData({
             imageUrl: typeList[0].deviceLinkResp.icon1,
           });
@@ -47,7 +44,7 @@ Page({
           showCapsule: 1,
           title: '连接配网',
           callback: () => {
-            routeUtil.goBackRoute(routeRoot.indexRoot);
+            constant.routeUtil.goBackRoute(constant.routeRoot.indexRoot);
           }
         },
       })
@@ -109,7 +106,7 @@ Page({
       success(res) {
         if (that.data.scopeBluetooth && that.data.userFuzzyLocation) {
           var param = "?param=" + JSON.stringify(that.data.connectDevice);
-          routeUtil.jumpParam(routePath.deviceConnect1, param);
+          constant.routeUtil.jumpParam(constant.routePath.deviceConnect1, param);
         }
       },
       fail(res) {
@@ -145,7 +142,7 @@ Page({
 
   ///返回到首页
   notRoter() {
-    routeUtil.goBackRoute(routeRoot.indexRoot);
+    constant.routeUtil.goBackRoute(constant.routeRoot.indexRoot);
   },
 
   onUnload() {

utils/constant.js

@@ -6,7 +6,6 @@ const dRequest = require('../request/deviceListRequest.js');
 
 ///utils
 const routeUtil = require('../utils/routeUtil.js');
-const routePath = require('../utils/routePath.js');
 const strings = require('../utils/strings.js');
 const store = require('../utils/store.js');
 const timeUtil = require('../utils/timeUtil.js');
@@ -43,7 +42,6 @@ module.exports = {
   lexinDevices: lexinDevices,
   store: store,
   strings: strings,
-  routePath: routePath,
   routeUtil: routeUtil,
   dRequest: dRequest,
   app: app,