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

app.json

@@ -31,8 +31,6 @@
     }
   ],
   "tabBar": {
-    "custom": true,
-    "borderStyle": "black",
     "list": [
       {
         "pagePath": "pages/home/home",
@@ -52,7 +50,12 @@
         "iconPath": "./img/me_unaction.png",
         "selectedIconPath": "./img/me_action.png"
       }
-    ]
+    ],
+    "color": "#999999",  
+    "selectedColor": "#1AAD19",  
+    "backgroundColor": "#FFFFFF",  
+    "borderStyle": "black",  
+    "position": "bottom" 
   },
   "window": {
     "backgroundTextStyle": "light",

pages/piano/wallpaper/wallpaper.js

@@ -10,6 +10,19 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '壁纸', //导航栏 中间的标题
     },
+    topList: [{
+      name: "图片4",
+      image: "./../../../img/min.png",
+    }, {
+      name: "图片1",
+      image: "./../../../img/min.png",
+    }, {
+      name: "图片2",
+      image: "./../../../img/min.png",
+    }, {
+      name: "图片3",
+      image: "./../../../img/min.png",
+    }, ],
   },
 
   /**

pages/piano/wallpaper/wallpaper.wxml

@@ -1,4 +1,19 @@
 <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 class="public">
+    <image class="image_top" src="./../../../img/min.png"></image>
+
+    <view class="top_item_public_add">
+      <view class="top_item_public" wx:for="{{topList}}" wx:key="key" wx:for-item="item" wx:for-index="index">
+        <view bind:tap="clickTopItem" data-index="{{index}}">
+          <image class="top_image" mode="heightFix" src="{{item.image}}"></image>
+          <view>{{item.name}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+
 </view>

pages/piano/wallpaper/wallpaper.wxss

@@ -1 +1,35 @@
-/* pages/piano/wallpaper/wallpaper.wxss */
+.public {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.image_top {
+  margin-top: 40rpx;
+  height: 40vw;
+  width: 60vw;
+}
+
+.top_item_public_add {
+  display: -webkit-flex;
+  display: flex;
+  margin-top: 40rpx;
+  align-items: center;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+  width: 100%;
+}
+
+.top_item_public {
+  justify-content: center;
+  flex: 0 0 auto;
+  width: 50%;
+  text-align: center;
+  color: #797979;
+  padding: 40rpx 0;
+  font-size: 30rpx;
+}
+
+.top_image {
+  height: 20vw;
+}

project.private.config.json

@@ -9,25 +9,46 @@
     "miniprogram": {
       "list": [
         {
-          "name": "木鱼",
-          "pathName": "pages/piano/woodenfish/woodenfish",
+          "name": "壁纸",
+          "pathName": "pages/piano/wallpaper/wallpaper",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/bluConnect/bleconnect",
-          "pathName": "pages/bluConnect/bleconnect",
+          "name": "登录",
+          "pathName": "pages/login/login",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/piano/detail/detail",
+          "name": "设备详情",
           "pathName": "pages/piano/detail/detail",
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "固件信息",
+          "pathName": "pages/piano/firmware/firmware",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "木鱼",
+          "pathName": "pages/piano/woodenfish/woodenfish",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/bluConnect/bleconnect",
+          "pathName": "pages/bluConnect/bleconnect",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }