bayi 1 năm trước cách đây
mục cha
commit
65de0ff25b
5 tập tin đã thay đổi với 31 bổ sung7 xóa
  1. 3 1
      app.js
  2. 2 2
      custom-tab-bar/index.json
  3. 11 0
      custom-tab-bar/index.less
  4. 4 4
      custom-tab-bar/index.wxml
  5. 11 0
      custom-tab-bar/index.wxss

+ 3 - 1
app.js

@@ -88,7 +88,9 @@ App({
             this.setUser({
                 grade: 'PRIMARY_FIRST_GRADE'
             })
-            getApp().callBack(userRes);
+            if (getApp().callBack) {
+                getApp().callBack(userRes);
+            }
             // #endif
         }
     },

+ 2 - 2
custom-tab-bar/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+    "component": true,
+    "usingComponents": {}
 }

+ 11 - 0
custom-tab-bar/index.less

@@ -54,6 +54,17 @@
     }
 }
 
+/* #if ANDROID */
+.androidMask {
+    width: 100%;
+    height: 100%;
+    background-color: rgba(200, 255, 0, 0.185);
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 9999;
+}
+/* #endif */
 .bounce {
     animation: elasticity 1.2s linear;
 }

+ 4 - 4
custom-tab-bar/index.wxml

@@ -7,7 +7,7 @@
         <image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></image>
         <view style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</view>
     </view>
-</view>
-<!-- #if ANDROID  -->
-<view class="androidMask" wx:if="{{androidMask}}" bind:tap="toAndroidLogin"></view>
-<!-- #endif -->
+    <!-- #if ANDROID  -->
+    <view class="androidMask" wx:if="{{androidMask}}" bind:tap="toAndroidLogin"></view>
+    <!-- #endif -->
+</view>

+ 11 - 0
custom-tab-bar/index.wxss

@@ -48,6 +48,17 @@
   z-index: 9;
   background: rgba(0, 0, 0, 0.7);
 }
+/* #if ANDROID */
+.androidMask {
+  width: 100%;
+  height: 100%;
+  background-color: rgba(200, 255, 0, 0.185);
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+}
+/* #endif */
 .bounce {
   animation: elasticity 1.2s linear;
 }