Просмотр исходного кода

feature: 名称大小写区分

332777428@qq.com 6 месяцев назад
Родитель
Сommit
00d8469f4e

+ 2 - 2
app.js

@@ -21,7 +21,7 @@ App({
     statusBarHeight: 0,
     safeBottomHeight: 0,
     navBarHeight: 0,
-    MenuButtonheight: 0,
+    MenuButtonHeight: 0,
     MenuButtonTop: 0,
     scopeBluetooth: true,
     ssid: "",
@@ -80,7 +80,7 @@ App({
 
     let custom = wx.getMenuButtonBoundingClientRect();
     that.globalData.navBarHeight = res.statusBarHeight + custom.height + (custom.top - res.statusBarHeight) * 2;
-    that.globalData.MenuButtonheight = custom.height;
+    that.globalData.MenuButtonHeight = custom.height;
     that.globalData.MenuButtonTop = custom.top;
     // var platform = res.platform;
     // that.globalData.isIOS = platform == "ios";

+ 1 - 1
pages/components/navbar/navbar.js

@@ -24,7 +24,7 @@ Component({
    */
   data: {
     navBarHeight: app.globalData.navBarHeight,
-    MenuButtonheight: app.globalData.MenuButtonheight,
+    MenuButtonHeight: app.globalData.MenuButtonHeight,
     MenuButtonTop: app.globalData.MenuButtonTop,
   },
 

+ 3 - 3
pages/components/navbar/navbar.wxml

@@ -1,8 +1,8 @@
 <view class='nav-wrap nav-bgc-class' style='height: calc({{navBarHeight}}px - {{MenuButtonTop}}px); padding-top: {{MenuButtonTop}}px;'>
-     <view class="nav-info" style="height: {{ MenuButtonheight }}px;">
-        <view  bindtap='_navback' style="height: {{ MenuButtonheight }}px;" class="device-pic">
+     <view class="nav-info" style="height: {{ MenuButtonHeight }}px;">
+        <view  bindtap='_navback' style="height: {{ MenuButtonHeight }}px;" class="device-pic">
           <image wx:if='{{navbarData.showCapsule}}' bindtap=""  mode="heightFix"  src="./../../../img/goback.png"></image>
         </view>
-        <text class="nav-title-class" style="height: {{ MenuButtonheight }}px; line-height: {{ MenuButtonheight }}px;">{{navbarData.title}}</text>
+        <text class="nav-title-class" style="height: {{ MenuButtonHeight }}px; line-height: {{ MenuButtonHeight }}px;">{{navbarData.title}}</text>
      </view>
   </view>

+ 1 - 1
pages/components/toast/toast.js

@@ -38,7 +38,7 @@ Component({
    */
   data: {
     navBarHeight: app.globalData.navBarHeight,
-    MenuButtonheight: app.globalData.MenuButtonheight,
+    MenuButtonHeight: app.globalData.MenuButtonHeight,
     MenuButtonTop: app.globalData.MenuButtonTop,
   },
 

+ 1 - 1
pages/index/index.js

@@ -56,7 +56,7 @@ Page({
     showChannel: false,
     ////首页
     navBarHeight: app.globalData.navBarHeight,
-    MenuButtonheight: app.globalData.MenuButtonheight,
+    MenuButtonHeight: app.globalData.MenuButtonHeight,
     MenuButtonTop: app.globalData.MenuButtonTop,
     actionIndex: null,
     luoma: ["Ⅰ", "Ⅱ", "Ⅲ", "Ⅳ", "Ⅴ", "Ⅵ", " Ⅶ", "Ⅷ", "Ⅸ", "Ⅹ", "Ⅺ", "Ⅻ"],