Merge branch 'master' of http://gitlab2.dui88.com/wanghongyuan/hello_taobao

dist/pages/myprize/myprize.js

@@ -130,7 +130,10 @@ Page({
     flag = true;
     const { activityId } = app;
     const { item } = e.target.dataset;
-    const userAddress = await getUserAddress({ joinTag: " " })
+    const userAddress = await getUserAddress({ joinTag: " " }).catch((data)=>{
+      flag = false
+      console.log('getUserAddress出错了，错误信息是',data);
+    })
     // my.hideLoading();
     if (!userAddress) return
     // commonToast(' getUserAddress =>'+JSON.stringify( userAddress))

dist/tbcc-sdk/lib/tb.js

@@ -300,10 +300,10 @@ export const getUserAddress = async (opts = {}) => {
   let _opts = Object.assign({}, defaults, opts);
   return new Promise((resolve, reject) => {
     my.authorize({
-      scopes: 'scope.addressList',
+      scopes: 'scope.addressList', 
       success: () => {
         const { addAddress, searchAddress, locateAddress, joinTag } = _opts;
-        if (!my.tb.chooseAddress) {
+        if (!my.tb || !my.tb.chooseAddress) {
           reject({
             noSupport: true,
             errorMessage: '当前版本不支持选择收货地址，请升级到最新版本'
@@ -336,6 +336,9 @@ export const getUserAddress = async (opts = {}) => {
             reject(res);
           }
         );
+      },
+      fail: err => {
+        reject(err);
       }
     });
   });

dist/utils/pageshou_ye.js

-'use strict';
-
-import resList from '../../resconfig/resList'; //import API from '../../api';
-import API from '../../api';
-const app = getApp();
-const { tbcc } = app;
-const { commonToast, getAuthUserInfo, navigateToOutside } = tbcc.tb;
-Page({
-  data: {
-    ruleModalVisible: false
-  },
-
-  onLoad(props) {
-    this.setData({
-      resList: resList
-    });
-  },
-  gotoVipPage() {
-    API.getVipInfo().then(res => {
-      if (!res.vip)
-        navigateToOutside(res.url)
-      else
-        my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
-    })
-  },
-
-  handleStart() {
-    console.log('change')
-    my.redirectTo({
-      url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye'
-    });
-  },
-  showRuleModal() {
-    this.setData({
-      ruleModalVisible: true
-    })
-  },
-
-  ruleModalClose() {
-    this.setData({
-      ruleModalVisible: false
-    })
-  }
-
-});
\ No newline at end of file