@@ -88,7 +88,9 @@ App({
this.setUser({
grade: 'PRIMARY_FIRST_GRADE'
})
- getApp().callBack(userRes);
+ if (getApp().callBack) {
+ getApp().callBack(userRes);
+ }
// #endif
}
},
@@ -1,4 +1,4 @@
{
- "component": true,
- "usingComponents": {}
+ "component": true,
+ "usingComponents": {}
@@ -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;
@@ -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>
@@ -48,6 +48,17 @@
z-index: 9;
background: rgba(0, 0, 0, 0.7);