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

taobao_jn/client/components/compkprizemodal/compkprizemodal.acss

@@ -5,7 +5,7 @@
   left: 112rpx;
   top: 315rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .pksuccessmodal .pksuccessbg {
   width: 527rpx;

taobao_jn/client/components/comtask/comtask.js

@@ -181,9 +181,9 @@ Component({
         },
         onModalClose() {
             const {
-                onModalClose
+                onClose
             } = this.props;
-            onModalClose && onModalClose();
+            onClose && onClose();
             // console.log('com task onModalClose')
         }
     }

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.acss

@@ -5,7 +5,7 @@
   left: 112rpx;
   top: 350rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }
 .tempitemmodal .tempitembg {
   width: 527rpx;

taobao_jn/client/components/comtempitemmodal/comtempitemmodal.axml

-<view class="tempitemmodal ">
+<view class="tempitemmodal modal-animate-zoom-in">
   <image class="tempitembg " src={{resList['96de1c81-6629-4226-830b-2a64ec3b54b0'].url}} />
   <view class="tempitemtext ">
     <label class="tempitemtitle ">蕉内旗下热装备 持久保温</label>

taobao_jn/client/pages/pagegamemain/pagegamemain.axml

@@ -58,7 +58,7 @@
       <image class="gamemsharebtn" onTap="shareact" src={{resList['8c1a94d3-8181-41f4-9d47-1eb0c7719f3d'].url}} />
     </view>
     <view class="gamemtask">
-      <image class="gamemtask1" src={{resList['578cb214-b8d4-4d91-b57a-9477ec61933e'].url}} />
+      <image class="gamemtask1" onTap="openTask" src={{resList['578cb214-b8d4-4d91-b57a-9477ec61933e'].url}} />
       <image class="gamemtask2" src={{resList['d9ce0594-e262-4e9a-adfc-0b5b2a16d9c5'].url}} />
     </view>
     <scroll-view class="gameinfogro" scroll-y={{true}} scroll-animation-duration={{300}} scroll-with-animation={{true}} scroll-top={{(attionlist.length)*130}} disable-scroll={{false}} >
@@ -91,8 +91,9 @@
     </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>
+<view class="popcontainer" a:if="{{pkshow1_v}}"><pkprize-modal onClose="closetohome" gameOverData="{{pk1data}}"></pkprize-modal></view>
+<view class="popcontainer" a:if="{{pkshow2_v}}"><pknoprize-modal onClose="closetohome" gameOverData="{{pk2data}}"></pknoprize-modal></view>
+<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>
\ No newline at end of file
+<view class="popcontainer_down" a:if="{{taskshow_v}}"><task-modal  onClose="closeTask"></task-modal></view>
\ No newline at end of file

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -72,6 +72,7 @@ Page({
     pkshow3_v: false,
     pkshow4_v: false,
     toolshow_v: false,
+    taskshow_v: false,
     pk1data: {
       warms: 0,
       isWin: false,
@@ -605,4 +606,15 @@ Page({
       pkshow4_v: false
     })
   },
+  
+  openTask(){
+      this.setData({
+        taskshow_v:true
+      })
+  },
+  closeTask(){
+      this.setData({
+        taskshow_v:false
+      })
+  }
 });
\ No newline at end of file

taobao_jn/mocks/jn.doCollectGoodsTask.json

+{
+    "success": true
+}
\ No newline at end of file