Merge remote-tracking branch 'refs/remotes/origin/jiaoneiqunuan' into jiaoneiqunuan

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.axml

 <view class="tempitemmodal ">
   <image class="tempitembg " src={{resList['96de1c81-6629-4226-830b-2a64ec3b54b0'].url}} />
   <view class="tempitemtext ">
-          <span class="tempitemtitle ">蕉内旗下热装备 持久保温</span>
-          <span class="tempitemname ">产品六字名称</span>
-          <span class="tempitemprize ">双十一惊喜价：¥299</span>
-        </view>
-        <image class="tempitembtn " src={{resList['bb187403-c5fc-4c33-aea1-072bac77f32e'].url}} />
+    <label class="tempitemtitle ">蕉内旗下热装备 持久保温</label>
+    <label class="tempitemname ">产品六字名称</label>
+    <label class="tempitemprize ">双十一惊喜价：¥299</label>
   </view>
+  <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

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

taobao_jn/client/pages/pagegamemain/pagegamemain.acss

@@ -91,7 +91,7 @@
   opacity: 1;
   display: block;
   left: 400rpx;
-  top: 0rpx;
+  top: 25rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
@@ -103,7 +103,8 @@
   left: 0rpx;
   top: 0rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 0%;
+  transform: scale(0.8);
 }
 .gamemain .gamemcont .gamemrolesgro .gamemrole1 .gamemplayer1 {
   width: 179rpx;

taobao_jn/client/pages/pagegamemain/pagegamemain.axml

 <scroll-view class="gamemain" scroll-y={{true}} scroll-top={{86}} disable-scroll={{false}}>
-  <image class="gamembg" src={{resList['8bcca487-d698-4e01-93e1-8e78ae10107d'].url}} />
-  <view class="gamemcont">
+  <image class="gamembg" a:if="{{show_v!=1}}" src={{resList['8bcca487-d698-4e01-93e1-8e78ae10107d'].url}} />
+  <view class="gamemcont" a:if="{{show_v!=1}}">
     <view class="gamemdaojishi">
       <image class="gamemdjsbg" src={{resList['6a67309c-0c54-47e3-8955-9756ed4e8c21'].url}} />
       <label class="gamemdjslab">游戏倒计时 {{gametimeshow}}</label>
@@ -41,7 +41,7 @@
       </view>
     </view>
   </view>
-  <view class="gamembot">
+  <view class="gamembot" a:if="{{show_v!=1}}">
     <image class="gamembotimg" src={{resList['f3909518-193e-49eb-a1cd-357c4f83d796'].url}} />
     <view class="gamemtool{{tooltime>0?' blackWhiteFilter':''}}" onTap="usetool">
       <image class="gamemtoobg1" src={{resList['6f5cdb3c-0c5b-42a0-9472-982761684dc4'].url}} />
@@ -68,7 +68,7 @@
       </view>
     </scroll-view>
   </view>
-  <view class="gamemguide" a:if="{{isnew>0&&isnew<7}}" onTap="tonextguide">
+  <view class="gamemguide" a:if="{{show_v!=1&&isnew>0&&isnew<7}}" onTap="tonextguide">
     <view class="gamemguidecont" a:if="{{isnew==1||isnew==2||isnew==6}}">
       <image class="gamemguide1" a:if="{{isnew==1}}" src={{resList['7474511a-a5fb-461c-944b-179fd4326cbc'].url}} />
       <image class="gamemguide2" a:if="{{isnew==2}}" src={{resList['5ef54541-b2a1-43d5-8dc1-1ff20b783a52'].url}} />
@@ -91,3 +91,8 @@
     </view>
   </view>
 </scroll-view>
+<pkprize-modal a:if="{{pkshow1_v}}" onClose="closetohome" gameOverData="{{pk1data}}"></pkprize-modal>
+<pknoprize-modal a:if="{{pkshow2_v}}" onClose="closetohome" gameOverData="{{pk2data}}"></pknoprize-modal>
+<pkfailnoprize-modal a:if="{{pkshow3_v}}" onClose="closetohome" gameOverData="{{pk3data}}"></pkfailnoprize-modal>
+<pksuccessnoprize-modal a:if="{{pkshow4_v}}" onClose="closetohome" gameOverData="{{pk4data}}"></pksuccessnoprize-modal>
+<tempitem-modal a:if="{{toolshow_v}}" onClose="usetool1"></tempitem-modal>
\ No newline at end of file

taobao_jn/client/pages/pagegamemain/pagegamemain.json

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

taobao_jn/mocks/jn.getWarmDetailListByCurGame.json

@@ -2,26 +2,26 @@
     "code": 84479393.0040682,
     "success": true,
     "data": {
-        "total": 999,
+        "total": 0,
         "invite": {
-            "count": 3,
-            "warms": 10
+            "count": 0,
+            "warms": 0
         },
         "tool": {
-            "count": 3,
-            "warms": 10
+            "count": 0,
+            "warms": 0
         },
         "follow": {
-            "count": 3,
-            "warms": 10
+            "count": 0,
+            "warms": 0
         },
         "sign": {
-            "count": 3,
-            "warms": 10
+            "count": 0,
+            "warms": 0
         },
         "collect": {
-            "count": 3,
-            "warms": 10
+            "count": 0,
+            "warms": 0
         },
         "browseGoods": {}
     }