Merge remote-tracking branch 'refs/remotes/origin/tianmaoxiaoyuan' into tianmaoxiaoyuan

taobao_mini/client/components/comtask/comtask.js

@@ -74,9 +74,9 @@ Component({
 
       switch (taskType) {
         case 'browseGoods':
+          navigateToOutside( url );
           await this.handleGoBrowseGoods();
           await this.getTaskList();
-          navigateToOutside( url );
           break;
         case 'follow':
           await this.handleGoFollow(sellerId);
@@ -97,14 +97,15 @@ Component({
       }) || {};
     },
     async handleGoFollow(sellerId) {
-      await API.doFollowTask({ sellerId }).catch(res => {
-        commonToast(res && res.message);
-      }) || {};
-
       const favorStatus = await favorShop(sellerId).catch(err => {
         console.log('关注店铺失败', err);
       });
       commonToast(favorStatus ? '关注成功' : '关注失败');
+      if(favorStatus) {
+        await API.doFollowTask({ sellerId }).catch(res => {
+          commonToast(res && res.message);
+        }) || {};
+      }
     },
     onModalClose() {
       const { onModalClose } = this.props;