1112

taobao_jn/client/app.acss

@@ -50,7 +50,7 @@ page {
 
 .modal-animate-zoom-in {
   transform: scale(0);
-  animation: modalAnimateZoomIn .4s forwards;
+  animation: modalAnimateZoomIn .3s forwards;
 }
 
 .modal-animate-fly-in {

taobao_jn/client/app.json

 {
     "pages": [
         "pages/pagepageindex/pagepageindex",
+        "pages/pagepagerank/pagepagerank",
         "pages/tbccDemo/tbccDemo",
         "pages/goodsPage/goodsPage",
         "pages/myprize/myprize"

taobao_jn/client/components/cominvitelistmodal/cominvitelistmodal.acss

@@ -91,5 +91,5 @@
   opacity: 1;
   left: 596rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }

taobao_jn/client/components/cominvitelistmodal/cominvitelistmodal.axml

 <view class="invitelistmodal ">
         <image class="invitelistbg " src={{resList['fe67e0c4-26fa-4f08-bf4a-5128b65a7fdd'].url}} />
-        <view class="invitelisttext ">
-          <span class="tb23512544 ">tb235***1214</span>
-          <span class="tu_ceng20200433 ">2020.09.15 23：56</span>
-          <span class="tb23512322 ">tb235***1214</span>
-          <span class="tu_ceng20200211 ">2020.09.15 23：56</span>
-          <span class="invitelistid ">淘宝id</span>
-          <span class="invitelisttime ">成功入会时间</span>
+        <view class="invitelisttext " >
+        <view class="inviteItem">
+          <label class="tb23512544 ">tb235***1214</label>
+          <label class="tu_ceng20200433 ">2020.09.15 23：56</label>
           </view>
-        <image class="invitelistclose " src={{resList['db42e12e-c495-4526-9dbf-1e435614119c'].url}} />
+          <label class="invitelistid ">淘宝id</label>
+          <label class="invitelisttime ">成功入会时间</label>
+        </view>
+        <image class="invitelistclose btn" onTap="onCloseModal" src={{resList['db42e12e-c495-4526-9dbf-1e435614119c'].url}} />
       </view>
\ No newline at end of file

taobao_jn/client/components/cominvitelistmodal/cominvitelistmodal.js

 'use strict';
 
 import resList from '../../resconfig/resList';
+import API from '../../api';
 Component({
   props: {},
-  data: {},
-  methods: {},
-
-  onInit(props) {
-    this.setData({
+  data: {
     resList: resList
-    });
+  },
+  methods: {
+    onCloseModal(){
+        const {onCloseModal} = this.props;
+        onCloseModal&&onCloseModal();
     }
+  },
+
 
 });
\ No newline at end of file

taobao_jn/client/components/comrulemodal/comrulemodal.acss

@@ -5,7 +5,7 @@
   left: 111rpx;
   top: 341rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 50%;
 }
 .rulemodal .rulemadolbg {
   width: 527rpx;
@@ -52,5 +52,5 @@
   opacity: 1;
   left: 467rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }

taobao_jn/client/components/comrulemodal/comrulemodal.axml

-<view class="rulemodal ">
+<view class="rulemodal modal-animate-zoom-in">
         <image class="rulemadolbg " src={{resList['3e979239-2524-4a98-8a37-7025df15d997'].url}} />
         <view class="ruletextgroup ">
-          <span class="ruletitle ">活动规则</span>
-          <span class="ruletext ">
-            1.活动规则文本内容活动规则文本内容活动规则文本内容活动规则文本内容活动规则文本内容
-            2.活动规则文本内容活动规则文本内容活动规则文本内容活动规则文本内容
-            3.活动规则文本内容活动规则文本内容活动规则文本内容活动规则文本内容
-            4.活动规则文本内容活动规则文本内容活动规则文本内容
-          </span>
+          <label class="ruletitle ">活动规则</label>
+          <label class="ruletext ">
+            {{rule}}
+          </label>
         </view>
-        <image class="rulecolse " src={{resList['bf606fdb-a499-4bb3-94be-868ec373b2a4'].url}} />
+        <image class="rulecolse btn" onTap="onCloseModal" src={{resList['bf606fdb-a499-4bb3-94be-868ec373b2a4'].url}} />
       </view>
\ No newline at end of file

taobao_jn/client/components/comrulemodal/comrulemodal.js

 'use strict';
 
 import resList from '../../resconfig/resList';
+import API from '../../api';
 Component({
     props: {},
-  data: {},
-  methods: {},
+    data: {
+        resList: resList,
+        rule:''
+    },
+    methods: {
+        onCloseModal() {
+            const {
+                onCloseModal
+            } = this.props;
+            onCloseModal && onCloseModal();
+        },
+        /**
+         * 获取活动信息
+         */
+        async getActivityBaseInfoById() {
+            my.showLoading();
+            const {
+                success,
+                data
+            } = await API.getActivityBaseInfoById().catch(r => {
+                my.hideLoading();
+                commonToast(r && r.message)
+            }) || {};
 
-  onInit(props) {
+            if (success) {
+                my.hideLoading();
                 this.setData({
-      resList: resList
-    });
+                    rule: data.rule
+                })
             }
+        },
+    },
+    didMount(){
+        this.getActivityBaseInfoById();
+    }
+
 
 });
\ No newline at end of file

taobao_jn/client/components/prizeModal/prizeModal.acss

@@ -17,10 +17,10 @@
 }
 
 .my-prize-page .my-prize-label {
-  width: 171rpx;
-  height: 50rpx;
-  margin: 40rpx auto;
-  background: url('//yun.duiba.com.cn/aurora/assets/2f075d102e58cd42fa938d6e23cb6ffd4a2a9486.png') no-repeat;
+  width: 286rpx;
+  height: 49rpx;
+  margin: 140rpx auto 40rpx;
+  background: url('//yun.duiba.com.cn/aurora/assets/a15fe07a819f3f6deb271725b37468030523dc05.png') no-repeat;
   background-size: 100% 100%;
 }
 
@@ -46,8 +46,8 @@
   width: 700rpx;
   height: 161rpx;
   background-color: #ffffff;
-  border-color:#7f674e;
-  border-width: 5rpx;
+  border-color:rgb(255, 63, 38);
+  border-width: 1rpx;
   border-style: solid;
   /* box-shadow: 2rpx 3rpx 18rpx 0 rgb(255, 63, 38); */
   border-radius: 10rpx;
@@ -55,7 +55,6 @@
 }
 
 .my-prize-page .my-prize-item .my-prize-avatar {
-  border-radius: 4rpx;
   width: 120rpx;
   height: 120rpx;
 }

