Merge branch 'master' of gitee.com:sh_13808852820/program

dist/wx

@@ -1 +1 @@
-Subproject commit 2ec55f93a5637ee4081e4213dbfe34506761f7a1
+Subproject commit e5bd116b0787f355936c3be73fbd244742c387b7

src/components/banner.vue

@@ -42,7 +42,7 @@ export default {
       banners: [
         {
           id: 1,
-          src: "https://img.shuimuai.com/mp/banners/banner1%402x.png",
+          src: "https://img.shuimuai.com/mp/banner1_new.png",
           url: "/pages/none/main",
           button_text: "关于水母星球",
         },

src/components/device/device.vue

@@ -68,7 +68,7 @@
       <div class="head padding">
         <div>
           <div class="line"></div>
-          <div class="title">选择玩具</div>
+          <div class="title">选择教具</div>
         </div>
       </div>
       <!-- 内容 -->

src/pages/index/index.vue

@@ -191,7 +191,7 @@ export default {
   onHide() {},
   onLoad($option) {
     if (process.env.NODE_ENV == "development") {
-      wx.setStorageSync("token", "05qCTeq-SxX2L-3Uscu1iUdCaeFZp54D");
+      // wx.setStorageSync("token", "05qCTeq-SxX2L-3Uscu1iUdCaeFZp54D");
       // wx.setStorageSync("token", "aPaNBi1BXyic7P9o-NVPeGhkdCZUbWlx");
     }