feature: 分饱pageA，退出登录，对当前wifi设备进行退出连接处理

app.json

@@ -1,7 +1,9 @@
 {
   "pages": [
-    "pages/index/index",
-    "pages/login/login",
+    "pages/pageA/index/index",
+    "pages/pageA/login/login",
+    "pages/pageA/deviceList/deviceList",
+    
     "pages/about/about",
     "pages/repeat/repeat",
     "pages/deviceWake/deviceWake",
@@ -13,7 +15,6 @@
     "pages/download/download",
     "pages/wakeList/wakeList",
     "pages/aboutInfo/aboutInfo",
-    "pages/deviceList/deviceList",
     "pages/deviceConMode/index",
     "pages/connectBle/connectBle",
     "pages/deviceDetail/detail",

pages/deviceList/deviceList.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "nav-bar": "./../../components/navbar/navbar"
-  }
-}

pages/index/index.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "nav-bar": "./../../components/navbar/navbar"
-  }
-}

pages/login/login.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "nav-bar": "./../../components/navbar/navbar"
-  }
-}

pages/deviceList/deviceList.js

@@ -1,10 +1,10 @@
 const app = getApp()
-import dRequest from '../../request/deviceListRequest'
-import routeUtil from '../../utils/routeUtil'
-import routePath from '../../utils/routePath.js'
-import strings from '../../utils/strings.js';
-import store from '../../utils/store.js';
-import lexin_devices from '../../utils/lexin/devices';
+import dRequest from '../../../request/deviceListRequest'
+import routeUtil from '../../../utils/routeUtil'
+import routePath from '../../../utils/routePath.js'
+import strings from '../../../utils/strings.js';
+import store from '../../../utils/store.js';
+import lexin_devices from '../../../utils/lexin/devices';
 
 Page({
   data: {

pages/pageA/deviceList/deviceList.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nav-bar": "./../../../components/navbar/navbar"
+  }
+}

pages/pageA/index/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nav-bar": "./../../../components/navbar/navbar"
+  }
+}

pages/index/index.wxml

@@ -18,7 +18,7 @@
       </view>
 
       <view class="add_device_public" bind:tap="jumpToAddDevice">
-        <image mode="heightFix" src="./../../img/add_device.png" style="width: 48rpx;height: 48rpx;"></image>
+        <image mode="heightFix" src="./../../../img/add_device.png" style="width: 48rpx;height: 48rpx;"></image>
         <view style="color: white; margin-left: 8rpx; font-size: 32rpx;">添加设备</view>
       </view>
 
@@ -42,14 +42,14 @@
                     </view>
 
                     <view style="width: 48rpx; height: 48rpx;">
-                      <image mode="aspectFit" src="./../../img/add_device_arrow.png" style="width: 48rpx; height: 48rpx; opacity: {{item.state && item.state === 'online'&&deviceListSelect === index ? '1' : '0'}}; "></image>
+                      <image mode="aspectFit" src="./../../../img/add_device_arrow.png" style="width: 48rpx; height: 48rpx; opacity: {{item.state && item.state === 'online'&&deviceListSelect === index ? '1' : '0'}}; "></image>
                     </view>
 
                   </view>
 
                   <view style="display: flex; flex-direction: row;">
                     <view style="color: #666666; font-size: 24rpx;display: flex; flex-direction: row; align-items: center;">
-                      <image mode="heightFix" src="{{item.connectType==3?'./../../images/device/wifi_black.png':'./../../images/device/blue_black.png'}}" style="width: 28rpx;height: 28rpx; padding-right: 10rpx; opacity: {{item.state && item.state === 'online' ? '1' : '0.7'}};"></image>
+                      <image mode="heightFix" src="{{item.connectType==3?'./../../../images/device/wifi_black.png':'./../../../images/device/blue_black.png'}}" style="width: 28rpx;height: 28rpx; padding-right: 10rpx; opacity: {{item.state && item.state === 'online' ? '1' : '0.7'}};"></image>
                       <view style="white-space: nowrap;"> {{item.state && item.state === "online" ? (item.connectType==3?"Wifi在线":"蓝牙在线") : "离线"}} </view>
                     </view>
 