taobao_jn/client/components/prizeModal/prizeModal.axml

@@ -19,8 +19,7 @@
           <!-- 未领取 -->
           <block a:if="{{item.drawStatus===PRIZE_DRAW_STATUS_MAP.RECEIVE}}">
             <!-- 实物填写地址 -->
-            <image a:if="{{item.type === PRIZE_TYPE_MAP.ENTITY}}" onTap="handleClick" data-item="{{item}}" src="{{task.image.getBth}}" />
-            <!--<image a:if="{{item.type === PRIZE_TYPE_MAP.ENTITY}}" onTap="handleClick" data-item="{{item}}" src="{{task.image.addressBth}}" />-->
+            <image a:if="{{item.type === PRIZE_TYPE_MAP.ENTITY}}" onTap="handleClick" data-item="{{item}}" src="{{task.image.addressBth}}" />
             <!-- 优惠券立即领取 -->
             <image  a:else onTap="handleClick" data-item="{{item}}" src="{{task.image.getBth}}" />
           </block>

taobao_jn/client/pages/myprize/myprize.js

@@ -16,16 +16,16 @@ Page({
     endTime: null,//到期时间
     task: {
       image: {
-        bg: '//yun.duiba.com.cn/aurora/assets/8fa7cea57cc7071bcc1cbada32f5bfaeb2203981.jpg', //背景图
-        copyIcon: '//yun.duiba.com.cn/aurora/assets/721e5319d26a4edbb0282558fb87d9bda1de4887.png', //复制
-        addressBth: '//yun.duiba.com.cn/aurora/assets/7ff6342492c2ce1a94ccfce39c88983b296b35fb.png', //填写地址(实物奖品)
-        getBth: '//yun.duiba.com.cn/aurora/assets/0725f0f5569ad12d37853ad5c40d163fbe247abf.png', //立即领取(除实物奖品外)
+        bg: '//yun.duiba.com.cn/aurora/assets/7283d715cc5c7d13a5f498d15f5f5b9f4d9c29e5.jpg', //背景图
+        copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
+        addressBth: '//yun.duiba.com.cn/aurora/assets/82cc3c6d8861334ebaf128c98e3341b687bdc007.png', //填写地址(实物奖品)
+        getBth: '//yun.dui88.com/duiba-components-c-myprizeget_now.png', //立即领取(除实物奖品外)
         logisticsBth: '//yun.duiba.com.cn/aurora/assets/661f86ff3392cb3b56922b048acf74bebc07bb23.png', //查看物流
         useBtn: '//yun.duiba.com.cn/aurora/assets/0829f92f771c5e9fdb05a258a46b2d038d3a9997.png', //去使用(除实物奖品外)
-        gotBtn: '//yun.duiba.com.cn/aurora/assets/30fa200ba1dcd345247f957c16a03a9706895112.png', //已领取(优惠券)
-        getAgainBtn: '//yun.duiba.com.cn/aurora/assets/f2bc6220c3b210a4b315ab1bfcc4ebeffcf854ba.png', //重新领取
-        invalidBtn: '//yun.duiba.com.cn/aurora/assets/2790bbc504bd94bd7914771e5ba1202e9f011a1a.png', //已失效
-        failBth: '//yun.duiba.com.cn/aurora/assets/7bdd43b0b86094c3cf121abb204824985a13035b.png', //领取失败
+        gotBtn: '//yun.duiba.com.cn/aurora/assets/1120dd6b6ce4abe2666e877e3ae33eb99a778009.png', //已领取(优惠券)
+        getAgainBtn: '//yun.duiba.com.cn/aurora/assets/716f0a388144945b169554a30ff4a16f7bcb95ab.png', //重新领取
+        invalidBtn: '//yun.duiba.com.cn/spark/assets/914ba8643c8abb8d710a3126ec312aecf6c4daf0.png', //已失效
+        failBth: '//yun.duiba.com.cn/spark/assets/8267375232058a6d0140270b1594427fb08d6ae3.png', //领取失败
       },
       logisticsImage: {
         shipped: '//yun.duiba.com.cn/aurora/assets/3a7b68ec171ee339ce619d19f6ae3f9c1e6d801a.png', // 已发货物理弹窗
@@ -33,8 +33,8 @@ Page({
         copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
       },
       btnStyle: { // 按钮自定义样式
-        width: '154rpx',
-        height: '49rpx',
+        width: '150rpx',
+        height: '41rpx',
       }
     }
   },
@@ -79,15 +79,11 @@ Page({
         myPrizeList: []
       })
     }) || {};
-    data.list.forEach(i => {
-      // console.log('data list item', i);
-      i.image = i.image || '//yun.duiba.com.cn/aurora/assets/00b4b751939da230055889445f00f22990ff5f88.png';
-    });
-    if (success && data && data.list) {
+    if (success && data) {
       this.setData({
-        myPrizeList: data.list
+        myPrizeList: data
       })
-      this.getEndTime(data.list)
+      this.getEndTime(data)
     }
     if (type != 'noLoading') {
       my.hideLoading();
@@ -104,122 +100,76 @@ Page({
     // 领取积分
     if (item.type === PRIZE_TYPE_MAP.INTEGRATION) return this.handleGetIntergation(e)
   },
-
-  /**
-* 发奖
-*/
-  async cloudTBIssue(params) {
-    const { cloud } = app;
-    return new Promise((resolve, reject) => {
-      my.authorize({
-        scopes: "scope.latourBenefit",
-        success: async () => {
-          const result = await cloud.topApi
-            .invoke({
-              api: "alibaba.latour.strategy.issue",
-              data: {
-                channel: params.channel || "",
-                strategy_code: params.strategyCode || "",
-                selected_benefit_code: params.code || "",
-              },
-            })
-            .catch((err) => {
-              commonToast('领取失败~')
-              console.log("alibaba.latour.strategy.issue------catch", err);
-            });
-          console.log(result, "result");
-          resolve(result);
-        },
-        fail: (err) => {
-          console.log("scope.latourBenefit----fail", err);
-          commonToast('领取失败~')
-          reject(err);
-        },
-      });
-    })
-  },
-
   // 优惠券
   async handleGetEquity(e) {
     if (flag) {
       return
     }
     flag = true;
-
-    const { item: { strategyCode, code, channel } } = e.target.dataset;
-    this.cloudTBIssue({ strategyCode, code, channel })
-    // const { activityId } = app;
-    // console.log(item, '领取权益')
-    // const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }).catch(res => {
-    //   this.getMyPrize('noLoading')
-    //   commonToast(res && res.message)
-    // }) || {};
-    // if (success && data) {
-    //   commonToast('领取成功')
-    //   this.getMyPrize()
-    // }
-
-
-
-
-
+    const { activityId } = app;
+    const { item } = e.target.dataset;
+    console.log(item, '领取权益')
+    const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }).catch(res => {
+      this.getMyPrize('noLoading')
+      commonToast(res && res.message)
+    }) || {};
+    if (success && data) {
+      commonToast('领取成功')
+      this.getMyPrize()
+    }
     setTimeout(() => {
       flag = false
     }, 500)
   },
   // 领取实物前询问
   async handleGetEntity(e) {
-    const text = 'zzzxxx'
-    commonToast('请前去钉钉领取，钉钉号为：'+text+'。钉钉号已经复制成功。',3000);
-    setClipboard({ text:`${text}` })
-
-    // if (flag) {
-    //   return
-    // }
-    // // my.showLoading();
-    // flag = true;
-    // const { activityId } = app;
-    // const { item } = e.target.dataset;
-    // const userAddress = await getUserAddress({ joinTag: " " }).catch((data) => {
-    //   flag = false
-    //   console.log('getUserAddress出错了，错误信息是', data);
-    // })
-    // // my.hideLoading();
-    // if (!userAddress) return
-    // // commonToast(' getUserAddress =>'+JSON.stringify( userAddress))
-    // const { name, telNumber, provinceName, cityName, cityCode, countyName, detailInfo, streetName } = userAddress || {};
-    // const params = {
-    //   activityId,
-    //   area: countyName,
-    //   addressdetail: detailInfo,
-    //   name,
-    //   phone: telNumber,
-    //   detailInfo,
-    //   cityCode,
-    //   cityName,
-    //   city: cityName,
-    //   province: provinceName,
-    //   provinceName,
-    //   countyName,
-    //   streetName,
-    //   _id: item._id
-    // }
-
-    // my.confirm({
-    //   title: '提示',
-    //   content: '确认使用该收货地址：' + name + telNumber + userAddress.duibaAddress.address,
-    //   confirmButtonText: '确定',
-    //   cancelButtonText: '取消',
-    //   success: (result) => {
-    //     console.log(result)
-    //     const { confirm } = result;
+    if (flag) {
+      return
+    }
+    // my.showLoading();
+    flag = true;
+    const { activityId } = app;
+    const { item } = e.target.dataset;
+    const userAddress = await getUserAddress({ joinTag: " " }).catch((data)=>{
+      flag = false
+      console.log('getUserAddress出错了，错误信息是',data);
+    })
+    // my.hideLoading();
+    if (!userAddress) return
+    // commonToast(' getUserAddress =>'+JSON.stringify( userAddress))
+    const { name, telNumber, provinceName, cityName, cityCode, countyName, detailInfo, streetName } = userAddress || {};
+    const params = {
+      activityId,
+      area:countyName,
+      addressdetail:detailInfo,
+      name,
+      phone: telNumber,
+      detailInfo,
+      cityCode,
+      cityName,
+      city:cityName,
+      province:provinceName,
+      provinceName,
+      countyName,
+      streetName,
+      _id: item._id
+    }
 
-    //     if (confirm) {
-    //       this.receiveObjectPrize(params);
-    //     }
-    //   },
-    // });
-    // flag = false
+    my.confirm({
+      title: '提示',
+      content: '确认使用该收货地址：' + name + telNumber + userAddress.duibaAddress.address,
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      success: (result) => {
+        console.log(result)
+        const { confirm } = result;
+
+        if (confirm) {
+          this.receiveObjectPrize(params);
+        }
+      },
+    });
+    flag = false
   },
   // 领取实物
   async receiveObjectPrize(params) {
@@ -236,7 +186,7 @@ Page({
         commonToast(message)
       }
       this.getMyPrize()
-    }, (rej) => {
+    },(rej)=>{
       commonToast(rej.message)
     });
   },

taobao_jn/client/pages/pagepageindex/pagepageindex.acss

+.canvas {
+  width:100%;
+  height:100%;
+  z-index: 999;
+  pointer-events: none;
+}
+.page-game {
+  /* position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  min-height: 100vh; */
+  width:100%;
+  height:100vh;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  z-index: 999;
+  pointer-events: none;
+}
+
+
 .pageindex {
   width: 750rpx;
   height: 1624rpx;
   opacity: 1;
   position: absolute;
+  left: 50%;
+  top: 50%;
+  margin-left: -375rpx;
+  margin-top: -812rpx;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .pageindex .bg {
@@ -11,6 +38,7 @@
   opacity: 1;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
+  z-index: 0;
 }
 .pageindex .sai_duan {
   width: 568rpx;
@@ -61,7 +89,7 @@
   left: 264rpx;
   top: 1385rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .pageindex .rankbtn {
   width: 120rpx;
@@ -70,7 +98,7 @@
   left: 529rpx;
   top: 945rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .pageindex .unlockbtn2 {
   width: 94rpx;
@@ -90,6 +118,24 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+.pageindex .unlockbtn3 {
+  width: 94rpx;
+  height: 81rpx;
+  opacity: 1;
+  left: 517rpx;
+  top: 459rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
+.pageindex .lockbtn3 {
+  width: 36rpx;
+  height: 43rpx;
+  opacity: 1;
+  left: 546rpx;
+  top: 493rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
 .pageindex .wen_zi2 {
   width: 542rpx;
   height: 985rpx;
@@ -106,7 +152,7 @@
   left: -93rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
-  font-size: 18.15145rpx;
+  font-size: 36rpx;
   color: #000000;
   text-align: center;
 }
@@ -119,23 +165,23 @@
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .pageindex .wen_zi2 .lei_ji_sheng_chang .curtemp {
-  width: 155rpx;
+  width: 265rpx;
   height: 30rpx;
   opacity: 1;
   top: 3rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
-  font-size: 8.59851rpx;
+  font-size: 26rpx;
   color: #000000;
 }
 .pageindex .wen_zi2 .lei_ji_sheng_chang .currank {
-  width: 244rpx;
+  width: 350rpx;
   height: 33rpx;
   opacity: 1;
   left: 298rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
-  font-size: 8.59851rpx;
+  font-size: 26rpx;
   color: #000000;
 }
 .pageindex .rule {
@@ -153,5 +199,5 @@
   left: 678rpx;
   top: 238rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 100% 0rpx 0rpx;
 }

taobao_jn/client/pages/pagepageindex/pagepageindex.axml

 <view class="pageindex ">
-        <image class="bg " src={{resList['3fb6a231-82b5-4d37-8447-7438d998f49c'].url}} />
+        <image class="bg " src={{resList['3ee62d6c-3e44-470b-b2a5-fb805ec6a6c3'].url}} />
+
         <view class="sai_duan ">
           <image class="battle7 " src={{resList['bc577ab5-4214-43b4-93ff-e9e24c9cec62'].url}} />
           <image class="battle5 " src={{resList['64d76df1-a48b-4d97-9c94-07164242403f'].url}} />
           <image class="battle3 " src={{resList['1b34bd2c-8a88-4a4a-9e9f-9cccc1ef0a97'].url}} />
         </view>
         <image class="pkbtn " src={{resList['bf922d14-54e9-41d2-8c47-281963554715'].url}} />
-        <image class="assisdebtn " src={{resList['3ed92e80-21fa-4557-aaf1-92519d445f97'].url}} />
-        <image class="rankbtn " src={{resList['c57b33fc-8a26-4f7c-9a62-d0d16cae3406'].url}} />
+        <image class="assisdebtn btn" onTap="openModal" data-item="inviteList" src={{resList['3ed92e80-21fa-4557-aaf1-92519d445f97'].url}} />
+
         <image class="unlockbtn2 " src={{resList['b167ddb3-23b8-4290-ba90-196bbe63daba'].url}} />
         <image class="lockbtn2 " src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
+
+        <image class="unlockbtn3 " src={{resList['b167ddb3-23b8-4290-ba90-196bbe63daba'].url}} />
+        <image class="lockbtn3 " src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
+
         <view class="wen_zi2 ">
-          <span class="superise ">赢XXX元惊喜礼包</span>
+          <label class="superise ">赢XXX元惊喜礼包</label>
           <view class="lei_ji_sheng_chang ">
-            <span class="curtemp ">当前温暖值：0</span>
-            <span class="currank ">排名位于第 500+位</span>
+            <label class="curtemp ">当前温暖值：0</label>
+            <label class="currank ">排名位于第 500+位</label>
           </view>
         </view>
-        <image class="rule " src={{resList['8bc27234-3326-4564-9697-31beca682da8'].url}} />
-        <image class="myprize " src={{resList['49f550d3-50eb-492a-9fe3-79014e2c42a4'].url}} />
+        <image class="rankbtn btn" onTap="navigateTo" data-item="pagepagerank" src={{resList['c57b33fc-8a26-4f7c-9a62-d0d16cae3406'].url}} />
+        <image class="rule btn" onTap="openModal" data-item="rule" src={{resList['8bc27234-3326-4564-9697-31beca682da8'].url}} />
+        <image class="myprize btn" onTap="navigateTo" data-item="myprize" src={{resList['49f550d3-50eb-492a-9fe3-79014e2c42a4'].url}} />
+      </view>
+<view disable-scroll="true" class="page-game">
+<canvas disable-scroll="true" id="canvas" class="canvas" onReady="canvasOnReady">
+</canvas>
+</view>
+      <view class="popcontainer" a:if="{{modalStatus}}">
+      <rule-modal a:if="{{modalStatus==1}}" onCloseModal="closeModal"></rule-modal>
+      <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 API from '../../api';
+import resList from '../../resconfig/resList'; 
+import API from '../../api';
+import * as FYGE from "fyge-tbmini";
+import * as SvgaParser from "svga-parser";
+import {
+    modalType
+} from '../../tbcc-sdk/lib/constants';
+const app = getApp();
+const {
+    tbcc
+} = app;
+const {
+    commonToast,
+    getAuthUserInfo,
+    navigateToOutside,
+    getSystemInfo
+} = tbcc.tb;
+const snowSrc = "cloud://A261ECB81B02B03525F9150249E43073//snow.svga";
+const fireSrc = "cloud://7C78D5F72134804930A61B03665091AF//fire.svga"
+
 
 Page({
-  data: {},
+    data: {
+        modalStatus: 0
+    },
 
     onLoad(props) {
         this.setData({
             resList: resList
         });
+
+    },
+
+    onReady() {
+        // this.openModal("inviteList")
+        this.getAuth();
+    },
+    canvasOnReady() {
+        console.log("onCanvas Ready")
+        this.createMain();
+    },
+    /**添加canvas，用来显示svga */
+    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);
+            }
+          })
+        })
+        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
+        );
+        //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);
+            }
+        )
+  
+        }, this);
+  
+        //循环
+        loop();
+        function loop() {
+          FYGE.Tween.flush()
+          stage.flush();
+          FYGE.getRequestAnimationFrame()(loop);
+        }
+  
+    },
+    /**
+     * 获取用户授权信息
+     */
+    async getAuth() {
+        const userInfo = await getAuthUserInfo().catch(err => {
+            console.log('未授权成功', err);
+        });
+        if (userInfo) {
+            console.log('userInfo', userInfo);
+            const {
+                nickName,
+                avatar
+            } = userInfo;
+            app.nickName = nickName;
+            app.avatar = avatar;
+            this.login();
+        }
+    },
+    /**
+     * 登录接口
+     */
+    async login() {
+        const {
+            nickName,
+            avatar
+        } = app;
+        const {
+            success
+        } = await API.login({
+            userNick: nickName,
+            avatar
+        }).catch(res => {
+            commonToast(res && res.message);
+        }) || {};
+
+        if (success) {
+            // this.init();
+        }
+    },
+
+    /**打开弹窗 */
+    openModal(e) {
+        console.log(e);
+        const {
+            item
+        } = e.target.dataset;
+        this.setData({
+            modalStatus: modalType[item] || 0
+        });
+    },
+    /**关闭弹窗 */
+    closeModal(type) {
+        this.setData({
+            modalStatus: 0
+        })
+    },
+    /**点击跳转页面 */
+    navigateTo(e){
+        const {
+            item
+        } = e.target.dataset;
+        my.navigateTo({
+            url: `/pages/${item}/${item}`
+        });
     }
 
 });
