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

project/src/canvas/game/mock/miniTb/tmallCat.getTaskList.json

@@ -4,7 +4,7 @@
         {
             "completeTimes": 0,
             "rewards": 1,
-            "status": 3,
+            "status": 2,
             "taskRateType": 2,
             "taskType": "sign",
             "times": 1,
@@ -16,25 +16,25 @@
             "completeTimes": 0,
             "rewards": 10,
             "sellerId": "oooo",
-            "status":3,
+            "status":2,
             "taskRateType": 1,
             "taskType": "follow",
-            "title": "关注店铺"
+            "title": "关注店铺1"
         },
         {
             "completeTimes": 0,
             "rewards": 10,
             "sellerId": "wwwww",
-            "status":3,
+            "status":2,
             "taskRateType": 1,
             "taskType": "follow",
-            "title": "关注店铺"
+            "title": "关注店铺2"
         },
         {
             "completeTimes": 0,
             "itemIds": "",
             "rewards": "2",
-            "status":3,
+            "status":2,
             "taskRateType": 2,
             "taskType": "browseGoods",
             "times": 1,
@@ -46,7 +46,7 @@
         {
             "completeTimes": 0,
             "rewards": "1",
-            "status": 3,
+            "status": 2,
             "taskRateType": 1,
             "taskType": "invites",
             "times": 3,

taobao_mini/client/components/comtask/comtask.js

@@ -61,6 +61,7 @@ Component({
       if (success && data) {
         commonToast('领取成功~');
       }
+      my.__updateUserInfo__();
       await this.getTaskList()
       flag = 0;
     },
@@ -76,7 +77,6 @@ Component({
           await this.getTaskList();
           break;
         case 'follow':
-          console.log('item,sellerId',item,sellerId)
           await this.handleGoFollow(sellerId);
           await this.getTaskList();
           break;

taobao_mini/client/components/comtasklist/comtasklist.axml

@@ -14,7 +14,10 @@
         <image class="task_readicon " a:if="{{item.taskType=='browseGoods'}}" src={{resList['91ef2cf1a80e41f9eeed67259f8e57ae5783afa6'].url}} />
         <label class="task_title ">{{item.title}}</label>
         <label class="task_award ">精力 +{{item.rewards}}</label>
-        <label class="task_progress ">（{{item.todayCompleteTimes}}/{{item.times}}）</label>
+        <block>
+        <label class="task_progress " a:if="{{item.taskType!='follow'}}">（{{item.todayCompleteTimes}}/{{item.times}}）</label>
+        <label class="task_progress " a:else>（{{item.completeTimes}}/1）</label>
+        </block>
       </view>
     </view>
   </view>

taobao_mini/client/pages/pageshop/pageshop.js

@@ -37,6 +37,7 @@ Page({
     const { success, data, message } = await API.exchangeGood(params).catch(res => {
       commonToast(res && res.message);
     }) || {};
+    my.__updateUserInfo__();
     my.hideLoading();
 
     if (success && data) {