@@ -78,13 +78,13 @@
       <view wx:if="{{indexPage==1&&deviceListSelect!=null&&deviceList.length>deviceListSelect&&deviceList[deviceListSelect].connectType===3}}" class="mair" style="height: calc(100vh - 105rpx - {{safeBottomHeight}}rpx - 22rpx - {{navBarHeight}}px);">
         <view class="play-info">
           <view class="info">
-            <image src="./../../img/blak.png" class="black" mode="scaleToFill"></image>
-            <image src="./../../img/mm.png" class="mode" mode="widthFix"></image>
-            <image class="logo" mode="heightFix" src="./../../img/logo.png"></image>
+            <image src="./../../../img/blak.png" class="black" mode="scaleToFill"></image>
+            <image src="./../../../img/mm.png" class="mode" mode="widthFix"></image>
+            <image class="logo" mode="heightFix" src="./../../../img/logo.png"></image>
             <view wx:if="{{actionIndex !== null}}" style="opacity: 0.8; text-shadow:0px 0px 4px #6D00FF;" class="fm">
               FM.{{actionIndex !== null ? (actionIndex + 1 < 10 ? "0" + (actionIndex + 1) : actionIndex + 1) : 00}} </view>
                 <view wx:if="{{actionIndex !== null}}" style="opacity: 1;" class="fm">
-                  FM.{{actionIndex !== null ? (actionIndex + 1 < 10 ? "0" + (actionIndex + 1) : actionIndex + 1) : 00}} <image class="gochnnalList" mode="heightFix" src="./../../img/a6.png">
+                  FM.{{actionIndex !== null ? (actionIndex + 1 < 10 ? "0" + (actionIndex + 1) : actionIndex + 1) : 00}} <image class="gochnnalList" mode="heightFix" src="./../../../img/a6.png">
                     </image>
                 </view>
                 <view class="fmMod" bindtap="onTapToChannel"></view>
@@ -96,25 +96,25 @@
                     </view>
                   </view>
                 </view>
-                <image src="{{'./../../img/dl' + battery + '.png'}}" class="battery" mode="scaleToFill"></image>
+                <image src="{{'./../../../img/dl' + battery + '.png'}}" class="battery" mode="scaleToFill"></image>
             </view>
             <view class="wakeMode" bindtap="goWake">
-              <image src="./../../img/woak.png" class="mode" mode="scaleToFill"></image>
-              <image class="wake" mode="heightFix" src="{{isSetWake ? './../../img/n24.png' : './../../img/n23.png' }}"></image>
+              <image src="./../../../img/woak.png" class="mode" mode="scaleToFill"></image>
+              <image class="wake" mode="heightFix" src="{{isSetWake ? './../../../img/n24.png' : './../../../img/n23.png' }}"></image>
               <text>定时</text>
             </view>
           </view>
           <scroll-view class="pd" scroll-y="true">
             <view class="conm" wx:if="{{channelData && channelData.length > 0}}">
-              <image mode="scaleToFill" class="cz" src="./../../img/cz.png"></image>
+              <image mode="scaleToFill" class="cz" src="./../../../img/cz.png"></image>
               <view class="musicList">
                 <view wx:for="{{channelData}}" class="li {{index === actionIndex ? 'action' : ' '}}">
-                  <image mode="scaleToFill" wx:if="{{index === actionIndex}}" class="zz" src="./../../img/zz.png"></image>
+                  <image mode="scaleToFill" wx:if="{{index === actionIndex}}" class="zz" src="./../../../img/zz.png"></image>
                   <text class="lm">{{luoma[index]}}</text>
                   <view class="musicInfo" data-index="{{index}}" bindtap="onTapChannelIndex">
-                    <image mode="scaleToFill" class="pic" src="{{item.channelPic ? item.channelPic : './../../img/head_pic.png'}}"></image>
+                    <image mode="scaleToFill" class="pic" src="{{item.channelPic ? item.channelPic : './../../../img/head_pic.png'}}"></image>
                     <text>{{item.channelName}}</text>
