Merge branch 'hotfix/skan-qrcode' into 'master'

Hotfix/skan qrcode



See merge request !4

 .DS_Store
 .DS_Store
+.idea

@@ -27,6 +27,7 @@ import {  logEvent,
           YB_AWAKE_MP,
           YB_AWAKE_MP,
           YB_SERVICE_PUSH
           YB_SERVICE_PUSH
         } from './libs/analytics.js';
         } from './libs/analytics.js';
+import router from './pages/zeroSell/router/router';
 
 
         
         
 App({
 App({
@@ -101,6 +102,9 @@ App({
     }, 1000);
     }, 1000);
     this.mtainit(options);
     this.mtainit(options);
     await wxLogin();
     await wxLogin();
+    event.on('wechat-login-error', () => {
+      router.go('bindPhoneNumber');
+    });
     event.on('user-is-login', ({ logged, loginSuccess }) => {
     event.on('user-is-login', ({ logged, loginSuccess }) => {
       const userInfo = wx.getStorageSync('userInfo');
       const userInfo = wx.getStorageSync('userInfo');
       console.log(userInfo);
       console.log(userInfo);

@@ -51,11 +51,6 @@ Component({
    */
    */
   methods: {
   methods: {
     fetchCode() {
     fetchCode() {
-      if (!app.getUid()) {
-        this.triggerEvent('requireauth');
-        return;
-      }
-      
       wx.showLoading({
       wx.showLoading({
         mask: true
         mask: true
       });
       });

@@ -439,9 +439,9 @@ Page(Object.assign({
   },
   },
 
 
   requireAuth() {
   requireAuth() {
-    this.setData({
-      showAuth: true
-    })
+    // this.setData({
+    //   showAuth: true
+    // })
   },
   },
   _jumpBanner() {
   _jumpBanner() {
     if (this.data.bannerUrl == null) {
     if (this.data.bannerUrl == null) {

@@ -32,7 +32,7 @@
 </group-recommend>
 </group-recommend>
 
 
 <view class="action-bar">
 <view class="action-bar">
-  <action-bar wx:if="{{isLogin}}" status="{{actionStatus}}" num="{{myPrizeCount}}" share-uid="{{shareUid}}" act-prize-id="{{actPrizeId}}" bindgetcode="changeActionStatus" bindshare="share" bind:requireauth="requireAuth"
+  <action-bar wx:if="{{isLogin}}" status="{{actionStatus}}" num="{{myPrizeCount}}" share-uid="{{shareUid}}" act-prize-id="{{actPrizeId}}" bindgetcode="changeActionStatus" bindshare="share"
    ></action-bar>
    ></action-bar>
 
 
    <block wx:else>
    <block wx:else>

@@ -86,7 +86,6 @@ Page(Object.assign({
     event.on('wechat-login-success', this.loginSuccess);
     event.on('wechat-login-success', this.loginSuccess);
     event.on('wechat-login-callback', this.loginCallback);
     event.on('wechat-login-callback', this.loginCallback);
     event.on('wechat-login-change-status', this.loginChangeStatus);
     event.on('wechat-login-change-status', this.loginChangeStatus);
-    event.on('wechat-login-error', this.loginError);
 
 
     this.service = new ZeroSellService();
     this.service = new ZeroSellService();
     this.commonService = new CommonService();
     this.commonService = new CommonService();