bayi 1 year ago
parent
commit
37a4933bf2
7 changed files with 5 additions and 12 deletions
  1. 1 4
      app.js
  2. 0 1
      app.wxss
  3. 2 2
      custom-tab-bar/index.less
  4. 1 2
      custom-tab-bar/index.wxss
  5. 0 1
      pages/activity/index.js
  6. 0 1
      pages/donutLogin/index.js
  7. 1 1
      store/index.js

+ 1 - 4
app.js

@@ -44,8 +44,8 @@ App({
         } else {
             let shareUid = options.query.uid || ''
             let userChannelCode = '3001'
+            // console.log("朋友圈广告进入");
             if ([1045, 1046, 1084].includes(scene)) {
-                console.log("朋友圈广告进入");
                 userChannelCode = '4001'
             }
             this.login(shareUid, userChannelCode)
@@ -88,9 +88,6 @@ App({
             this.setUser({
                 grade: 'PRIMARY_FIRST_GRADE'
             })
-            if (getApp().callBack) {
-                getApp().callBack(userRes);
-            }
             // #endif
         }
     },

+ 0 - 1
app.wxss

@@ -121,7 +121,6 @@ text {
 .androidMask {
     width: 100%;
     height: 100%;
-    background-color: rgba(200, 255, 0, 0.185);
     position: fixed;
     top: 0;
     left: 0;

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

@@ -56,14 +56,14 @@
 
 /* #if ANDROID */
 .androidMask {
+    position: absolute;
     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;

+ 1 - 2
custom-tab-bar/index.wxss

@@ -50,10 +50,9 @@
 }
 /* #if ANDROID */
 .androidMask {
+  position: absolute;
   width: 100%;
   height: 100%;
-  background-color: rgba(200, 255, 0, 0.185);
-  position: absolute;
   top: 0;
   left: 0;
   z-index: 9999;

+ 0 - 1
pages/activity/index.js

@@ -37,7 +37,6 @@ Page({
             classify: 2,
             grade: this.data.userInfo.grade
         })
-        console.log(res);
         this.setData({
             rankList: res
         })

+ 0 - 1
pages/donutLogin/index.js

@@ -35,7 +35,6 @@ Page({
             success: () => {
                 wx.getMiniProgramCode({
                     success: async (res) => {
-                        console.log(res);
                         let data = {
                             code: res.code,
                             userChannelCode: 3001

+ 1 - 1
store/index.js

@@ -13,7 +13,7 @@ export const store = observable({
   pkData: {},
   // 计算属性
   get androidMaskFun() {
-    return !wx.getStorageSync('uid')
+    return !this.userInfo.uid
   },
   // actions
   setUser: action(function (step) {