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

taobao_mini/client/components/comtask/comtask.acss

@@ -145,11 +145,12 @@
   color: #39abed;
 }
 .task .task_item .task_progress {
-  width: 90rpx;
-  height: 22rpx;
+  width: 200rpx;
+  /* height: 22rpx; */
+  text-align: center;
   opacity: 1;
-  left: 517rpx;
-  top: 95rpx;
+  left: 465rpx;
+  top: 90rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
   font-size: 24rpx;

taobao_mini/client/components/comtasklist/comtasklist.axml

@@ -15,7 +15,8 @@
         <label class="task_title ">{{item.title}}</label>
         <label class="task_award ">精力 +{{item.rewards}}</label>
         <block>
-        <label class="task_progress " a:if="{{item.taskType!='follow'}}">（{{item.todayCompleteTimes}}/{{item.times}}）</label>
+        <label class="task_progress " a:if="{{item.taskType=='invites'}}">（不限次数）</label>
+        <label class="task_progress " a:elif="{{item.taskType!='follow'}}">（{{item.todayCompleteTimes}}/{{item.times}}）</label>
         <label class="task_progress " a:else>（{{item.completeTimes}}/1）</label>
         </block>
       </view>

taobao_mini/client/pages/pagecanvas/pagecanvas.js

@@ -89,7 +89,7 @@ Page({
         console.log('on ready')
 
         //授权和登录先搞
-        // await this.getAuth();
+        await this.getAuth();
         // this.initCanvas();
         my.__onMessage__ = (e) => {
             this.onMessage(e)