-                    <image mode="scaleToFill" wx:if="{{index === actionIndex}}" class="svg" src="./../../svg/audio.svg"></image>
+                    <image mode="scaleToFill" wx:if="{{index === actionIndex}}" class="svg" src="./../../../svg/audio.svg"></image>
                   </view>
                 </view>
               </view>
@@ -124,11 +124,11 @@
           <view class="gologin" wx:if="{{showLogin}}">
             <view class="model">
               <view bindtap="goLogin" style="position: none; height: auto;" class="loginPic">
-                <image style="margin: 20rpx 0 20rpx 0; width: 100vw;" mode="widthFix" src="./../../img/BG_long.png"></image>
+                <image style="margin: 20rpx 0 20rpx 0; width: 100vw;" mode="widthFix" src="./../../../img/BG_long.png"></image>
               </view>
               <view style="position: none; height: calc(100% - 224rpx); overflow: auto;" class="BG_PD">
                 <view>
-                  <image style="margin: 0; width: 100vw;" mode="widthFix" src="./../../img/BG_PD.png"></image>
+                  <image style="margin: 0; width: 100vw;" mode="widthFix" src="./../../../img/BG_PD.png"></image>
                 </view>
               </view>
             </view>
@@ -136,11 +136,11 @@
           <view class="gologin goruter" wx:if="{{!showLogin && deviceList && deviceList.length === 0}}">
             <view class="model">
               <view bindtap="goDeviceConnect" style="position: none; height: auto;" class="loginPic">
-                <image style="margin: 20rpx 0 20rpx 0; width: 100vw;" mode="widthFix" src="./../../img/BG_LJ.png"></image>
+                <image style="margin: 20rpx 0 20rpx 0; width: 100vw;" mode="widthFix" src="./../../../img/BG_LJ.png"></image>
               </view>
               <view style="position: none; height: calc(100% - 224rpx); overflow: auto;" class="BG_PD">
                 <view>
-                  <image style="margin: 0; width: 100vw;" mode="widthFix" src="./../../img/BG_PD.png"></image>
+                  <image style="margin: 0; width: 100vw;" mode="widthFix" src="./../../../img/BG_PD.png"></image>
                 </view>
               </view>
             </view>
@@ -157,20 +157,20 @@
           <view class="list">
             <view class="li">
               <view class="icon">
-                <image mode="widthFix" style="width: 40rpx; height: 40rpx;" src="./../../img/o.png"></image>
+                <image mode="widthFix" style="width: 40rpx; height: 40rpx;" src="./../../../img/o.png"></image>
               </view>
               <view class="button">
                 <button open-type="feedback">建议与反馈</button>
-                <image class="j" src="./../../img/b.png"></image>
+                <image class="j" src="./../../../img/b.png"></image>
               </view>
             </view>
             <view class="li">
               <view class="icon">
-                <image mode="widthFix" style="width: 40rpx; height: 40rpx;" src="./../../img/q.png"></image>
+                <image mode="widthFix" style="width: 40rpx; height: 40rpx;" src="./../../../img/q.png"></image>
               </view>
               <view class="button" bindtap="jumpToAboutUs">
                 <text>关于我们</text>
-                <image class="j" src="./../../img/b.png"></image>
+                <image class="j" src="./../../../img/b.png"></image>
               </view>
             </view>
           </view>
@@ -189,7 +189,7 @@
       <view style="flex: 1; text-align: center; display: flex;align-items: center;">
         <!-- 首页 -->
         <view class="bottom_view" data-index="0" bind:tap="onTapIndex">
-          <image class="bottom_image" mode="widthFix" src="{{indexPage==0?'./../../img/index_action.png':'./../../img/index_unaction.png'}}"></image>
+          <image class="bottom_image" mode="widthFix" src="{{indexPage==0?'./../../../img/index_action.png':'./../../../img/index_unaction.png'}}"></image>
           <view style="font-size: 20rpx;color: {{indexPage==0?'#A4D099':'black'}}; padding-top: 0rpx;margin-top: 0rpx;">
             首页
           </view>
