Bläddra i källkod

feature: 对设备裁剪详情分包处理

332777428@qq.com 4 månader sedan
förälder
incheckning
e56b90a0d8

+ 2 - 2
app.json

@@ -12,7 +12,6 @@
     "pages/aboutInfo/aboutInfo",
     "pages/deviceMode/deviceMode",
     "pages/connectBle/connectBle",
-    "pages/deviceDetail/deviceDetail",
     "pages/ota/ota",
     "pages/setWifi/setWifi",
     "pages/vipPurchase/vipPurchase",
@@ -35,7 +34,8 @@
       "root": "pages/piano/",
       "pages": [
         "cropper/cropper",
-        "wallpaper/wallpaper"
+        "wallpaper/wallpaper",
+        "deviceDetail/deviceDetail"
       ]
     }
   ],

+ 0 - 28
pages/deviceDetail/deviceDetail.wxml

@@ -1,28 +0,0 @@
-<view class="container">
-    <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="img_section">
-        <image src="{{device.imageUrl}}" class="avatar"></image>
-        <!-- <image src="https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20220909100711728016597.png" class="avatar"></image> -->
-    </view>
-    <view class="section">
-        <view wx:if="{{isShowWallpaper}}" class="item" bindtap="goToWallpaper">
-            <text class="label">壁纸设置</text>
-            <!-- <text class="arrow">></text> -->
-            <image class="arrow" src="../../images/common/icon_arrow.png"></image>
-        </view>
-        <!-- <view class="item">
-            <view class="left-content">
-                <text class="label">省电模式</text>
-                <image class="question" bind:tap="questionTap" src="../../images/common/icon_question.png"></image>
-            </view>
-            <switch class="switch" color="#6546A3" checked="{{powerOpen}}" bindchange="powerTap" />
-        </view> -->
-        <view class="item" bindtap="goToOta">
-            <view class="left-content">
-                <text class="label">固件信息</text>
-                <!-- <view wx:if="{{updateData.hasNewVersion}}" class="red"></view> -->
-            </view>
-            <image class="arrow" src="../../images/common/icon_arrow.png"></image>
-        </view>
-    </view>
-</view>

+ 5 - 5
pages/deviceDetail/deviceDetail.js

@@ -1,14 +1,14 @@
 const {
   BtHelper
-} = require('../../devices/bt_helper');
+} = require('../../../devices/bt_helper');
 
 import {
   EnumCmdEvent,
   CmdEvent
-} from '../../devices/cmd_key_event';
-import eventBus from '../../utils/eventBus'
-import routePath from '../../utils/routePath';
-import routeUtil from '../../utils/routeUtil';
+} from '../../../devices/cmd_key_event';
+import eventBus from '../../../utils/eventBus'
+import routePath from '../../../utils/routePath';
+import routeUtil from '../../../utils/routeUtil';
 
 Page({
   data: {

pages/deviceDetail/deviceDetail.json → pages/piano/deviceDetail/deviceDetail.json


+ 28 - 0
pages/piano/deviceDetail/deviceDetail.wxml

@@ -0,0 +1,28 @@
+<view class="container">
+  <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="img_section">
+    <image src="{{device.imageUrl}}" class="avatar"></image>
+    <!-- <image src="https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20220909100711728016597.png" class="avatar"></image> -->
+  </view>
+  <view class="section">
+    <view wx:if="{{isShowWallpaper}}" class="item" bindtap="goToWallpaper">
+      <text class="label">壁纸设置</text>
+      <!-- <text class="arrow">></text> -->
+      <image class="arrow" src="../../../images/common/icon_arrow.png"></image>
+    </view>
+    <!-- <view class="item">
+            <view class="left-content">
+                <text class="label">省电模式</text>
+                <image class="question" bind:tap="questionTap" src="../../../images/common/icon_question.png"></image>
+            </view>
+            <switch class="switch" color="#6546A3" checked="{{powerOpen}}" bindchange="powerTap" />
+        </view> -->
+    <view class="item" bindtap="goToOta">
+      <view class="left-content">
+        <text class="label">固件信息</text>
+        <!-- <view wx:if="{{updateData.hasNewVersion}}" class="red"></view> -->
+      </view>
+      <image class="arrow" src="../../../images/common/icon_arrow.png"></image>
+    </view>
+  </view>
+</view>

pages/deviceDetail/deviceDetail.wxss → pages/piano/deviceDetail/deviceDetail.wxss