\ No newline at end of file

taobao_jn/client/pages/pagepageindex/pagepageindex.json

 {
-  "usingComponents": {}
+  "usingComponents": {
+    "rule-modal": "/components/comrulemodal/comrulemodal",
+    "invitelist-modal": "/components/cominvitelistmodal/cominvitelistmodal"
+  }
 }
\ No newline at end of file

taobao_jn/client/pages/pagepagerank/pagepagerank.acss

@@ -3,6 +3,10 @@
   height: 1624rpx;
   opacity: 1;
   position: absolute;
+  left: 50%;
+  top: 50%;
+  margin-left: -375rpx;
+  margin-top: -812rpx;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .pagerank .rankbg {

taobao_jn/client/pages/pagepagerank/pagepagerank.axml

@@ -3,19 +3,19 @@
         <image class="rankreturnbtn " src={{resList['071da23d-ca97-4979-91d1-533fe386eef7'].url}} />
         <view class="ranktex ">
           <view class="myrank ">
-            <span class="rankid ">tb235***1214</span>
-            <span class="ranktemp ">3</span>
-            <span class="rank ">150</span>
+            <label class="rankid ">tb235***1214</label>
+            <label class="ranktemp ">3</label>
+            <label class="rank ">150</label>
           </view>
           <view class="bang_dan_xin_xi ">
-            <span class="tao_baoid ">淘宝id</span>
-            <span class="lei_ji_ji_bai_ren_shu ">累计击败人数</span>
-            <span class="pai_ming ">排名</span>
+            <label class="tao_baoid ">淘宝id</label>
+            <label class="lei_ji_ji_bai_ren_shu ">累计击败人数</label>
+            <label class="pai_ming ">排名</label>
           </view>
           <view class="ranktit2 ">
-            <span class="ranktit4 ">抱团取暖冲榜赢大奖</span>
-            <span class="ranktit3 ">赢取清空购物车终极大奖</span>
-            <span class="ranktim ">活动时间：2020.10.01-2020.11.11</span>
+            <label class="ranktit4 ">抱团取暖冲榜赢大奖</label>
+            <label class="ranktit3 ">赢取清空购物车终极大奖</label>
+            <label class="ranktim ">活动时间：2020.10.01-2020.11.11</label>
           </view>
         </view>
       </view>
\ No newline at end of file

taobao_jn/client/resconfig/resList.js

@@ -299,6 +299,23 @@ const resList = {
         uuid: 'd0c616aa-c606-40dd-b6f1-e9d370f3d053',
         url: '//yun.duiba.com.cn/spark/assets/150316d17c7992d327a6b65c3993103fa0e959b1.png',
     },
-  };
-  export default resList;
-  
+    'efcd4cc7-b279-466c-b0d1-c6d67fc39dda': {
+        name: 'unlockBattle5',
+        ext: '.png',
\ No newline at end of file
+        url: '//yun.duiba.com.cn/spark/assets/unlockBattle7.50b3d20ada96880e97e69ddacb56a375d2934123.png',
+        uuid: 'efcd4cc7-b279-466c-b0d1-c6d67fc39dda'
+    },
+    '837ea833-da23-46fd-ae6b-3d40489f5e19': {
+        name: 'unlockBattle7',
+        ext: '.png',
+        url: '//yun.duiba.com.cn/spark/assets/unlockBattle5.5e08400d36c66987588d956d8240db47eca46ce7.png',
+        uuid: '837ea833-da23-46fd-ae6b-3d40489f5e19'
+    },
+    '3ee62d6c-3e44-470b-b2a5-fb805ec6a6c3': {
+        name: 'mainBG',
+        ext: '.png',
+        url: '//yun.duiba.com.cn/spark/assets/mainBG.c7698e5dba4494258624138e18429842bb37e85f.png',
+        uuid: '3ee62d6c-3e44-470b-b2a5-fb805ec6a6c3'
+      }
+};
+export default resList;
\ No newline at end of file

taobao_jn/client/tbcc-sdk/lib/constants.js

@@ -28,3 +28,8 @@ export const PRIZE_TYPE_MAP = {
   ENTITY: 3, // 实物
   THANKS: 5 // 谢谢参与
 }
+//弹窗类型
+export const modalType = {
+    rule:1,
+    inviteList:2
+}