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

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.js

@@ -11,8 +11,16 @@ Component({
   data: {
     resList: resList
   },
+  isUse:false,
   methods: {
     onClose(){
+      if(this.isUse) return;
+      this.isUse = false;
+      setTimeout(()=>{
+          if(this){
+              this.isUse = true;
+          }
+      })
       const {onClose} = this.props;
       onClose&&onClose();
     },

taobao_jn/client/components/comunlockstepmodal/comunlockstepmodal.js

@@ -30,7 +30,7 @@ Component({
   },
   didMount(){
     const {unLockStep,warms}= this.props.gameOverData;
-    let str = unLockStep==2?'恭喜您解锁5系赛段':'恭喜您解锁7系赛段';
+    let str = unLockStep==2?'恭喜您解锁5系赛段,获得30温暖值':'恭喜您解锁7系赛段,,获得50温暖值';
     let str1 = unLockStep==2?'进入三人场':'进入四人场';
     this.setData({
         unLockStep:unLockStep,

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -217,6 +217,10 @@ Page({
     if (this.data.isnew > 0 && this.data.isnew < 7) {
       return;
     }
+    my.showToast({
+        content: '请不要关闭APP，会导致本局游戏作废',
+        duration: 4500,
+      });
     // console.log("游戏开始逻辑==canwin", this.data.canwin);
     let attiontxt1 = "游戏开始啦，共有" + this.data.roomnums + "名玩家加入游戏，快来升温队伍拿奖励吧。";
     this.addAttionTxt(attiontxt1);
@@ -715,7 +719,7 @@ Page({
   async usetool1() {
     let tooltime = this.data.tooltime;
     if (tooltime <= 0) {//可使用
-      let addwarm = 10;
+      let addwarm = toolwarm;
       let tooldata = await API.sendWarmsByCurGame({
         type: "tool",
         warms: addwarm,

taobao_jn/client/pages/pagepageindex/pagepageindex.acss

@@ -61,17 +61,19 @@
 }
 .pageindex .sai_duan .battle7 {
   width: 202rpx;
-  height: 188rpx;
+  height: 162rpx;
   opacity: 1;
   left: 366rpx;
+  top: 26rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .pageindex .sai_duan .battle5 {
   width: 199rpx;
-  height: 188rpx;
+  height: 162rpx;
   opacity: 1;
   left: 185rpx;
+  top: 26rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
@@ -84,6 +86,30 @@
   transform-origin: 0rpx 0rpx 0rpx;
 }
 
+.pageindex .sai_duan .battle5Label {
+    width: 300rpx;
+      height: 40rpx;
+      opacity: 1;
+      left: 182rpx;
+      top: -14rpx;
+      position: absolute;
+      font-size: 22rpx;
+      color: rgba(212, 156, 0, 1);
+      transform-origin: 0rpx 0rpx 0rpx;
+}
+
+.pageindex .sai_duan .battle7Label {
+    width: 300rpx;
+      height: 40rpx;
+      opacity: 1;
+      left: 368rpx;
+      top: -14rpx;
+      position: absolute;
+      font-size: 22rpx;
+      color: rgba(212, 156, 0, 1);
+      transform-origin: 0rpx 0rpx 0rpx;
+}
+
 .pageindex .sai_duan .unbattle7 {
   width: 197rpx;
   height: 162rpx;

taobao_jn/client/pages/pagepageindex/pagepageindex.axml

@@ -6,8 +6,10 @@
         </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}} />
+          <label class="battle7Label " a:if="{{unLock7Times>0&&curGameStep<3}}">累计{{unLock7Times}}局胜场开启</label>
+          <label class="battle5Label " a:if="{{unLock5Times>0&&curGameStep<2}}">累计{{unLock5Times}}局胜场开启</label>
+          <image class="battle7 " a:if="{{curGameStep<3}}" src={{resList['edc11c83-81db-4bb6-9ebd-0a276ff36fa0'].url}} />
+          <image class="battle5 " a:if="{{curGameStep<2}}" src={{resList['204c7b21-29a1-4b39-92a7-fdb8605f922f'].url}} />
           <image class="battle3 " a:if="{{curGameStep==1}}" src={{resList['1b34bd2c-8a88-4a4a-9e9f-9cccc1ef0a97'].url}} />
           
           <image class="unbattle7 " a:if="{{curGameStep>=3}}" src={{resList['efcd4cc7-b279-466c-b0d1-c6d67fc39dda'].url}} />
@@ -21,7 +23,7 @@
         <image class="lockbtn2 " a:if="{{curGameStep<2}}" src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
 
         <!-- <image class="unlockbtn3 " a:if="{{curGameStep<3}}" src={{resList['b167ddb3-23b8-4290-ba90-196bbe63daba'].url}} /> -->
-        <image class="lockbtn3 " a:if="{{curGameStep<3}}" src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
+        <image class="lockbtn3 " a:if="{{curGameStep<3}}" src={{resList['62f291e9-e8c8-40f8-9d4d-a044 5f085fdc'].url}} />
 
         <view class="wen_zi2 ">
           <label class="superise ">赢2999元惊喜礼包</label>

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -64,7 +64,11 @@ Page({
         /**活动结束后排行榜奖励信息 */
         rankPrize: {},
         /**游戏信息 */
-        gameInfo: {}
+        gameInfo: {},
+        /**5系解锁需要场数 */
+        unLock5Times:0,
+        /**7系解锁需要场数 */
+        unLock7Times:0,
     },
 
     navigateToOutsideGoodsDetail(e) {
@@ -206,7 +210,7 @@ Page({
             //   });
             this.favoredStatus = await checkShopFavoredStatus(3035493001).catch(r=>{
                 console.log("关注不对劲")
-            })
+            })||false;
             // my.tb.checkShopFavoredStatus({
             //     id: 3035493001,
             //     success: (res) => {
@@ -310,7 +314,9 @@ Page({
                 gameInfo: data,
                 curWarms: data.warms + '',
                 curRank: str,
-                curGameStep: data.step
+                curGameStep: data.step,
+                unLock5Times:data.promotionNum1,
+                unLock7Times:data.promotionNum2
             })
 
             if (data.rankPrize && data.rankPrize.type == 5) {

taobao_jn/client/resconfig/resList.js

@@ -734,5 +734,17 @@ const resList = {
         url: '//yun.duiba.com.cn/spark/assets/indexprize4.4c3ceb7099263b118cc59e50d2e54e86d96358d4.jpg',
         uuid: '130d2ea1-d79f-4180-b02c-bc94df2583a3'
       },
+      '204c7b21-29a1-4b39-92a7-fdb8605f922f': {
+        name: 'lockBattle5',
+        ext: '.png',
+        url: '//yun.duiba.com.cn/spark/assets/lockBattle5.dec249a99705ef9512686b30fbd5d3f34a4ee3ab.png',
+        uuid: '204c7b21-29a1-4b39-92a7-fdb8605f922f'
+      },
+      'edc11c83-81db-4bb6-9ebd-0a276ff36fa0': {
+        name: 'lockBattle7',
+        ext: '.png',
+        url: '//yun.duiba.com.cn/spark/assets/lockBattle7.8f125a5cfd6e2258e7424df340c7b6eaf0a2bbf1.png',
+        uuid: 'edc11c83-81db-4bb6-9ebd-0a276ff36fa0'
+      },
 };
 export default resList;
\ No newline at end of file