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

# Conflicts:
#	taobao_jn/client/pages/pagegamemain/pagegamemain.js

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/cominvitelistmodal/cominvitelistmodal.js

@@ -32,6 +32,7 @@ Component({
                 success,
                 data
             } = await API.getInviteList({
+                page:1,
                 pageSize: 100
             }).catch(r => {
                 my.hideLoading();

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/components/comtask/comtask.js

@@ -107,7 +107,7 @@ Component({
                 commonToast(str || '领取成功');
             }
             /**领取成功，增加温暖值 */
-            my.__updateWarms&&my.__updateWarms();
+            my.__updateWarms();
             await this.getTaskList()
             flag = 0;
         },

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.acss

@@ -64,7 +64,7 @@
   left: 53rpx;
   top: 617rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .tempitemmodal .tempitemImg {
     width: 262rpx;
@@ -73,5 +73,5 @@
     left: 132rpx;
     top: 206rpx;
     position: absolute;
-    transform-origin: 0rpx 0rpx 0rpx;
+    transform-origin: 50% 50% 0rpx;
 }

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.axml

@@ -6,6 +6,6 @@
     <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" />
+  <image class="tempitemImg btn" src={{resList['e41300b7-bee4-4224-9f12-7a8513ce8fe9'].url}} onTap="goGoodsDetail" />
+  <image class="tempitembtn btn" src={{resList['bb187403-c5fc-4c33-aea1-072bac77f32e'].url}} onTap="onClose" />
 </view>
\ No newline at end of file

taobao_jn/client/components/prizeModal/prizeModal.acss

@@ -70,8 +70,6 @@
 
 .my-prize-page .my-prize-item .my-prize-subtitle {
   display: flex;
-  justify-content: center;
-  align-items: center;
 }
 
 .my-prize-page .my-prize-item .my-prize-copy {
@@ -102,7 +100,7 @@
 
 .my-prize-page .my-prize-item .my-prize-tip {
   margin-top: 16rpx;
-  font-size: 20rpx;
+  font-size: 18rpx;
   line-height: 0rpx;
   letter-spacing: 0;
   color: #000000;
@@ -110,7 +108,7 @@
 
 .my-prize-page .my-prize-item .my-prize-code {
   font-family: PingFangSC-Regular;
-  font-size: 20rpx;
+  font-size: 18rpx;
   color: #222222;
   letter-spacing: 0;
   overflow: hidden;

taobao_jn/client/pages/myprize/myprize.js

@@ -143,7 +143,7 @@ Page({
     const params = {
       activityId,
       area:countyName,
-      addressdetail:detailInfo,
+      addressDetail:detailInfo,
       name,
       phone: telNumber,
       detailInfo,
@@ -154,7 +154,7 @@ Page({
       provinceName,
       countyName,
       streetName,
-      _id: item._id
+      id: item._id
     }
 
     my.confirm({

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -1060,7 +1060,9 @@ Page({
         (v) => {
           var mv = stage.addChild(new FYGE.MovieClip(v));
           mv.x = 383;
-          mv.y = 390;
+          // mv.y = 390;
+          mv.y = 465;
+          // console.log("svgmv", mv)
           paples[0] = mv;
           mv.gotoAndStop(1);
           mv.addEventListener(FYGE.Event.END_FRAME, () => {
@@ -1076,7 +1078,9 @@ Page({
         (v) => {
           var mv = stage.addChild(new FYGE.MovieClip(v));
           mv.x = 83;
-          mv.y = 420;
+          // mv.y = 420;
+          mv.y = 495;
+          // console.log("svgmv", mv);
           paples[1] = mv;
           mv.gotoAndStop(1);
           mv.addEventListener(FYGE.Event.END_FRAME, () => {
@@ -1094,7 +1098,9 @@ Page({
           (v) => {
             var mv = stage.addChild(new FYGE.MovieClip(v));
             mv.x = 232;
-            mv.y = 510;
+            // mv.y = 510;
+            mv.y = 585;
+            // console.log("svgmv", mv)
             paples[2] = mv;
             mv.gotoAndStop(1);
             mv.addEventListener(FYGE.Event.END_FRAME, () => {
@@ -1112,7 +1118,8 @@ Page({
           (v) => {
             var mv = stage.addChild(new FYGE.MovieClip(v));
             mv.x = 420;
-            mv.y = 560;
+            // mv.y = 560;
+            mv.y = 635;
             paples[3] = mv;
             mv.gotoAndStop(1);
             mv.addEventListener(FYGE.Event.END_FRAME, () => {

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/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;