Merge branch 'feature/3.2.0' of http://60.205.190.38:9000/wuhao/wxmini into feature/3.2.0

app.json

@@ -17,22 +17,20 @@
     "pages/home/home",
     "pages/bluConnect/bleconnect"
   ],
-  "subPackages": [
-    {
-      "root": "pages/piano/",
-      "pages": [
-        "detail/detail",
-        "woodenfish/woodenfish",
-        "wallpaper/wallpaper",
-        "musicscore/musicscore"
-      ]
-    }
-  ],
-  
+  "subPackages": [{
+    "root": "pages/piano/",
+    "pages": [
+      "detail/detail",
+      "woodenfish/woodenfish",
+      "wallpaper/wallpaper",
+      "musicscore/musicscore",
+      "firmware/firmware"
+    ]
+  }],
+
   "tabBar": {
     "borderStyle": "black",
-    "list": [
-      {
+    "list": [{
         "pagePath": "pages/index/index",
         "text": "首页",
         "iconPath": "./img/index_unaction.png",
@@ -73,7 +71,7 @@
   ],
   "permission": {
     "scope.userFuzzyLocation": {
-      "desc": "用于获取wifi名称" 
+      "desc": "用于获取wifi名称"
     }
   }
 }

pages/piano/detail/detail.js

@@ -20,6 +20,7 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '设备详情', //导航栏 中间的标题
     },
+    powerSwitch: false,
   },
 
   /**
@@ -43,6 +44,7 @@ Page({
 
   },
 
+  ///点击顶部
   clickTopItem(e) {
     var that = this;
     switch (e.currentTarget.dataset.index) {
@@ -54,14 +56,32 @@ Page({
         break;
         ///壁纸
       case 1:
+        wx.navigateTo({
+          url: './../wallpaper/wallpaper',
+        })
         break;
         ///曲谱
       case 2:
+        wx.navigateTo({
+          url: './../musicscore/musicscore',
+        })
         break;
     }
     // console.log("获取当前数据=====" + JSON.stringify(index) + "====" + JSON.stringify(e));
   },
 
+  ///省电模式选择
+  powerSwitchChange() {
+
+  },
+
+  ///跳转固件界面
+  firmwareClick() {
+    wx.navigateTo({
+      url: './../firmware/firmware',
+    })
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */

pages/piano/detail/detail.wxml

@@ -15,10 +15,27 @@
   </view>
 
   <view class="bottom_public">
-    <text>省电模式</text>
+    <text class="bottom_public_text">省电模式</text>
     <view class="bottom_item">
       <image class="bottom_item_image" mode="heightFix" src="./../../../img/min.png"></image>
-      <switch color="#6D00FF" checked="{{switch1Checked}}" bindchange="switch1Change" />
+      <switch class="bottom_item_switch" checked="{{powerSwitch}}" bindchange="powerSwitchChange"></switch>
     </view>
   </view>
+
+  <view class="bottom_public">
+    <view class="bottom_item">
+      <text class="bottom_public_text">恢复出厂设置</text>
+      <text>还原设备默认设置</text>
+    </view>
+    <image class="bottom_item_image" mode="heightFix" src="./../../../img/min.png"></image>
+  </view>
+
+  <view class="bottom_public" bind:tap="firmwareClick" bin>
+    <view class="bottom_item">
+      <text class="bottom_public_text">固件信息</text>
+      <image class="bottom_item_image" mode="heightFix" src="./../../../img/min.png"></image>
+    </view>
+    <image class="bottom_item_image" mode="heightFix" src="./../../../img/min.png"></image>
+  </view>
+
 </view>

pages/piano/detail/detail.wxss

@@ -42,6 +42,11 @@
   margin: 60rpx 40rpx 40rpx 40rpx;
   justify-content: space-between;
   align-items: center;
+  font-size: 30rpx;
+}
+
+.bottom_public_text {
+  margin-right: 30rpx;
 }
 
 .bottom_item {
@@ -50,6 +55,6 @@
 }
 
 .bottom_item_image {
-  height: 70rpx;
+  height: 30rpx;
   margin-right: 20rpx;
 }

pages/piano/firmware/firmware.js

@@ -0,0 +1,69 @@
+// pages/piano/firmware/firmware.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    nvabarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '固件信息', //导航栏 中间的标题
+    },
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/piano/firmware/firmware.json

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

pages/piano/firmware/firmware.wxml

@@ -0,0 +1,4 @@
+<view>
+  <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>

pages/piano/firmware/firmware.wxss

@@ -0,0 +1,60 @@
+.top_item_public_add {
+  /* 
+  margin-top: 50rpx; */
+  /*  垂直布局 */
+  /* flex-direction: column; */
+  /* 垂直居中 */
+  /* justify-content: center; */
+  display: -webkit-flex;
+  display: flex;
+  margin-top: 40rpx;
+  align-items: center;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+  width: 100%;
+}
+
+.top_item_public {
+  /* display: flex;
+  flex: 1; */
+  justify-content: center;
+  flex: 0 0 auto;
+  width: 33.33333333%;
+  text-align: center;
+  color: #797979;
+  padding: 40rpx 0;
+  font-size: 30rpx;
+}
+
+.top_image {
+  height: 70rpx;
+}
+
+.setting_public {
+  margin: 200rpx 0 0rpx 40rpx;
+  font-size: 40rpx;
+  font-weight: 500;
+}
+
+.bottom_public {
+  display: flex;
+  font-size: 40rpx;
+  margin: 60rpx 40rpx 40rpx 40rpx;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 30rpx;
+}
+
+.bottom_public_text {
+  margin-right: 30rpx;
+}
+
+.bottom_item {
+  display: flex;
+  align-items: center;
+}
+
+.bottom_item_image {
+  height: 30rpx;
+  margin-right: 20rpx;
+}

pages/piano/woodenfish/woodenfish.js

@@ -15,56 +15,7 @@ Page({
     },
     selTypeList: [{"url":"","name":"木鱼1"},{"url":"","name":"木鱼2"},{"url":"","name":"木鱼3"}],
     dropDownMenuTitle: ['区域', '来源', '租售', '排序'],
-    data1: [{
-        id: 0,
-        title: '不限',
-        childModel: [{
-            id: '0-1',
-            title: '不限'
-          }
-        ]
-      },
 
-      {
-        id: 1,
-        title: '道里区',
-        childModel: [{
-            id: '1-1',
-            title: '中央大街'
-          },
-          {
-            id: '1-2',
-            title: '埃德蒙顿路'
-          }
-        ]
-      },
-      {
-        id: 2,
-        title: '南岗区',
-        childModel: [{
-            id: '2-1',
-            title: '果戈里'
-          },
-          {
-            id: '2-2',
-            title: '通达街'
-          }
-        ]
-      },
-      {
-        id: 3,
-        title: '松北区',
-        childModel: [{
-            id: '3-1',
-            title: '世茂大道'
-          },
-          {
-            id: '3-2',
-            title: '市政府'
-          }
-        ]
-      }
-    ],
     data2: [{
         id: 1,
         title: '个人房源'
@@ -74,25 +25,6 @@ Page({
         title: '经纪人房源'
       }
     ],
-    data3: [{
-        id: 1,
-        title: '出租'
-      },
-      {
-        id: 2,
-        title: '出售'
-      }
-    ],
-    data4: [{
-      id: 1,
-      title: '智能排序'
-    }, {
-      id: 2,
-      title: '发布时间'
-    }, {
-      id: 3,
-      title: '距离优先'
-    }],
 
   } , selectedItem: function(e) {
     console.log('id --' + e.detail.selectedId + "cityname = " + e.detail.selectedTitle);

pages/piano/woodenfish/woodenfish.wxss

@@ -9,7 +9,6 @@
   /* margin-right: 0%; */
   /* position: fixed; */
   flex: 1;
-
 }
 
 .container .scroll_c {

project.private.config.json

@@ -9,22 +9,22 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/bluConnect/bleconnect",
-          "pathName": "pages/bluConnect/bleconnect",
+          "name": "木鱼",
+          "pathName": "pages/piano/woodenfish/woodenfish",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/piano/detail/detail",
-          "pathName": "pages/piano/detail/detail",
+          "name": "pages/bluConnect/bleconnect",
+          "pathName": "pages/bluConnect/bleconnect",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "",
-          "pathName": "pages/index/index",
+          "name": "pages/piano/detail/detail",
+          "pathName": "pages/piano/detail/detail",
           "query": "",
           "launchMode": "default",
           "scene": null