Преглед на файлове

ffeature:修改登录后的界面跳转

zeng.chen преди 8 месеца
родител
ревизия
f8152804bd
променени са 5 файла, в които са добавени 11 реда и са изтрити 7 реда
  1. 1 1
      pages/deviceDetail/detail.js
  2. 0 1
      pages/deviceDetail/detail.wxss
  3. 1 1
      pages/index/index.js
  4. 4 2
      pages/indexCopy/indexCopy.js
  5. 5 2
      pages/login/login.js

+ 1 - 1
pages/deviceDetail/detail.js

@@ -1,8 +1,8 @@
 // pages/deviceDetail/detail.js
-// pages/settings/settings.js
 Page({
   data: {
     // 页面数据
+
   },
   onLoad: function () {
     // 页面加载时的逻辑

+ 0 - 1
pages/deviceDetail/detail.wxss

@@ -1,5 +1,4 @@
 /* pages/deviceDetail/detail.wxss */
-/* pages/settings/settings.wxss */
 .container {
     padding: 20px;
 }

+ 1 - 1
pages/index/index.js

@@ -698,7 +698,7 @@ Page({
 
   goDeviceConnect() {
     wx.navigateTo({
-      url: './../deviceConnect0/deviceConnect0',
+      url: './../deviceList/devices',
     });
   },
 

+ 4 - 2
pages/indexCopy/indexCopy.js

@@ -97,7 +97,7 @@ Page({
     // 登录
     this.login();
   },
-  
+
   login() {
     wx.login({
       success: res => {
@@ -434,7 +434,9 @@ Page({
   },
   goDeviceConnect() {
     routeUtil.jump(route_constant.deviceList)
-
+    this.setData({
+      isShowDevicelist: false
+    })
     return;
     wx.navigateTo({
       url: './../deviceConnect0/deviceConnect0',

+ 5 - 2
pages/login/login.js

@@ -109,8 +109,11 @@ Page({
             setTimeout(() => {
               // 重新登录
               getCurrentPages()[0].login();
-              wx.redirectTo({
-                url: './../deviceConnect0/deviceConnect0?isLognlink=0'
+              // wx.redirectTo({
+              //   url: './../deviceConnect0/deviceConnect0?isLognlink=0'
+              // });
+              wx.navigateTo({
+                url: './../deviceList/devices'
               });
             }, 2000);
           }