Merge branch 'tianmaoxiaoyuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into tianmaoxiaoyuan

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

 {
     "success": true,
-    "data": 1500,
+    "data": 2000,
     "code": "culpa eu Ut"
 }
\ No newline at end of file

taobao_mini/client/components/comcatrule/comcatrule.axml

 <view class="catrule modal-animate-zoom-in">
         <image class="catrulebg" src={{resList['716ced79-de7f-40ca-ac98-46a5adf13db0'].url}} />
-        <image class="catrulep" src={{resList['617927a2-2dd6-456a-9d92-1f607a137dbc'].url}} />
+        <!-- <image class="catrulep" src={{resList['617927a2-2dd6-456a-9d92-1f607a137dbc'].url}} /> -->
         <view class="catrulelabel" onTouchMove="touchMove" >
-          <label class="catruleText">游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则</label>
+          <label class="catruleText" >{{rule}}</label>
           
         </view>
         <image class="catrulebtnclose" onTap="onModalClose" src={{resList['29e80fbb-98ed-40fb-a11b-e14b45fee158'].url}} />

taobao_mini/client/components/comcatrule/comcatrule.js

@@ -4,7 +4,8 @@ import resList from '../../resconfig/resList';
 Component({
     props: {},
     data: {
-        resList: resList
+        resList: resList,
+        rule:''
     },
     methods: {
         onModalClose() {
@@ -20,4 +21,11 @@ Component({
         }
     },
 
+    didMount(){
+        const {rule} = this.props;
+        console.log("规则",rule);
+        this.setData({
+            rule:rule.rule
+        })
+    }
 });
\ No newline at end of file

taobao_mini/client/components/comlevelup/comlevelup.acss

@@ -97,11 +97,11 @@
 }
 
 .levelup .levelup_prizeImg {
-  width: 352rpx;
-  height: 291rpx;
+  width: 349rpx;
+  height: 288rpx;
   opacity: 1;
-  left: 201rpx;
-  top: 381rpx;
+  left: 203rpx;
+  top: 382rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }

taobao_mini/client/pages/pagecanvas/pagecanvas.axml

@@ -13,4 +13,4 @@
 <view class="popcontainer" a:if="{{getcatModalVisible}}"><getcat-modal selectType="{{catType}}" catName="{{catName}}" onPostSelectCat="postSelectCat" onModalClose="closeGetcatModal"></getcat-modal></view> 
 <view class="popcontainer" a:if="{{catbackbedModalVisible}}"><catbackbed-modal mydata="{{recallcatModalData}}" recallCatInfo="{{recallCatInfo}}" onUpdateUserInfo="updateUserInfo" onModalClose="closeCatbackModal"></catbackbed-modal></view> 
 <task-modal a:if="{{taskModalVisible}}" onModalClose="closeTaskModal"></task-modal>
- <view class="popcontainer" a:if="{{catruleModalVisible}}"><catrule-modal onModalClose="closeCatruleModal"></catrule-modal></view> 
+ <view class="popcontainer" a:if="{{catruleModalVisible}}"><catrule-modal rule="{{activityBaseInfo}}" onModalClose="closeCatruleModal"></catrule-modal></view> 

taobao_mini/client/pages/pagecanvas/pagecanvas.js

@@ -35,6 +35,7 @@ Page({
     data: {
         catType: 1,
         catName: '',
+        activityBaseInfo:null,
         recallCatInfo: {},
         taskModalVisible: 0,
         messageModalVisible: false,
@@ -333,10 +334,25 @@ Page({
 
             if (success) {
                 app.openId=data.openId;
-                this.initCanvas();
+                this.getActivityBaseInfoById();
             }
         
     },
+    /**
+     * 获取活动信息
+     */
+    async getActivityBaseInfoById(){
+        const {success,data} = await API.getActivityBaseInfoById().catch(r=>{
+            commonToast(r&&r.message)
+        })||{};
+
+        if(success){
+            this.setData({
+                activityBaseInfo:data
+            })
+            this.initCanvas();
+        }
+    },
     /**刷新用户信息 */
     updateUserInfo() {
         console.log("通知canvas刷新用户信息")