@@ -197,13 +197,13 @@
 
         <!-- 频道 -->
         <view wx:if="{{deviceListSelect!=null&&deviceList.length>deviceListSelect&&deviceList[deviceListSelect].connectType===3}}" class="bottom_view" data-index="1" bind:tap="onTapIndex">
-          <image class="bottom_image" mode="widthFix" src="{{indexPage==1?'./../../img/channel_action.png':'./../../img/channel_unaction.png'}}"></image>
+          <image class="bottom_image" mode="widthFix" src="{{indexPage==1?'./../../../img/channel_action.png':'./../../../img/channel_unaction.png'}}"></image>
           <view style="font-size: 20rpx;color: {{indexPage==1?'#A4D099':'black'}};">频道</view>
         </view>
 
         <!-- 我的 -->
         <view class="bottom_view" data-index="2" bind:tap="onTapIndex">
-          <image class="bottom_image" mode="widthFix" src="{{indexPage==2?'./../../img/me_action.png':'./../../img/me_unaction.png'}}"></image>
+          <image class="bottom_image" mode="widthFix" src="{{indexPage==2?'./../../../img/me_action.png':'./../../../img/me_unaction.png'}}"></image>
           <view style="font-size: 20rpx;color: {{indexPage==2?'#A4D099':'black'}};">我的</view>
         </view>
       </view>

pages/login/login.js

@@ -1,10 +1,10 @@
 const {
   login,
   register
-} = require('./../../utils/apiUtil.js')
+} = require('../../../utils/apiUtil.js')
 
-import routePath from '../../utils/routePath.js';
-import routeUtil from '../../utils/routeUtil.js';
+import routePath from '../../../utils/routePath.js';
+import routeUtil from '../../../utils/routeUtil.js';
 
 Page({
 

pages/pageA/login/login.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nav-bar": "./../../../components/navbar/navbar"
+  }
+}

pages/login/login.wxml

@@ -2,13 +2,13 @@
   <nav-bar bind:goBack="_goBack" nav-bgc-class="ex-nav-bgc-class" nav-title-class="ex-nav-title-class" ex-back-pre="ex-back-pre" navbar-data='{{nvabarData}}'>
   </nav-bar>
   <view class="mair">
-    <image mode="widthFix" src="./../../img/k.png"></image>
+    <image mode="widthFix" src="./../../../img/k.png"></image>
     <view class="loginbut">
       <view class="mode" wx:if="{{!isAgree}}" catchtap="notlogin"></view>
       <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快速登录</button>
     </view>
     <view class="ys">
-      <image bindtap="egree" mode="aspectFill" src="./../../img/{{isAgree ? 'h' : 'j'}}.png"></image>
+      <image bindtap="egree" mode="aspectFill" src="./../../../img/{{isAgree ? 'h' : 'j'}}.png"></image>
       <view>我已阅读并同意<text data-index="0"  bindtap="goabout">《猫王妙播用户服务协议》</text>
         <text data-index="1"  bindtap="goabout">《猫王妙播用户隐私协议》</text></view>
     </view>

utils/routePath.js

@@ -1,6 +1,11 @@
-///跳转路径
-const index = "../index/index";
-const login = "../login/login";
+///这里是跳转的路径
+
+/// A
+const index = "../../pageA/index/index";
+const login = "../../pageA/login/login";
+const deviceList = "../../pageA/deviceList/deviceList";
+
+/// B
 const about = "../about/about";
 const deviceConnect0 = "../deviceConnect0/deviceConnect0";
 const deviceConnect1 = "../deviceConnect1/deviceConnect1";
@@ -9,7 +14,7 @@ const deviceConnect2 = "../deviceConnect2/deviceConnect2";
 const setWifi = "../setWifi/setWifi";
 
 /// 抽奖记录
-const deviceList = "../deviceList/deviceList";
+
 const connectMode = "../deviceConMode/index";
 const connectBle = "../connectBle/connectBle";