111

taobao_jn/client/components/compksuccessmodal/compksuccessmodal.js

@@ -3,13 +3,13 @@
 import resList from '../../resconfig/resList';
 Component({
   props: {},
-  data: {},
+  data: {
+    resList: resList
+  },
   methods: {},
 
-  onInit(props) {
-    this.setData({
-      resList: resList
-    });
+  didMount(){
+      
   }
 
 });
\ No newline at end of file

taobao_jn/client/components/comrulemodal/comrulemodal.js

@@ -23,20 +23,20 @@ Component({
          */
         async getActivityBaseInfoById() {
             my.showLoading();
-            const {
-                success,
-                data
-            } = await API.getActivityBaseInfoById().catch(r => {
-                my.hideLoading();
-                commonToast(r && r.message)
-            }) || {};
+            // const {
+            //     success,
+            //     data
+            // } = await API.getActivityBaseInfoById().catch(r => {
+            //     my.hideLoading();
+            //     commonToast(r && r.message)
+            // }) || {};
 
-            if (success) {
+            // if (success) {
                 my.hideLoading();
                 this.setData({
-                    rule: data.rule
+                    rule: app.activityInfo.rule
                 })
-            }
+            // }
         },
     },
     didMount(){

taobao_jn/client/pages/pagepageindex/pagepageindex.axml

@@ -38,6 +38,6 @@
       <rule-modal a:if="{{modalStatus==1}}" onCloseModal="closeModal"></rule-modal>
       
       </view>
-      <view class="popcontainer_down" a:if="{{modalStatus}}">
+      <view class="popcontainer_down" a:if="{{modalStatus==2}}">
       <invitelist-modal a:if="{{modalStatus==2}}" onCloseModal="closeModal"></invitelist-modal>
       </view>

taobao_jn/client/pages/pagepageindex/pagepageindex.js

 'use strict';
 
-import resList from '../../resconfig/resList'; 
+import resList from '../../resconfig/resList';
 import API from '../../api';
 import * as FYGE from "fyge-tbmini";
 import * as SvgaParser from "svga-parser";
@@ -26,13 +26,13 @@ Page({
         /**弹窗状态 */
         modalStatus: 0,
         /**当前温暖值 */
-        curWarms:'',
+        curWarms: '',
         /**当前排名 */
-        curRank:'',
+        curRank: '',
         /**当前游戏阶段 */
-        curGameStep:1,
+        curGameStep: 1,
         /**活动结束后排行榜奖励信息 */
-        rankPrize:{}
+        rankPrize: {}
     },
 
     onLoad(props) {
@@ -54,71 +54,72 @@ Page({
     async createMain() {
         console.log(123)
         var canvas = await new Promise((r) => {
-          my.createCanvas({
-            id: 'canvas',
-            success: (ccc) => {
-              const dpr = my.getSystemInfoSync().pixelRatio
-              const windowWidth = my.getSystemInfoSync().windowWidth;
-              const windowHeight = my.getSystemInfoSync().windowHeight;
-              ccc.width = windowWidth * dpr + dpr;//重新修改会有误差
-              ccc.height = windowHeight * dpr + dpr;
-              r(ccc);
-            }
-          })
+            my.createCanvas({
+                id: 'canvas',
+                success: (ccc) => {
+                    const dpr = my.getSystemInfoSync().pixelRatio
+                    const windowWidth = my.getSystemInfoSync().windowWidth;
+                    const windowHeight = my.getSystemInfoSync().windowHeight;
+                    ccc.width = windowWidth * dpr + dpr; //重新修改会有误差
+                    ccc.height = windowHeight * dpr + dpr;
+                    r(ccc);
+                }
+            })
         })
         console.log(111)
         FYGE.initedByCanvas(canvas)
         var sysInfo = my.getSystemInfoSync()
         //建舞台
         var stage = new FYGE.Stage(
-          canvas,
-          750,//设计宽度，按设计搞给的就行
-          1624,//设计高度
-          sysInfo && sysInfo.windowWidth || document.body.clientWidth,
-          sysInfo && sysInfo.windowHeight || document.body.clientHeight,
-          FYGE.RENDERER_TYPE.CANVAS
+            canvas,
+            750, //设计宽度，按设计搞给的就行
+            1624, //设计高度
+            sysInfo && sysInfo.windowWidth || document.body.clientWidth,
+            sysInfo && sysInfo.windowHeight || document.body.clientHeight,
+            FYGE.RENDERER_TYPE.CANVAS
         );
         //stage初始化
         stage.addEventListener(FYGE.Event.INIT_STAGE, () => {
-          SvgaParser.loadSvga(
-            fireSrc,
-            (v) => {
-                console.log("svga"+v);
-              var mv =stage.addChild(new FYGE.MovieClip(v)); 
-              mv.x = 275;
-              mv.y = 785;
-              console.log("svgmv",mv)
-  
-            },
-            (err) => {
-                console.log(err);
-            }
-        )
-        SvgaParser.loadSvga(
-            snowSrc,
-            (v) => {
-                console.log("svga"+v);
-              var mv =stage.addChild(new FYGE.MovieClip(v)); 
-              mv.x = 175;
-              mv.y = 585;
-              console.log("svgmv",mv)
-  
-            },
-            (err) => {
-                console.log(err);
-            }
-        )
-  
+            SvgaParser.loadSvga(
+                fireSrc,
+                (v) => {
+                    console.log("svga" + v);
+                    var mv = stage.addChild(new FYGE.MovieClip(v));
+                    mv.x = 275;
+                    mv.y = 785;
+                    console.log("svgmv", mv)
+
+                },
+                (err) => {
+                    console.log(err);
+                }
+            )
+            SvgaParser.loadSvga(
+                snowSrc,
+                (v) => {
+                    console.log("svga" + v);
+                    var mv = stage.addChild(new FYGE.MovieClip(v));
+                    mv.x = 175;
+                    mv.y = 585;
+                    console.log("svgmv", mv)
+
+                },
+                (err) => {
+                    console.log(err);
+                }
+            )
+
         }, this);
-  
+
         //循环
         loop();
+
         function loop() {
-          FYGE.Tween.flush()
-          stage.flush();
-          FYGE.getRequestAnimationFrame()(loop);
+            FYGE.Tween.flush()
+            stage.flush();
+            FYGE.getRequestAnimationFrame()(loop);
         }
-  
+
     },
     /**
      * 获取用户授权信息
@@ -157,29 +158,51 @@ Page({
         }) || {};
 
         if (success) {
+            this.getActivityBaseInfoById();
+        }
+    },
+    /*
+     * 获取活动信息
+     */
+    async getActivityBaseInfoById() {
+        my.showLoading();
+        const {
+            success,
+            data
+        } = await API.getActivityBaseInfoById().catch(r => {
+            my.hideLoading();
+            commonToast(r && r.message)
+        }) || {};
+
+        if (success) {
+            my.hideLoading();
+            app.activityInfo = data;
             this.judgeDoHelp();
         }
     },
     /**判断是否是助力 */
-    judgeDoHelp(){
+    judgeDoHelp() {
         this.updateGameInfo();
     },
     /**更新游戏信息 */
-    async updateGameInfo(){
+    async updateGameInfo() {
         my.showLoading();
-        const {success,data} = await API.getGameInfo().catch(r=>{
+        const {
+            success,
+            data
+        } = await API.getGameInfo().catch(r => {
             my.hideLoading();
-            commonToast(r&&r.message);
-        })||{};
-        if(success){
+            commonToast(r && r.message);
+        }) || {};
+        if (success) {
             this.setData({
-                curWarms:data.warms+'',
-                curRank:data.rank,
-                curGameStep:data.step
+                curWarms: data.warms + '',
+                curRank: data.rank,
+                curGameStep: data.step
             })
             my.hideLoading();
         }
-        
+
     },
     /**打开弹窗 */
     openModal(e) {
@@ -198,7 +221,7 @@ Page({
         })
     },
     /**点击跳转页面 */
-    navigateTo(e){
+    navigateTo(e) {
         const {
             item
         } = e.target.dataset;

taobao_jn/mocks/jn.getUserRankList.json

@@ -3,7 +3,7 @@
     "success": true,
     "data": {
         "myRankInfo": {
-            "rank": "560",
+            "rank": "450",
             "warms": "1",
             "userNick": "caoxingru12"
         },