feature：修改OTA的报错

app.json

@@ -18,7 +18,7 @@
     "pages/connectBle/connectBle",
     "pages/deviceDetail/detail",
     "pages/piano/wallpaper/wallpaper",
-    "pages/OTA/ota"
+    "pages/ota/ota"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/index/index.js

@@ -360,11 +360,7 @@ Page({
   },
 
   getchannelData(clientType) {
-<<<<<<< Updated upstream
-    var that = this;
-=======
     var that = this; Ï
->>>>>>> Stashed changes
     if (that.data.deviceListIndex === null) {
       return;
     };

pages/piano/wallpaper/wallpaper.js

@@ -8,8 +8,24 @@ Page({
     topImg: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
     imageList: [
       {
-        img:"https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
-        imgId:""
+        img: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
+        imgId: ""
+      },
+      {
+        img: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
+        imgId: ""
+      },
+      {
+        img: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
+        imgId: ""
+      },
+      {
+        img: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
+        imgId: ""
+      },
+      {
+        img: "https://inews.gtimg.com/om_bt/OAVMydtx9BsJxf5i_thi4Oll9sR1px-Esmtv6UHSxoisEAA/641",
+        imgId: ""
       }
     ],
     selectIndex: 0,

pages/piano/wallpaper/wallpaper.wxss

@@ -9,7 +9,9 @@
 }
 
 .select_img {
+    margin-top: 32rpx;
     padding-inline: 108rpx;
+    width: 533rpx;
     height: 400rpx;
     border-radius: 16rpx;
 }
@@ -34,7 +36,7 @@
 }
 
 .cell {
-    width: 100%;
+    width: 320rpx;
     height: 240rpx;
     border-radius: 16rpx;