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

taobao_jn/client/api.js

@@ -29,6 +29,11 @@ const apiList = {
         method: 'get',
         isShowLoading: false
     },
+    getVipInfo: {
+        handle: 'getVipInfo',
+        method: 'get',
+        isShowLoading: false
+    },
     doFollowTask: {
         handle: 'doFollowTask',
         method: 'get',

taobao_jn/client/components/cominvitefailmodal/cominvitefailmodal.acss

@@ -5,7 +5,7 @@
   left: 111rpx;
   top: 443rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .invitefailmodal .invitefailmodalbg {
   width: 527rpx;
@@ -52,7 +52,7 @@
   left: 83rpx;
   top: 360rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .invitefailmodal .invitefailmodalclose {
   width: 72rpx;
@@ -61,5 +61,5 @@
   left: 228rpx;
   top: 524rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }

taobao_jn/client/components/cominvitefailmodal/cominvitefailmodal.axml

-<view class="invitefailmodal ">
+<view class="invitefailmodal modal-animate-zoom-in">
         <image class="invitefailmodalbg " src={{resList['4a5648a9-d67b-483d-9631-23e18bb33d49'].url}} />
         <view class="invitefailmodaltext ">
-          <span class="invitefailmodallabel ">
-            很遗憾 您已是本店会员 无法完成新人助力哦 一起来抱团取暖赢取XXX大礼包吧
-          </span>
-          <span class="invitefailmodaltitle ">助力失败</span>
+          <label class="invitefailmodallabel ">
+            很遗憾 您已是本店会员 无法完成新人助力哦 一起来抱团取暖赢取2999元大礼包吧
+          </label>
+          <label class="invitefailmodaltitle ">助力失败</label>
         </view>
-        <image class="invitefailmodalbtn " src={{resList['40fc4243-5e70-4ee2-947c-67bdcebd2043'].url}} />
-        <image class="invitefailmodalclose " src={{resList['87d16c24-8927-4be5-830a-e0a5cb56d145'].url}} />
+        <image class="invitefailmodalbtn btn" onTap="onCloseModal" src={{resList['40fc4243-5e70-4ee2-947c-67bdcebd2043'].url}} />
+        <image class="invitefailmodalclose btn" onTap="onCloseModal" src={{resList['87d16c24-8927-4be5-830a-e0a5cb56d145'].url}} />
       </view>
\ No newline at end of file

taobao_jn/client/components/cominvitefailmodal/cominvitefailmodal.js

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

taobao_jn/client/components/cominvitemodal/cominvitemodal.acss

@@ -5,7 +5,7 @@
   left: 111rpx;
   top: 443rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .invitemodal .invitemodalbg {
   width: 527rpx;
@@ -30,7 +30,7 @@
   left: 83rpx;
   top: 306rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .invitemodal .invitemodalclose {
   width: 72rpx;
@@ -39,5 +39,5 @@
   left: 228rpx;
   top: 458rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }

taobao_jn/client/components/cominvitemodal/cominvitemodal.axml

-<view class="invitemodal ">
+<view class="invitemodal modal-animate-zoom-in">
         <image class="invitemodalbg " src={{resList['3c59fd89-56ba-4039-9305-c3ff9816789c'].url}} />
         <image class="invitemodaltext " src={{resList['76386658-f7a4-4eed-b2c2-90cfce4883d2'].url}} />
-        <image class="invitemodalbtn " src={{resList['c1d76db0-4d1b-4a0c-8b56-1dcfbf26e010'].url}} />
-        <image class="invitemodalclose " src={{resList['87d16c24-8927-4be5-830a-e0a5cb56d145'].url}} />
+        <image class="invitemodalbtn btn" onTap="doHelp" src={{resList['c1d76db0-4d1b-4a0c-8b56-1dcfbf26e010'].url}} />
+        <image class="invitemodalclose btn" onTap="onCloseModal" src={{resList['87d16c24-8927-4be5-830a-e0a5cb56d145'].url}} />
       </view>
\ No newline at end of file

taobao_jn/client/components/cominvitemodal/cominvitemodal.js

 'use strict';
 
 import resList from '../../resconfig/resList';
+import API from '../../api';
+const app = getApp();
+const {
+    tbcc
+} = app;
+const {
+    commonToast,
+    getAuthUserInfo,
+    navigateToOutside,
+    getSystemInfo
+} = tbcc.tb
 Component({
   props: {},
-  data: {},
-  methods: {},
-
-  onInit(props) {
-    this.setData({
-      resList: resList
-    });
-  }
+  data: {resList: resList},
+  methods: {
+    openInviteFailedModal(){
+        my._showIndexModal("invitefail");
+    },
+    openInviteSuccessModal(){
+        my._showIndexModal("invitesuccess");
+    },
+    onCloseModal(){
+        const {onCloseModal} = this.props;
+        onCloseModal&&onCloseModal();
+        this.openInviteFailedModal();
+    },
+    /**助力 */
+    async doHelp(){
+        const {success,data} = await API.doHelp({inviteId:app.inviteId,inviteStep:app.step});
+        console.log("hhahahha")
+        if(!success){
+            if(data&&!data.isVip){
+                commonToast("3s入会，即可为好友助力",1500,()=>{
+                    navigateToOutside(data.url);
+                })
+            }else{
+                this.openInviteFailedModal();
+            }
+        }else{
+            this.openInviteSuccessModal();
+        }
+    }
+  },
+
+
 
 });
\ No newline at end of file

taobao_jn/client/components/cominvitesuccessmodal/cominvitesuccessmodal.acss

@@ -5,7 +5,7 @@
   left: 111rpx;
   top: 443rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .invitesuccessmodal .invitesuccessmodalbg {
   width: 527rpx;
@@ -51,7 +51,7 @@
   left: 83rpx;
   top: 306rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .invitesuccessmodal .invitesuccessmodalclose {
   width: 72rpx;
@@ -60,5 +60,5 @@
   left: 228rpx;
   top: 458rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }

taobao_jn/client/components/cominvitesuccessmodal/cominvitesuccessmodal.axml

-<view class="invitesuccessmodal ">
+<view class="invitesuccessmodal modal-animate-zoom-in">
         <image class="invitesuccessmodalbg " src={{resList['3c59fd89-56ba-4039-9305-c3ff9816789c'].url}} />
         <view class="invitesuccessmodaltext ">
-          <span class="invitesuccessmodallabel ">您已成功助力您的好友 一起来报团取暖赢取XXX大礼包吧</span>
-          <span class="invitesuccessmodaltitle ">助力成功</span>
+          <label class="invitesuccessmodallabel ">您已成功助力您的好友 一起来报团取暖赢取2999元大礼包吧</label>
+          <label class="invitesuccessmodaltitle ">助力成功</label>
         </view>
-        <image class="invitesuccessmodalbtn " src={{resList['40fc4243-5e70-4ee2-947c-67bdcebd2043'].url}} />
-        <image class="invitesuccessmodalclose " src={{resList['87d16c24-8927-4be5-830a-e0a5cb56d145'].url}} />
+        <image class="invitesuccessmodalbtn btn" onTap="onCloseModal" src={{resList['40fc4243-5e70-4ee2-947c-67bdcebd2043'].url}} />
+        <image class="invitesuccessmodalclose btn" onTap="onCloseModal" src={{resList['87d16c24-8927-4be5-830a-e0a5cb56d145'].url}} />
       </view>
\ No newline at end of file

taobao_jn/client/components/cominvitesuccessmodal/cominvitesuccessmodal.js

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

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.acss

@@ -66,3 +66,12 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+.tempitemmodal .tempitemImg {
+    width: 262rpx;
+    height: 262rpx;
+    opacity: 1;
+    left: 132rpx;
+    top: 206rpx;
+    position: absolute;
+    transform-origin: 0rpx 0rpx 0rpx;
+}

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.axml

@@ -2,8 +2,10 @@
   <image class="tempitembg " src={{resList['96de1c81-6629-4226-830b-2a64ec3b54b0'].url}} />
   <view class="tempitemtext ">
     <label class="tempitemtitle ">蕉内旗下热装备 持久保温</label>
-    <label class="tempitemname ">产品六字名称</label>
+    <label class="tempitemname ">人气商品</label>
     <label class="tempitemprize ">双十一惊喜价：¥299</label>
+    
   </view>
+  <image class="tempitemImg " src={{resList['e41300b7-bee4-4224-9f12-7a8513ce8fe9'].url}} onTap="goGoodsDetail" />
   <image class="tempitembtn " src={{resList['bb187403-c5fc-4c33-aea1-072bac77f32e'].url}} onTap="onClose" />
 </view>
\ No newline at end of file

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.js

 'use strict';
 
 import resList from '../../resconfig/resList';
+const app = getApp();
+const { tbcc } = app;
+const {
+  navigateToOutside,
+} = tbcc.tb;
 Component({
   props: {},
   data: {
@@ -10,7 +15,10 @@ Component({
     onClose(){
       const {onClose} = this.props;
       onClose&&onClose();
+    },
+    goGoodsDetail(){
+        navigateToOutside("https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687dPr2HpU&id=627121010061")
     }
   },
-
+//   'e41300b7-bee4-4224-9f12-7a8513ce8fe9'
 });
\ No newline at end of file

taobao_jn/client/components/comunlockstepmodal/comunlockstepmodal.js

@@ -18,7 +18,9 @@ Component({
   },
   methods: {
     redirectToIndex(){
-        my.redirectTo({url:'/pages/pagepageindex/pagepageindex'})
+        const {onCloseModal} = this.props;
+        onCloseModal&&onCloseModal();
+        // my.redirectTo({url:'/pages/pagepageindex/pagepageindex'})
     },
     navigateToGoodsDetail(){
         const unLockStep = this.props.unLockStep;

taobao_jn/client/components/goodsModal/goodsModal.acss

@@ -42,9 +42,10 @@
 }
 .goods-modal-container__content-item {
     width: 340rpx;
-    height: 510rpx;
-    background: #fff;
+    height: 500rpx;
+    background: #000000;
     margin-bottom: 20rpx;
+    border-radius:30rpx;
 }
 .goods-modal-container__content-item:nth-child(even) {
     margin-left: 20rpx;
@@ -52,7 +53,9 @@
 .goods-modal-container__content-item__img {
     width: 340rpx;
     height: 340rpx;
-    background: #E1E1E1;
+    background: #f2c548;
+    border-top-left-radius: 30rpx;
+    border-top-right-radius: 30rpx;
 }
 .goods-modal-container__content-item__img image {
     width: 100%;
@@ -65,7 +68,7 @@
     font-size:24rpx;
     font-family:PingFang SC;
     font-weight:400;
-    color:rgba(24,24,24,1);
+    color:#66ccff;
     line-height:30rpx;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -82,7 +85,7 @@
     font-size:32rpx;
     font-family:PingFang SC;
     font-weight:600;
-    color:rgba(255,42,0,1);
+    color:#fad604;
 }
 .goods-modal-container__content-item__price-num text {
     font-size: 24rpx;

taobao_jn/client/components/logisticsModal/logisticsModal.acss

@@ -44,24 +44,26 @@
   top: -70rpx;
   height: 48rpx;
   width: 48rpx;
-  background: url("//yun.duiba.com.cn/taobaomini/aupresViva/tc_close.png") no-repeat;
+  background: url("//yun.duiba.com.cn/spark/assets/e5d745b7b64877323cbe22be1c9e0f7ef00f145c.png") no-repeat;
   background-size: 100% 100%;
 }
 
 .logistics-modal-container__content-item {
+  left:-10rpx;
+  top:-50rpx;
   border-radius: 10rpx;
   display: flex;
 }
 
 .logistics-modal-container__content-left {
-  width: 144rpx;
-  height: 144rpx;
+  width: 100rpx;
+  height: 100rpx;
   background: rgba(244, 244, 244, 1);
 }
 
 .logistics-modal-container__content-left image {
-  width: 100%;
-  height: 100%;
+  width: 100rpx;
+  height: 100rpx;
 }
 
 .logistics-modal-container__content-right {
@@ -71,7 +73,7 @@
   flex-direction: column;
   justify-content: space-between;
   font-size: 20rpx;
-  color: #959595;
+  color: #000000;
   flex: 1;
   overflow: hidden;
   white-space: nowrap;

taobao_jn/client/components/logisticsModal/logisticsModal.axml

@@ -9,10 +9,10 @@
       </view>
       <view class="logistics-modal-container__content-right">
         <view class="logistics-modal-container__content-name">{{prizeItem.name}}</view>
-        <!-- <view class="logistics-modal-container__content-copy">
+        <view class="logistics-modal-container__content-copy">
           <view class="logistics-modal-container__content-copy__code">奖品编码：{{prizeItem._id}}</view>
           <view class="logistics-modal-container__content-copy__img" onTap="copyPrizeId" style="{{`background: url(${task.copyIcon}) no-repeat;background-size: 100% 100%;`}}"></view> 
-        </view> -->
+        </view>
         <view class="logistics-modal-container__content-desc">{{prizeItem.shipStatus== 3?'发货状态：已发货':'发货状态：待发货'}}</view>
         <view class="logistics-modal-container__content-desc" a:if="{{prizeItem.shipStatus == 2}}">温馨提示：奖品将在活动结束7天内陆续发出</view>
         <view class="logistics-modal-container__content-copy" a:else>

taobao_jn/client/components/prizeModal/prizeModal.acss

@@ -43,20 +43,20 @@
   margin: 0 auto 24rpx;
   position: relative;
   box-sizing: border-box;
-  width: 700rpx;
-  height: 161rpx;
-  background-color: #ffffff;
-  border-color:rgb(255, 63, 38);
-  border-width: 1rpx;
+  width: 680rpx;
+  height: 140rpx;
+  /*background-color: #ffffff;*/
+  border-color:#000000;
+  border-width: 3rpx;
   border-style: solid;
   /* box-shadow: 2rpx 3rpx 18rpx 0 rgb(255, 63, 38); */
-  border-radius: 10rpx;
+  border-radius: 14rpx;
   box-sizing: border-box;
 }
 
 .my-prize-page .my-prize-item .my-prize-avatar {
-  width: 120rpx;
-  height: 120rpx;
+  width: 100rpx;
+  height: 100rpx;
 }
 
 .my-prize-page .my-prize-item .my-prize-content {
@@ -92,8 +92,8 @@
 
 .my-prize-page .my-prize-item .my-prize-name {
   width: 100%;
-  font-size: 28rpx;
-  color: #2d2d2d;
+  font-size: 26rpx;
+  color: #000000;
   letter-spacing: -1rpx;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -103,16 +103,15 @@
 .my-prize-page .my-prize-item .my-prize-tip {
   margin-top: 16rpx;
   font-size: 20rpx;
-  line-height: 20rpx;
+  line-height: 0rpx;
   letter-spacing: 0;
-  color: #8a8a8a;
+  color: #000000;
 }
 
 .my-prize-page .my-prize-item .my-prize-code {
-  width: 290rpx;
   font-family: PingFangSC-Regular;
   font-size: 20rpx;
-  color: #8a8a8a;
+  color: #222222;
   letter-spacing: 0;
   overflow: hidden;
   text-overflow: ellipsis;

taobao_jn/client/components/prizeModal/prizeModal.axml

@@ -6,11 +6,11 @@
         <image class="my-prize-avatar" src="{{item.image}}"/>
         <view class="my-prize-content">
           <label class="my-prize-name">{{item.name}}</label>
-          <!-- <view class="my-prize-subtitle"> -->
-            <!-- <label class="my-prize-code">奖品编码：{{item._id}}</label> -->
+          <view class="my-prize-subtitle">
+            <label class="my-prize-code">奖品编码：{{item._id}}</label>
             <!-- 复制按钮 -->
             <!-- <image class="my-prize-copy" data-text="{{item._id}}" onTap="handleCopyId" src="{{task.image.copyIcon}}" /> -->
-          <!-- </view> -->
+          </view>
           <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FAILURE}}">{{item.remark}}</view>
           <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.REPEAT || (item.drawStatus === PRIZE_DRAW_STATUS_MAP.RECEIVE)}}">请于{{endTime}}前领取</view>
           <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FINISHED }}">奖品已过期失效</view>

taobao_jn/client/pages/goodsPage/goodsPage.js

@@ -50,6 +50,7 @@ Page({
             isBackFlag: Math.floor((Math.random() * 100)) == this.data.isBackFlag ? 101 : Math.floor((Math.random() * 100))
         })
         if(taskType == 'collectGoods'){
+            console.log("2222")
             this.isCanCompleteCollectTask();
         }
     },
@@ -64,14 +65,14 @@ Page({
                 taskType: taskType,
                 type: '01',
                 image: {
-                    bg: '//yun.dui88.com/taobaomini/clientCTest/goods_bg@2x.png',
+                    bg: '//yun.duiba.com.cn/spark/assets/goodPageBg.b32cc284a7d3bee7c10d33a777a1f9e5c5a2e9a9.png',
                     banner: '//yun.dui88.com/taobaomini/clientCTest/goods_banner@2x.png',
-                    title: '//yun.dui88.com/taobaomini/clientCTest/goods_title@2x.png',
+                    title: '//yun.duiba.com.cn/spark/assets/goodsPageTitle.4b9d4207ce8435fb9817207e455e700ae2cefe1d.png',
                     collect: '//yun.dui88.com/taobaomini/clientCTest/goods_collection@2x.png',
                     no_collect: '//yun.dui88.com/taobaomini/clientCTest/collection_no_collect@2x.png',
-                    img: '//yun.dui88.com/taobaomini/clientCTest/goods_img@2x.png',
+                    img: '//yun.duiba.com.cn/spark/assets/goodsImg.91d94de018d2c72a3ead9845a7c49030572d94c1.png',
                 },
-                color: '#181818'
+                color: '#fff'
             }
         })
         this.initPage()
@@ -139,6 +140,7 @@ Page({
             })
         }
         if(taskType == 'collectGoods'){
+            console.log("1111")
             this.isCanCompleteCollectTask();
         }
     },
@@ -153,7 +155,7 @@ Page({
         console.log(this.data.goodsList)
         const list = this.data.goodsList;
         let num = 0;
-        for (let i = 0; i < list; i++) {
+        for (let i = 0; i < list.length; i++) {
             if(list[i].collected){
                 num++;
                 if(num>=3){
@@ -179,7 +181,7 @@ Page({
                     res && commonToast(res)
                 }) || {}
                 if (success) {
-                    this.initPage()
+                    commonToast('任务完成，请到任务中心查看奖励')
                 }
                 break;
             case 'browseGoods':

taobao_jn/client/pages/myprize/myprize.js

@@ -18,23 +18,23 @@ Page({
       image: {
         bg: '//yun.duiba.com.cn/spark/assets/myprizeBg.1f636c459b0a7e272f3cc65c80c7bc2a88bc2833.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/1120dd6b6ce4abe2666e877e3ae33eb99a778009.png', //已领取(优惠券)
-        getAgainBtn: '//yun.duiba.com.cn/aurora/assets/716f0a388144945b169554a30ff4a16f7bcb95ab.png', //重新领取
+        addressBth: '//yun.duiba.com.cn/spark/assets/writeAddress.5d2f4dd2f643a6b6e37cb2a9725fc552cd56901d.png', //填写地址(实物奖品)
+        getBth: '//yun.duiba.com.cn/spark/assets/getImmite.46d6f54d3cd89200ae6514956404073220d430a9.png', //立即领取(除实物奖品外)
+        logisticsBth: '//yun.duiba.com.cn/spark/assets/查看物流.693fea0c226928d503e5d9b03adc83bd148e5506.png', //查看物流
+        useBtn: '//yun.duiba.com.cn/spark/assets/useIt.b8fdb31733471c7d5e346fe1b4be1d6cad6cb5f8.png', //去使用(除实物奖品外)
+        gotBtn: '//yun.duiba.com.cn/spark/assets/isGot.249e45c6dd688a8345384dee6a7d656db5303076.png', //已领取(优惠券)
+        getAgainBtn: '//yun.duiba.com.cn/spark/assets/regetBtn.46e12117eb7915dcf531aac0b684a634feaee516.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', // 已发货物理弹窗
-        notShipped: '//yun.duiba.com.cn/aurora/assets/ee0300d7b472c555ecf0b7b8d582fcf9189c2d19.png', // 待发货物流弹窗
+        shipped: '//yun.duiba.com.cn/spark/assets/logisticsBg.9c4bbf261aac92d0462a48f6e1f5562d4564e855.png', // 已发货物理弹窗
+        notShipped: '//yun.duiba.com.cn/spark/assets/logisticsBg.9c4bbf261aac92d0462a48f6e1f5562d4564e855.png', // 待发货物流弹窗
         copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
       },
       btnStyle: { // 按钮自定义样式
-        width: '150rpx',
-        height: '41rpx',
+        width: '158rpx',
+        height: '53rpx',
       }
     }
   },
@@ -92,6 +92,7 @@ Page({
 
   //领取奖品
   async handleClick(e) {
+      console.log("领取奖品",e)
     const { item } = e.target.dataset;
     // 领取权益
     if (item.type === PRIZE_TYPE_MAP.EQUITY) return this.handleGetEquity(e)
@@ -109,7 +110,7 @@ Page({
     const { activityId } = app;
     const { item } = e.target.dataset;
     console.log(item, '领取权益')
-    const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }).catch(res => {
+    const { success, data, message } = await API.receiveEnamePrize({ _id: item._id }).catch(res => {
       this.getMyPrize('noLoading')
       commonToast(res && res.message)
     }) || {};
@@ -128,6 +129,7 @@ Page({
     }
     // my.showLoading();
     flag = true;
+    console.log('领取实物')
     const { activityId } = app;
     const { item } = e.target.dataset;
     const userAddress = await getUserAddress({ joinTag: " " }).catch((data)=>{
@@ -196,6 +198,7 @@ Page({
       return
     }
     flag = true;
+    console.log(item, '领取积分')
     // 判断是否为会员
     await this.getUserInfo()
     const { isVip, vipLink } = app;

taobao_jn/client/pages/pagegamemain/pagegamemain.axml

@@ -96,4 +96,5 @@
 <view class="popcontainer" a:if="{{pkshow3_v}}"><pkfailnoprize-modal onClose="closetohome" gameOverData="{{pk3data}}"></pkfailnoprize-modal></view>
 <view class="popcontainer" a:if="{{pkshow4_v}}"><pksuccessnoprize-modal  onClose="closetohome" gameOverData="{{pk4data}}"></pksuccessnoprize-modal></view>
 <view class="popcontainer" a:if="{{toolshow_v}}"><tempitem-modal  onClose="usetool1"></tempitem-modal></view>
-<view class="popcontainer_down" a:if="{{taskshow_v}}"><task-modal  onClose="closeTask"></task-modal></view>
+<view class="popcontainer_down" a:if="{{taskshow_v}}"><task-modal  onClose="closeTask"></task-modal></view>
\ No newline at end of file
+<view class="popcontainer" a:if="{{lockstepshow_v}}"><lockstep-modal  onCloseModal="closetohome"></lockstep-modal></view>
\ No newline at end of file

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -616,5 +616,16 @@ Page({
       this.setData({
         taskshow_v:false
       })
-  }
+  },
+
+  openLockStep(){
+      this.setData({
+        lockstepshow_v:true
+      })
+  },
+  closeLockStep(){
+      this.setData({
+        lockstepshow_v:false
+      })
+  },
 });
\ No newline at end of file

taobao_jn/client/pages/pagegamemain/pagegamemain.json

@@ -5,6 +5,7 @@
     "pkfailnoprize-modal": "/components/compkfailnoprizemodal/compkfailnoprizemodal",
     "pksuccessnoprize-modal": "/components/compksuccessnoprizemodal/compksuccessnoprizemodal",
     "tempitem-modal": "/components/comtempitemmodal/comtempitemmodal",
-    "task-modal": "/components/comtask/comtask"
+    "task-modal": "/components/comtask/comtask",
+    "lockstep-modal": "/components/comunlockstepmodal/comunlockstepmodal"
   }
 }
\ No newline at end of file

taobao_jn/client/pages/pagepageindex/pagepageindex.acss

@@ -107,7 +107,7 @@
   left: 91rpx;
   top: 1229rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .pageindex .assisdebtn {
   width: 221rpx;

taobao_jn/client/pages/pagepageindex/pagepageindex.axml

@@ -10,7 +10,7 @@
           <image class="unbattle5 " a:if="{{curGameStep>=2}}" src={{resList['837ea833-da23-46fd-ae6b-3d40489f5e19'].url}} />
           <image class="unbattle3 " a:if="{{curGameStep>=1}}" src={{resList['1b34bd2c-8a88-4a4a-9e9f-9cccc1ef0a97'].url}} />
         </view>
-        <image class="pkbtn " src={{resList['bf922d14-54e9-41d2-8c47-281963554715'].url}} />
+        <image class="pkbtn btn" onTap="openGamePage" src={{resList['bf922d14-54e9-41d2-8c47-281963554715'].url}} />
         <image class="assisdebtn btn" onTap="openModal" data-item="inviteList" src={{resList['3ed92e80-21fa-4557-aaf1-92519d445f97'].url}} />
 
         <!-- <image class="unlockbtn2 " a:if="{{curGameStep<2}}" src={{resList['b167ddb3-23b8-4290-ba90-196bbe63daba'].url}} /> -->
@@ -20,7 +20,7 @@
         <image class="lockbtn3 " a:if="{{curGameStep<3}}" src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
 
         <view class="wen_zi2 ">
-          <label class="superise ">赢4999元惊喜礼包</label>
+          <label class="superise ">赢2999元惊喜礼包</label>
           <view class="lei_ji_sheng_chang ">
             <label class="curtemp ">当前温暖值：{{curWarms}}</label>
             <label class="currank ">排名位于第 {{curRank}}位</label>
@@ -34,17 +34,27 @@
 <view disable-scroll="true" class="page-game">
 <canvas disable-scroll="true" id="canvas" class="canvas" onReady="canvasOnReady">
 </canvas>
+</view>
 
-      </view>
-      <view class="popcontainer" a:if="{{modalStatus}}">
+      <view class="popcontainer" a:if="{{modalStatus==1}}">
       <rule-modal a:if="{{modalStatus==1}}" onCloseModal="closeModal"></rule-modal>
       </view>
 
       <view class="popcontainer_down" a:if="{{modalStatus==2}}">
       <invitelist-modal a:if="{{modalStatus==2}}" onCloseModal="closeModal"></invitelist-modal>
       </view>
-      
-      <view class="popcontainer" >
-      <lockstep-modal  onCloseModal="closeModal"></lockstep-modal>
+
+      <view class="popcontainer" a:if="{{modalStatus==3}}">
+      <invite-modal a:if="{{modalStatus==3}}" onCloseModal="closeModal"></invite-modal>
+      </view>
+
+      <view class="popcontainer" a:if="{{modalStatus==4}}">
+      <invitesuccess-modal a:if="{{modalStatus==4}}" onCloseModal="closeModal"></invitesuccess-modal>
+      </view>
+
+      <view class="popcontainer" a:if="{{modalStatus==5}}">
+      <invitefail-modal a:if="{{modalStatus==5}}" onCloseModal="closeModal"></invitefail-modal>
       </view>
       
+      
+      

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -19,7 +19,13 @@ const {
 } = tbcc.tb;
 const snowSrc = "cloud://A261ECB81B02B03525F9150249E43073//snow.svga";
 const fireSrc = "cloud://7C78D5F72134804930A61B03665091AF//fire.svga"
-
+const checkSystem = async () => {
+    const {
+        version
+    } = await getSystemInfo();
+    console.log('version', version);
+    return tbcc.utils.versionCompare(version, '9.8.0');
+}
 
 Page({
     data: {
@@ -35,7 +41,13 @@ Page({
         rankPrize: {}
     },
 
-    onLoad(props) {
+    onLoad(query) {
+        if (query) {
+            app.inviteId = query.openId;
+            app.step = query.inviteStep;
+        }
+
+        console.log('onload=>query', query);
         this.setData({
             resList: resList
         });
@@ -44,7 +56,23 @@ Page({
 
     onReady() {
         // this.openModal("inviteList")
-        this.getAuth();
+        my._showIndexModal = (type) => {
+            this.setData({
+                modalStatus: modalType[type] || 0
+            });
+        }
+        my._hideIndexModal = () => {
+            this.setData({
+                modalStatus: 0
+            })
+        }
+
+        checkSystem().then(r => {
+            if (r) {
+                this.getAuth();
+            }
+        })
+        // this.getAuth();
     },
     canvasOnReady() {
         console.log("onCanvas Ready")
@@ -150,7 +178,8 @@ Page({
             avatar
         } = app;
         const {
-            success
+            success,
+            data
         } = await API.login({
             userNick: nickName,
             avatar
@@ -161,6 +190,7 @@ Page({
 
         if (success) {
             my.hideLoading();
+            app.openId = data.openId;
             this.getActivityBaseInfoById();
         }
     },
@@ -185,8 +215,13 @@ Page({
     },
     /**判断是否是助力 */
     judgeDoHelp() {
+        if (app.inviteId) {
+            this.setData({
+                modalStatus: modalType['invite']
+            })
+        }
         this.updateGameInfo();
-        
+
     },
     /**更新游戏信息 */
     async updateGameInfo() {
@@ -207,6 +242,30 @@ Page({
             my.hideLoading();
         }
 
+    },
+    /**进入游戏页面 */
+    async openGamePage() {
+        my.showLoading();
+        const {
+            success,
+            data,
+            message
+        } = await API.doJoin({
+            step: this.data.curGameStep
+        });
+        if (success) {
+            my.redirectTo({url:'/pages/pagegamemain/pagegamemain'})
+            my.hideLoading();
+        } else {
+            if (data && !data.isVip) {
+                commonToast("3s入会，即可为好友助力", 1500, () => {
+                    navigateToOutside(data.url);
+                })
+            }
+            my.hideLoading();
+        }
+        console.log("点击进入游戏页面")
+
     },
     /**打开弹窗 */
     openModal(e) {

taobao_jn/client/pages/pagepageindex/pagepageindex.json

@@ -2,10 +2,9 @@
   "usingComponents": {
     "rule-modal": "/components/comrulemodal/comrulemodal",
     "invitelist-modal": "/components/cominvitelistmodal/cominvitelistmodal",
-    "lockstep-modal": "/components/comunlockstepmodal/comunlockstepmodal"
-
-    
-    
-    
+    "invite-modal": "/components/cominvitemodal/cominvitemodal",
+    "invitesuccess-modal": "/components/cominvitesuccessmodal/cominvitesuccessmodal",
+    "invitefail-modal": "/components/cominvitefailmodal/cominvitefailmodal"  
   }
-}
+}
\ No newline at end of file
+

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

@@ -31,5 +31,8 @@ export const PRIZE_TYPE_MAP = {
 //弹窗类型
 export const modalType = {
     rule:1,
-    inviteList:2
+    inviteList:2,
+    invite:3,
+    invitesuccess:4,
+    invitefail:5
 }

taobao_jn/mocks/jn.doHelp.json

+{
+    "code": -15559199.54038009,
+    "success": true,
+    "data": {
+        "joinGameEndTime": 45401690.52271202,
+        "joinGameStartTime": -54711633.18867665
+    }
+}
\ No newline at end of file

taobao_jn/mocks/jn.getMyPrizeList.json

+{
+    "code": "000000",
+    "data": {
+        "list": [
+            {
+                "_id": "5f71d38a67f1375241ab6b2b",
+                "activityId": "5f7183e852bbded304b27d71",
+                "amount": 20000,
+                "amount_unit": "分",
+                "asac": "1A202010JWPLV3428VWIEP",
+                "can_win": true,
+                "code": "a66621ec7c434842bfe4d01082128f1d",
+                "createDay": "2020/09/28",
+                "createTime": 1601295242020,
+                "display_amount": "200",
+                "display_amount_unit": "元",
+                "display_start_fee": "2000",
+                "drawStatus": 1,
+                "effective_end": "2020-10-11 00:00:00",
+                "effective_start": "2020-08-24 00:00:00",
+                "effective_time_mode": "ABSOLUTE",
+                "ename": "",
+                "end_date": "2020-09-25 23:59:59",
+                "expiredTime": 1601628302000,
+                "feature": {
+                    "bcType": "B",
+                    "couponTag": "1002",
+                    "itemIds": "611952670190",
+                    "sellerId": "2838892713",
+                    "shopId": "150920153",
+                    "shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg",
+                    "shopName": "华为官方旗舰店",
+                    "shopSiteCategory": "3",
+                    "shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
+                    "spreadId": "4327893208",
+                    "templateCode": "15398721100",
+                    "title": "MatePro",
+                    "uuid": "1094cefe51a348698e6647f5e6ba4181"
+                },
+                "has_inventory": true,
+                "id": "5f71d38a67f1375241ab6b2b",
+                "image": "",
+                "material": {
+                    "SHORT_NAME": "华为MatePad Pro",
+                    "brandLogo": "T1bOKxFoFcXXb1upjX.jpg",
+                    "itemIDTianHe": "611952670190",
+                    "itemMainPicture": "O1CN01HHEnRU1KZ6mud3VjW_!!6000000001177-2-yinhe.png",
+                    "mamaCouponValue": "学生专享200元",
+                    "mamaShopItemurl": "https://detail.tmall.com/item.htm?spm=a1z10.1-b-s.w20163031-21766675787.18.10577597DWdOA0&id=611952670190&scene=taobao_shop&sku_properties=5919063:6536025"
+                },
+                "name": "fuckyou",
+                "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
+                "prizeDataType": 2,
+                "prizeId": "5f6c3e7d114fbbc8c98bffae",
+                "remark": "",
+                "send_life_cycle_state": "running",
+                "show_rules": {
+                    "show_rule_dto": [
+                        {
+                            "passed": true,
+                            "type": "WIN_LIMIT"
+                        }
+                    ]
+                },
+                "start_date": "2020-08-27 16:21:56",
+                "start_fee": 200000,
+                "strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
+                "test": false,
+                "title": "MatePro",
+                "type": 1,
+                "type_desc": "商品优惠券",
+                "updateTime": 1601295242020,
+                "userNick": "tb80525668"
+            },
+            {
+                "_id": "5f71d38852bbded304b3f8a3",
+                "activityId": "5f7183e852bbded304b27d71",
+                "createDay": "2020/09/28",
+                "createTime": 1601295240072,
+                "drawStatus": 3,
+                "ename": "",
+                "expiredTime": 1601628302000,
+                "id": "5f71d38852bbded304b3f8a3",
+                "image": "https://img.alicdn.com/imgextra/i2/2208492139886/O1CN01XlNdWj2Mtq8E9OEw1_!!2208492139886-2-miniprogram.png",
+                "name": "兑换奖励235",
+                "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
+                "prizeDataType": 2,
+                "prizeId": "5f6b09b39897b412b595a32b",
+                "remark": "",
+                "type": 3,
+                "updateTime": 1601295240072,
+                "userNick": "tb80525668"
+            },
+            {
+                "_id": "5f71d38567f1375241ab6b20",
+                "activityId": "5f7183e852bbded304b27d71",
+                "amount": 10000,
+                "amount_unit": "分",
+                "asac": "1A202010JWPLV3428VWIEP",
+                "can_win": true,
+                "code": "f8564ef50a86418b9226ce1d9bb6ace6",
+                "createDay": "2020/09/28",
+                "createTime": 1601295237953,
+                "display_amount": "100",
+                "display_amount_unit": "元",
+                "display_start_fee": "200",
+                "drawStatus": 1,
+                "effective_end": "2020-09-30 00:00:00",
+                "effective_start": "2020-08-28 00:00:00",
+                "effective_time_mode": "ABSOLUTE",
+                "ename": "",
+                "end_date": "2020-09-26 23:59:59",
+                "expiredTime": 1601628302000,
+                "feature": {
+                    "bcType": "B",
+                    "couponTag": "1002",
+                    "itemIds": "611439436633",
+                    "sellerId": "2838892713",
+                    "shopId": "150920153",
+                    "shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg",
+                    "shopName": "华为官方旗舰店",
+                    "shopSiteCategory": "3",
+                    "shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
+                    "spreadId": "4328244590",
+                    "templateCode": "15417747656",
+                    "title": "freebuds 3",
+                    "uuid": "ea9a79c0459640f8aeb94c24530e4141"
+                },
+                "has_inventory": true,
+                "id": "5f71d38567f1375241ab6b20",
+                "image": "",
+                "material": {
+                    "brandLogo": "T1bOKxFoFcXXb1upjX.jpg"
+                },
+                "name": "fuckyou3",
+                "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
+                "prizeDataType": 2,
+                "prizeId": "5f6c3e7d114fbbc8c98bffae",
+                "remark": "",
+                "send_life_cycle_state": "running",
+                "show_rules": {
+                    "show_rule_dto": [
+                        {
+                            "passed": true,
+                            "type": "WIN_LIMIT"
+                        }
+                    ]
+                },
+                "start_date": "2020-08-28 11:04:24",
+                "start_fee": 20000,
+                "strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
+                "test": false,
+                "title": "freebuds 3",
+                "type": 1,
+                "type_desc": "商品优惠券",
+                "updateTime": 1601295237953,
+                "userNick": "tb80525668"
+            },
+            {
+                "_id": "5f71d3849897b412b5a4fa47",
+                "activityId": "5f7183e852bbded304b27d71",
+                "asac": "1A202010JWPLV3428VWIEP",
+                "can_win": true,
+                "code": "7254115b0fcc4c77bdbb35ed658c1db2",
+                "createDay": "2020/09/28",
+                "createTime": 1601295236035,
+                "drawStatus": 1,
+                "effective_interval": 31,
+                "effective_time_mode": "RELATIVE",
+                "ename": "",
+                "end_date": "2020-12-23 23:59:59",
+                "expiredTime": 1601628302000,
+                "feature": {
+                    "couponTag": "49534003",
+                    "description": "酒店信用住立减券",
+                    "sellerId": "4064563648",
+                    "spreadId": "3465672059",
+                    "subActId": "34922",
+                    "templateCode": "3545184060",
+                    "title": "酒店信用住优惠券",
+                    "uuid": "6ff76ab7cf3c4002be6f64902e659322"
+                },
+                "has_inventory": true,
+                "id": "5f71d3849897b412b5a4fa47",
+                "image": "",
+                "interval_time_unit": "DAYS",
+                "material": {
+                    "benefitBigPic": "https://gw.alicdn.com/tfs/TB1aF67RFP7gK0jSZFjXXc5aXXa-895-703.png",
+                    "benefitSmallPic": "https://gw.alicdn.com/tfs/TB1aF67RFP7gK0jSZFjXXc5aXXa-895-703.png",
+                    "benefitUrl": "https://h5.m.taobao.com/trip/hotel/search/index.html?ttid=12zfb000000416"
+                },
+                "name": "fuckyou2",
+                "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
+                "prizeDataType": 2,
+                "prizeId": "5f6c3e7d114fbbc8c98bffae",
+                "remark": "",
+                "send_life_cycle_state": "running",
+                "show_rules": {
+                    "show_rule_dto": [
+                        {
+                            "passed": true,
+                            "type": "WIN_LIMIT"
+                        }
+                    ]
+                },
+                "start_date": "2020-07-15 15:45:12",
+                "strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
+                "test": false,
+                "title": "酒店最高减50元券",
+                "type": 1,
+                "type_desc": "飞猪资格券",
+                "updateTime": 1601295236035,
+                "userNick": "tb80525668"
+            }
+        ]
+    },
+    "message": "成功",
+    "success": true
+}
\ No newline at end of file