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

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

+{
+    "success": true,
+    "code": "nostrud",
+    "data": [
+        {
+            "taskType": "jcA",
+            "title": "w5Qd%",
+            "rewards": 2,
+            "taskRateType": 2,
+            "waitReceive": -59123924.96824288,
+            "status": -22575314.240724027,
+            "completeTimes": -88356510.39271703,
+            "times": "3",
+            "todayCompleteTimes": -15114879.481988683,
+            "itemIds": "esse",
+            "url": "ex Lorem deserunt"
+        }
+    ],
+    "message": "pariatur ut id irure sit"
+}
\ No newline at end of file

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

+{"success":true,"data":{"openId":"incididunt non"},"code":"dolor ex"}
\ No newline at end of file

taobao_mini/client/api.js

@@ -23,6 +23,11 @@ const request = tbccRequest({
 // api handle 列表
 const apiList = {
     ...capi,
+    getTaskList: {
+        handle: 'getTaskList',
+        method: 'get',
+        isShowLoading: false
+    },
     receiveObjectPrize: {
         handle: 'receiveObjectPrize',
         method: 'get',

taobao_mini/client/app.js

@@ -2,12 +2,12 @@ import cloud from '@tbmp/mp-cloud-sdk';
 import tbcc from './tbcc-sdk';
 
 cloud.init({
-  env: 'online' // 云函数环境 test 测试环境 online 线上环境
+  env: 'test' // 云函数环境 test 测试环境 online 线上环境
 });
 
 App({
   requestType: 'cloud', // yapi，cloud: 云函数
-  requestType: 'local', // yapi，cloud: 云函数
+  // requestType: 'local', // yapi，cloud: 云函数
   cloudName: 'tmallCat', // 主云函数项目名 tmallCat
   // cloudName: 'bubbleSurviva', // 主云函数项目名 tmallCat
   cloud,
@@ -25,7 +25,7 @@ App({
    */
   handleQuery(query) {
     const { activityId } = query;
-    this.activityId = activityId || '5f34e1c4964f9706aa7d803c';
+    this.activityId = activityId || '5f6b09b3c3ad342fed5a0b21';
   }
 
 });

taobao_mini/client/components/comtask/comtask.acss

@@ -32,13 +32,22 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+
+.task_list {
+  width: 100%;
+  height: auto;
+  /* background-color: black; */
+  display: flex;
+  flex-flow: row wrap;
+  align-content: flex-start;
+  padding: 162rpx 0 0 41rpx;
+}
 .task .task_item {
   width: 668rpx;
   height: 141rpx;
   opacity: 1;
-  left: 41rpx;
-  top: 162rpx;
-  position: absolute;
+  margin: 0 0rpx 16rpx 0;
+  position: relative;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .task .task_item .task_itembg {
@@ -112,7 +121,7 @@
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .task .task_item .task_title {
-  width: 52rpx;
+  /* width: 52rpx; */
   height: 26rpx;
   opacity: 1;
   left: 139rpx;

taobao_mini/client/components/comtask/comtask.axml

@@ -2,18 +2,21 @@
   <view class="task ">
     <image class="task_bg " src={{resList['7d24398f-622f-4f20-9d7e-2d7237d7bc6b'].url}} />
     <image class="task_close " onTap="onModalClose" src={{resList['33778cbf-8c4f-4d6f-a8e8-9ebc6f0c5cd0'].url}} />
-    <view class="task_item ">
-      <image class="task_itembg " src={{resList['b44bac8c-652f-496d-9bc1-165e30d71b02'].url}} />
-      <image class="task_receivebtn " src={{resList['b9f1cc3f-4620-44d8-85ae-187be0745ace'].url}} />
-      <image class="task_gobtn " src={{resList['9ee176ed-5204-4524-97f9-bf17ee698aa8'].url}} />
-      <image class="task_disabedbtn " src={{resList['0e0684af-21c7-48e2-9114-8599c1de33f1'].url}} />
-      <image class="task_sginicon " src={{resList['ca4c78b3-caf5-435b-ba32-f187f24d1795'].url}} />
-      <image class="task_inviteicon " src={{resList['61cf4c2c-54e4-4cde-aa16-78ee5d17ab06'].url}} />
-      <image class="task_focusicon " src={{resList['61cf4c2c-54e4-4cde-aa16-78ee5d17ab06'].url}} />
-      <image class="task_readicon " src={{resList['61cf4c2c-54e4-4cde-aa16-78ee5d17ab06'].url}} />
-      <label class="task_title ">签到</label>
-      <label class="task_award ">精力 +10</label>
-      <label class="task_progress ">（10/10）</label>
+    <view class="task_list">
+      <view class="task_item " a:for="{{list}}">
+        <image class="task_itembg " src={{resList['b44bac8c-652f-496d-9bc1-165e30d71b02'].url}} />
+        <image class="task_receivebtn " src={{resList['b9f1cc3f-4620-44d8-85ae-187be0745ace'].url}} />
+        <image class="task_gobtn " src={{resList['9ee176ed-5204-4524-97f9-bf17ee698aa8'].url}} />
+        <image class="task_disabedbtn " src={{resList['0e0684af-21c7-48e2-9114-8599c1de33f1'].url}} />
+        <image class="task_sginicon " src={{resList['ca4c78b3-caf5-435b-ba32-f187f24d1795'].url}} />
+        <image class="task_inviteicon " src={{resList['61cf4c2c-54e4-4cde-aa16-78ee5d17ab06'].url}} />
+        <image class="task_focusicon " src={{resList['61cf4c2c-54e4-4cde-aa16-78ee5d17ab06'].url}} />
+        <image class="task_readicon " src={{resList['61cf4c2c-54e4-4cde-aa16-78ee5d17ab06'].url}} />
+        <label class="task_title ">签到</label>
+        <label class="task_award ">精力 +10</label>
+        <label class="task_progress ">（10/10）</label>
+      </view>
     </view>
+
   </view>
 </view>
\ No newline at end of file

taobao_mini/client/components/comtask/comtask.js

 'use strict';
 
 import resList from '../../resconfig/resList';
+import API from '../../api';
+const app = getApp();
+const { tbcc } = app;
+const { commonToast } = tbcc.tb;
 Component({
   props: {},
-  data: {resList: resList},
-  
+  data: { resList: resList, list: [
+    1,2,3,4
+  ] },
+
+  async didMount() {
+    const { success, data, message } = await API.getTaskList().catch(res => {
+      commonToast(res && res.message);
+    }) || {};
+  },
+
   methods: {
-    
     onModalClose() {
       const { onModalClose } = this.props;
       onModalClose && onModalClose();
-      console.log('com task onModalClose')
+      // console.log('com task onModalClose')
     }
   }
 

taobao_mini/client/pages/pagecanvas/pagecanvas.js

@@ -28,6 +28,7 @@ Page({
     data: {
         catType: 1,
         catName: '',
+        taskModalVisible:0,
         recallCatInfo:{},
         taskModalVisible: false,
         messageModalVisible: false,
@@ -74,7 +75,7 @@ Page({
         //     })
         // }, 500)
         //授权和登录先搞
-        // this.getAuth();
+        this.getAuth();
         my.__onMessage__ = (e) => {
             this.onMessage(e)
         }
@@ -98,11 +99,12 @@ Page({
     },
 
     spark_startEngine() {
-        console.log('spark_startEngine')
+        console.log('spark_startEngine',my)
         var self = this;
         my.createCanvas({
             id: 'canvas',
             success: ccc => {
+                console.log('createCanvas success' );
                 const dpr = my.getSystemInfoSync().pixelRatio;
                 const windowWidth = my.getSystemInfoSync().windowWidth;
                 const windowHeight = my.getSystemInfoSync().windowHeight;
@@ -119,7 +121,8 @@ Page({
                     this.main.addGlobalEvent("loading", self.showLoadingHandler, self);
                     this.main.addGlobalEvent("hideloading", self.hideLoadingHandler, self);
                 }
-            }
+            },
+            fail:()=>{console.log('createCanvas fail' );}
         });
     },
 
@@ -253,15 +256,14 @@ Page({
             console.log('未授权成功', err);
         });
         if (userInfo) {
-            console.log('userInfo', userInfo);
+            console.log('授权成功 userInfo', userInfo);
             const {
                 nickName,
                 avatar
             } = userInfo;
             app.nickName = nickName;
             app.avatar = avatar;
-            this.init();
-            // this.login();
+            this.login();
         }
     },
     /**