增加七系特殊胜利

taobao_jn/client/app.json

@@ -9,6 +9,7 @@
   ],
   "window": {
     "enableSkia": "true",
-    "allowsBounceVertical": "NO"
+    "allowsBounceVertical": "NO",
+    "navigationBarForceEnable": "true"
   }
 }
\ No newline at end of file

taobao_jn/client/components/compkprizemodal/compkprizemodal.acss

@@ -46,11 +46,24 @@
   color: #000000;
   text-align: center;
 }
+.pksuccessmodal .pksuccessmodaltext .pksuccesssevenPrize {
+    width: 527rpx;
+  height: 24rpx;
+  opacity: 1;
+  top: 142rpx;
+  left: -66rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+  font-size: 24rpx;
+  color: #000000;
+  text-align: center;
+}
+
 .pksuccessmodal .pksuccessmodaltext .pksuccesstemp {
   width: 390rpx;
   height: 24rpx;
   opacity: 1;
-  top: 162rpx;
+  top: 172rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
   font-size: 24rpx;
@@ -62,7 +75,7 @@
   height: 23rpx;
   opacity: 1;
   left: 0rpx;
-  top: 196rpx;
+  top: 206rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
   font-size: 24rpx;

taobao_jn/client/components/compkprizemodal/compkprizemodal.axml

@@ -3,6 +3,7 @@
         <view class="pksuccessmodaltext ">
           <label class="pksuccesstitle2 ">游戏已结束</label>
           <label class="pksuccesstitle1 ">{{isWinTitle}}</label>
+          <label class="pksuccesssevenPrize " a:if="{{unLockStep>3}}">恭喜您！7系赛段累计获胜7场，获得70点温暖值</label>
           <label class="pksuccesstemp " a:if="{{isWin}}">{{warmText}}</label>
           <label class="pksuccesslw " a:if="{{isWin}}">蕉内送您一份小礼物</label>
           <label class="pksuccessitemname ">{{prizeName}}</label>

taobao_jn/client/components/compkprizemodal/compkprizemodal.js

@@ -24,9 +24,10 @@ Component({
   data: {
     resList: resList,
     isWinTitle:'',
-    isWin:false,
+    isWin:true,
     prizeName:'',
     prizeImg:'',
+    unLockStep:0,
     warmText:''
   },
   methods: {
@@ -44,7 +45,7 @@ Component({
   },
 
   didMount(){
-    const {warms,isWin,prize} = this.props.gameOverData;
+    const {warms,isWin,prize,unLockStep} = this.props.gameOverData;
     let str = '';
     let str1 = '';
     if(isWin){
@@ -58,7 +59,8 @@ Component({
         isWin:isWin,
         prizeName:prize.name,
         prizeImg:prize.image,
-        warmText:str1
+        warmText:str1,
+        unLockStep:unLockStep
     })
   }
 

taobao_jn/client/components/compksuccessnoprizemodal/compksuccessnoprizemodal.acss

@@ -32,3 +32,14 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+.pksuccessnoprizemodal .sevenPrize {
+    width: 527rpx;
+    height: 40rpx;
+    opacity: 1;
+    top: 184rpx;
+    position: absolute;
+    font-size: 22rpx;
+    color: rgba(0, 0, 0, 1);
+    transform-origin: 0rpx 0rpx 0rpx;
+    text-align: center;
+}
\ No newline at end of file

taobao_jn/client/components/compksuccessnoprizemodal/compksuccessnoprizemodal.axml

 <view class="pksuccessnoprizemodal modal-animate-zoom-in">
         <image class="pksuccessnoprizebg " src={{resList['9db83ecb-f8c3-4392-9d92-7c5ce5572b8b'].url}} />
+        <label class="sevenPrize " a:if="{{unLockStep>3}}">恭喜您！7系赛段累计获胜7场，获得70点温暖值</label>
         <image class="pksuccessnoprizebtn " onTap="redirectToIndex" src={{resList['ede003f5-0f75-4175-8113-d8492f58fbd0'].url}} />
         <image class="pksuccessnoprizeclose " onTap="redirectToIndex" src={{resList['01587dc4-48e2-4a53-ba37-14a5c2026791'].url}} />
       </view>
\ No newline at end of file

taobao_jn/client/components/compksuccessnoprizemodal/compksuccessnoprizemodal.js

@@ -5,7 +5,10 @@ Component({
   props: {
     gameOverData:{}
   },
-  data: {resList: resList},
+  data: {
+    resList: resList,
+    unLockStep:0
+    },
   methods: {
     redirectToIndex(){
         const {isWin,unLockStep} = this.props.gameOverData;
@@ -21,4 +24,11 @@ Component({
     }
   },
 
+  didMount(){
+    const {unLockStep} = this.props.gameOverData;
+    this.setData({
+        unLockStep:unLockStep
+    })
+  }
+
 });
\ No newline at end of file

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -881,7 +881,7 @@ Page({
           console.log("svga" + v);
           var mv = stage.addChild(new FYGE.MovieClip(v));
           mv.x = 383;
-          mv.y = 390;
+          mv.y = 465;
           console.log("svgmv", mv)
           paples[0] = mv;
           mv.gotoAndStop(1);
@@ -899,7 +899,7 @@ Page({
           console.log("svga" + v);
           var mv = stage.addChild(new FYGE.MovieClip(v));
           mv.x = 83;
-          mv.y = 420;
+          mv.y = 495;
           console.log("svgmv", mv);
           paples[1] = mv;
           mv.gotoAndStop(1);
@@ -919,7 +919,7 @@ Page({
             console.log("svga" + v);
             var mv = stage.addChild(new FYGE.MovieClip(v));
             mv.x = 232;
-            mv.y = 510;
+            mv.y = 585;
             console.log("svgmv", mv)
             paples[2] = mv;
             mv.gotoAndStop(1);
@@ -939,7 +939,7 @@ Page({
             console.log("svga" + v);
             var mv = stage.addChild(new FYGE.MovieClip(v));
             mv.x = 420;
-            mv.y = 560;
+            mv.y = 635;
             console.log("svgmv", mv)
             paples[3] = mv;
             mv.gotoAndStop(1);

taobao_jn/client/pages/pagepageindex/pagepageindex.acss

 .canvas {
-  width:100%;
-  height:100%;
-  z-index: 99;
+  width:750rpx;
+  height:1200rpx;
+  /*z-index: 99;*/
   pointer-events: none;
 }
 .page-game {
@@ -11,11 +11,13 @@
   bottom: 0;
   right: 0;
   min-height: 100vh; */
-  width:100%;
-  height:100vh;
+  width:750rpx;
+  height:1200rpx;
+  position: absolute;
+  top:0rpx;
+  left:0rpx;
   flex: 1;
   display: flex;
-  flex-direction: column;
   pointer-events: none;
 }
 
@@ -250,6 +252,7 @@
   white-space: nowrap;
   transform-origin: 0rpx 0rpx 0rpx;
   overflow-x: scroll;
+  overflow-y: hidden;
 }
 .pageindex .indexPrizelist .indexPrizeitem {
   position: relative;

taobao_jn/client/pages/pagepageindex/pagepageindex.axml

 <view class="pageindex ">
         <image class="bg " src={{resList['3ee62d6c-3e44-470b-b2a5-fb805ec6a6c3'].url}} />
         <image class="jbLogo " src={{resList['23b7797e-e924-48b1-8afa-7412722a0bc9'].url}} />
+        <view disable-scroll="true" class="page-game">
+        <canvas disable-scroll="true" id="canvas" class="canvas" onReady="canvasOnReady">
+        </canvas>
+        </view>
         <view class="sai_duan ">
           <image class="battle7 " a:if="{{curGameStep<3}}" src={{resList['bc577ab5-4214-43b4-93ff-e9e24c9cec62'].url}} />
           <image class="battle5 " a:if="{{curGameStep<2}}" src={{resList['64d76df1-a48b-4d97-9c94-07164242403f'].url}} />
@@ -40,10 +44,7 @@
     </view>
 </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==1}}">
       <rule-modal a:if="{{modalStatus==1}}" onCloseModal="closeModal"></rule-modal>

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -5,7 +5,8 @@ import API from '../../api';
 import * as FYGE from "fyge-tbmini";
 import * as SvgaParser from "svga-parser";
 import {
-    modalType,SHARE_CONFIG
+    modalType,
+    SHARE_CONFIG
 } from '../../tbcc-sdk/lib/constants';
 const app = getApp();
 const {
@@ -29,25 +30,26 @@ const checkSystem = async () => {
 }
 
 Page({
-    gameConfigList:{},
-    favoredStatus:false,
+    gameConfigList: {},
+    favoredStatus: false,
+    goVip: false,
     data: {
         indexPrize: [{
-            id:1,
-            name:'301+热皮',
-            url:"https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4d7c687df8mh9y&id=624231380919"
+            id: 1,
+            name: '301+热皮',
+            url: "https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4d7c687df8mh9y&id=624231380919"
         }, {
-            id:2,
-            name:'502++热皮',
-            url:"https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687do2J7Y4&id=625018335779"
+            id: 2,
+            name: '502++热皮',
+            url: "https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687do2J7Y4&id=625018335779"
         }, {
-            id:3,
-            name:'500E内裤',
-            url:"https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687do2J7Y4&id=560474460284"
+            id: 3,
+            name: '500E内裤',
+            url: "https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687do2J7Y4&id=560474460284"
         }, {
-            id:4,
-            name:'311S袜子',
-            url:"https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687do2J7Y4&id=600583964263"
+            id: 4,
+            name: '311S袜子',
+            url: "https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687do2J7Y4&id=600583964263"
         }],
         /**弹窗状态 */
         modalStatus: 0,
@@ -60,11 +62,13 @@ Page({
         /**活动结束后排行榜奖励信息 */
         rankPrize: {},
         /**游戏信息 */
-        gameInfo:{}
+        gameInfo: {}
     },
 
-    navigateToOutsideGoodsDetail(e){
-        const {item} = e.target.dataset;
+    navigateToOutsideGoodsDetail(e) {
+        const {
+            item
+        } = e.target.dataset;
         navigateToOutside(item.url);
     },
 
@@ -141,12 +145,12 @@ Page({
                     console.log("svga" + v);
                     var mv = stage.addChild(new FYGE.MovieClip(v));
                     mv.x = 275;
-                    mv.y = 835;
+                    mv.y = 850;
                     console.log("svgmv", mv)
 
                 },
                 (err) => {
-                    console.log("aa",err);
+                    console.log("aa", err);
                 }
             )
             SvgaParser.loadSvga(
@@ -155,12 +159,12 @@ Page({
                     console.log("svga" + v);
                     var mv = stage.addChild(new FYGE.MovieClip(v));
                     mv.x = 175;
-                    mv.y = 645;
+                    mv.y = 660;
                     console.log("svgmv", mv)
 
                 },
                 (err) => {
-                    console.log("bb",err);
+                    console.log("bb", err);
                 }
             )
 
@@ -198,19 +202,19 @@ Page({
             //     console.log('查询关注店铺状态失败', err);
             //   });
             my.tb.checkShopFavoredStatus({
-            id: 3035493001,
-            success: (res) => {
-                if(res.isFavor){
-                    this.favoredStatus = true
-                }else{
-                    this.favoredStatus = false;
+                id: 3035493001,
+                success: (res) => {
+                    if (res.isFavor) {
+                        this.favoredStatus = true
+                    } else {
+                        this.favoredStatus = false;
+                    }
+
                 }
-                
-            }
-        })
-            
+            })
+
             // this.judgeDoHelp();
-            console.log("关注店铺",this.favoredStatus)
+            console.log("关注店铺", this.favoredStatus)
             this.login();
         }
     },
@@ -229,9 +233,9 @@ Page({
         } = await API.login({
             userNick: nickName,
             avatar,
-            isFollow:this.favoredStatus,
-            inviteId:app.inviteId,
-            inviteStep:app.step
+            isFollow: this.favoredStatus,
+            inviteId: app.inviteId,
+            inviteStep: app.step
         }).catch(res => {
             // my.hideLoading();
             commonToast(res && res.message);
@@ -285,7 +289,7 @@ Page({
             commonToast(r && r.message);
         }) || {};
         if (success) {
-            let str = data.rank>500?'500+':data.rank
+            let str = data.rank > 500 ? '500+' : data.rank
             this.setData({
                 gameInfo: data,
                 curWarms: data.warms + '',
@@ -293,10 +297,14 @@ Page({
                 curGameStep: data.step
             })
 
-            if(data.rankPrize&&data.rankPrize.type==5){
-                this.setData({modalStatus: modalType['ranknoprize']})
-            }else if(data.rankPrize&&data.rankPrize.type!=5&&data.rankPrize.image&&data.rankPrize.image.length>0){
-                this.setData({modalStatus: modalType['rankprize']})
+            if (data.rankPrize && data.rankPrize.type == 5) {
+                this.setData({
+                    modalStatus: modalType['ranknoprize']
+                })
+            } else if (data.rankPrize && data.rankPrize.type != 5 && data.rankPrize.image && data.rankPrize.image.length > 0) {
+                this.setData({
+                    modalStatus: modalType['rankprize']
+                })
             }
 
             my.hideLoading();
@@ -312,23 +320,27 @@ Page({
             message
         } = await API.doJoin({
             step: this.data.curGameStep
-        });
-        if (success) {
-            const winRate = this.gameConfigList[this.data.curGameStep-1].winRate*0.01;
-            const propsCD = this.gameConfigList[this.data.curGameStep-1].propsCD;
-            my.redirectTo({url:'/pages/pagegamemain/pagegamemain?'+
-            "step="+this.data.curGameStep+"&start="+data.joinGameStartTime+
-            "&end="+data.joinGameEndTime+"&gl="+winRate+"&toolcd="+propsCD})
-            my.hideLoading();
-        } else {
-            if (data && !data.isVip) {
+        }).catch(r => {
+            if (r&&r.data && !r.data.isVip) {
                 commonToast("3s入会，即可为好友助力", 1500, () => {
-                    navigateToOutside(data.url);
+                    navigateToOutside(r.data.url);
                 })
-            }else{
-                commonToast(message||'')
+            } else {
+                commonToast(r&&r.message)
             }
             my.hideLoading();
+        }) || {};
+        if (success) {
+            const winRate = this.gameConfigList[this.data.curGameStep - 1].winRate * 0.01;
+            const propsCD = this.gameConfigList[this.data.curGameStep - 1].propsCD;
+            my.redirectTo({
+                url: '/pages/pagegamemain/pagegamemain?' +
+                    "step=" + this.data.curGameStep + "&start=" + data.joinGameStartTime +
+                    "&end=" + data.joinGameEndTime + "&gl=" + winRate + "&toolcd=" + propsCD
+            })
+            my.hideLoading();
+        } else {
+
         }
         console.log("点击进入游戏页面")
 
@@ -366,7 +378,7 @@ Page({
         } = SHARE_CONFIG;
         console.log('app.openId', app.openId);
         if (app.openId) {
-            path = '/pages/pagepageindex/pagepageindex' + '?openId=' + app.openId+'&inviteStep='+app.step;
+            path = '/pages/pagepageindex/pagepageindex' + '?openId=' + app.openId + '&inviteStep=' + app.step;
         }
         console.log('path', path)
 
@@ -375,32 +387,42 @@ Page({
             path
         }
     },
-    onShow(){
-        if(app.isGoVip){
+    onShow() {
+        if (app.isGoVip) {
             this.doHelp();
         }
+        if (this.goVip) {
+            this.openGamePage();
+        }
     },
-    openInviteFailedModal(){
+    openInviteFailedModal() {
         my._showIndexModal("invitefail");
     },
-    openInviteSuccessModal(){
+    openInviteSuccessModal() {
         my._showIndexModal("invitesuccess");
     },
     /**助力 */
-    async doHelp(){
-        const {success,data,message} = await API.doHelp({inviteId:app.inviteId,inviteStep:app.step});
+    async doHelp() {
+        const {
+            success,
+            data,
+            message
+        } = await API.doHelp({
+            inviteId: app.inviteId,
+            inviteStep: app.step
+        });
         console.log("hhahahha")
-        if(!success){
-            if(data&&!data.isVip){
-                commonToast("3s入会，即可为好友助力",1500,()=>{
+        if (!success) {
+            if (data && !data.isVip) {
+                commonToast("3s入会，即可为好友助力", 1500, () => {
                     navigateToOutside(data.url);
                 })
-            }else if(data&&data.isVip){
+            } else if (data && data.isVip) {
                 this.openInviteFailedModal();
-            }else{
+            } else {
                 commonToast(message);
             }
-        }else{
+        } else {
             this.openInviteSuccessModal();
         }
     }

taobao_jn/client/pages/pagepagerank/pagepagerank.acss

@@ -55,21 +55,22 @@
   color: #000000;
 }
 .pagerank .ranktex .myrank .ranktemp {
-  width: 13rpx;
+  width: 150rpx;
   height: 19rpx;
   opacity: 0.61960784;
-  left: 426rpx;
+  left: 343rpx;
   top: -10rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
   font-size: 28rpx;
   color: #000000;
+  text-align: center;
 }
 .pagerank .ranktex .myrank .rank {
   width: 38rpx;
   height: 19rpx;
   opacity: 0.61960784;
-  left: 5rpx;
+  left: 22rpx;
   top: -11rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
@@ -121,7 +122,7 @@
     left: 4rpx;
     top: 268rpx;
     position: absolute;
-    transform-origin: 0px 0px 0px;
+    transform-origin: 0rpx 0rpx 0rpx;
     overflow: scroll
 }
 .pagerank .ranktex .rankList .rankItem {
@@ -131,7 +132,7 @@
     top: 20rpx;
     margin: 0 auto 24rpx;
     position: relative;
-    transform-origin: 0px 0px 0px;
+    transform-origin: 0rpx 0rpx 0rpx;
 }
 .pagerank .ranktex .rankList .rankItem .itemrank{
         width: 98rpx;
@@ -143,7 +144,7 @@
         position: absolute;
         font-size: 26rpx;
         color: rgba(0, 0, 0, 1);
-        transform-origin: 0px 0px 0px;
+        transform-origin: 0rpx 0rpx 0rpx;
         text-align: center;
 }
 .pagerank .ranktex .rankList .rankItem .itemrankid{
@@ -156,7 +157,7 @@
         position: absolute;
         font-size: 26rpx;
         color: rgba(0, 0, 0, 1);
-        transform-origin: 0px 0px 0px;
+        transform-origin: 0rpx 0rpx 0prx;
         text-align: left;
 }
 .pagerank .ranktex .rankList .rankItem .itemranktemp{
@@ -169,7 +170,7 @@
         position: absolute;
         font-size: 26rpx;
         color: rgba(0, 0, 0, 1);
-        transform-origin: 0px 0px 0px;
+        transform-origin: 0rpx 0rpx 0rpx;
         text-align: center;
 }
 
@@ -227,6 +228,7 @@
   white-space: nowrap;
   transform-origin: 0rpx 0rpx 0rpx;
   overflow-x: scroll;
+  overflow-y: hidden;
 }
 .pagerank .rankprizelist .rankprizeitem {
   position: relative;