--

taobao_mini/client/components/commycardpanel/commycardpanel.axml

@@ -6,8 +6,8 @@
               <view class="mycarditembody ">
                 <image class="mcbgdisable " src={{resList['baba4718-16a8-4a77-a052-53af708bbb21'].url}} />
                 <image class="mcbg " src={{resList['8b2f6c1d-1fbd-4c64-b9a9-43549adbb472'].url}} />
-                <image class="mcgivingbtndisable " src={{resList['776b0825-6538-4ea4-8814-50149644f3bc'].url}} />
-                <image class="mcgivingbtn " src={{resList['9d853465-431f-407e-963c-97a0e2ce74da'].url}} />
+                <image class="mcgivingbtndisable " a:if={{giftCardStatus==2}} src={{resList['776b0825-6538-4ea4-8814-50149644f3bc'].url}} />
+                <image class="mcgivingbtn " a:if={{giftCardStatus==2}} src={{resList['9d853465-431f-407e-963c-97a0e2ce74da'].url}} />
                 <image class="mccardimg " src={{item.image}} />
                 <view class="mccardcount ">
                   <image class="wo_de_qia_pai_shu_liang_bei_jing_huang9 " src={{resList['f75d533c-113b-4717-8411-ea37d224a9c0'].url}} />

taobao_mini/client/components/commycardpanel/commycardpanel.js

@@ -11,9 +11,16 @@ Component({
     }
   },
   didMount(props) {
+    console.log("this.props.CollectCardInfo",this.props.CollectCardInfo)
+    let {
+      giftCardStatus,
+      taskOpenStatus
+    } = this.props.CollectCardInfo.data;
+    console.log("giftCardStatus",giftCardStatus)
     this.setData({
       resList: resList,
-      MyCardsInfo:DataCenter.MyCardsInfo
+      MyCardsInfo:DataCenter.MyCardsInfo,
+      giftCardStatus
     });
   }
 

taobao_mini/client/components/comnonumberpanel/comnonumberpanel.axml

 <view class="nonumberpanel ">
   <image class="dim109 " src={{resList['32da4042-3a54-409d-90ef-cb8320f41622'].url}} />
-  <image class="nonumbertaskbtn " src={{resList['fd0c8bee-3d1d-4042-a326-84483c175dad'].url}} />
+  <image class="nonumbertaskbtn "  onTap="onTapOpenTaskPanel"  data-value="nonumberpanel" src={{resList['fd0c8bee-3d1d-4042-a326-84483c175dad'].url}} />
   <text class="nin_de_fan_pai_ci_shu_yi_yong_wan ">您的翻牌次数已用完</text>
   <image class="nonumberclosebtn " onTap="hiddenPanelEvent" data-value="nonumberpanel" src={{resList['878b3751-e6b3-4ae6-9811-77e938801873'].url}} />
 </view>
\ No newline at end of file

taobao_mini/client/components/comnonumberpanel/comnonumberpanel.js

@@ -7,6 +7,10 @@ Component({
   methods: {
     hiddenPanelEvent(e){
       this.props.onTapHiddenPanelEvent(e);
+    },
+    onTapOpenTaskPanel(e){
+      this.props.onTapHiddenPanelEvent(e);
+      this.props.onOpenTaskPanel();
     }
   },
   didMount(props) {

taobao_mini/client/myComponents/giftbox/giftbox.acss

+.imgC{
+    position: absolute;
+    top: 0;
+    left: -3rpx
+}
+
+#image_2{
+    animation: _image_2An 1.7s infinite !important;
+    animation-timing-function: linear;
+}
+
+@keyframes _image_2An {
+    0% {
+        transform:translate(19rpx,5rpx) rotate(0deg) scale(1,1);
+    }
+
+    10% {
+        transform:translate(19rpx,5rpx) rotate(0deg) scale(0.95,0.95);
+    }
+
+    22% {
+        transform:translate(19rpx,5rpx) rotate(0deg) scale(1.05,1.05);
+    }
+
+    32% {
+        transform:translate(19rpx,5rpx) rotate(0deg) scale(0.98,0.98);
+    }
+
+    40% {
+        transform:translate(19rpx,5rpx) rotate(0deg) scale(1,1);
+    }
+
+    100% {
+        transform:translate(19rpx,5rpx) rotate(0deg) scale(1,1);
+    }
+}
\ No newline at end of file

taobao_mini/client/myComponents/giftbox/giftbox.axml

+<view class="imgC" style="width:117rpx;height:107rpx;">
+     <image id="image_3" class="imgC" style="
+        transform:translate(13rpx,20rpx) rotate(0deg) scale(1,1);
+        transform-origin:48rpx 31rpx;
+        width:96rpx;
+        height:62rpx;
+        " src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAA+CAMAAADjwu6NAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAkelRYdENyZWF0b3IAAAiZc0zJT0pVcEwrSS1ScE1LS00uKQYAQXoGzmp6FcUAAAAJcEhZcwAAAAEAAAABAE8lxNYAAAA/UExURUdwTFMtF1MsGFIrFlQuFFIsElczD1MsFlMsFVYuHVMsFvvdaPTSZGVEHtq2VbCORHdWI6B+O41qL8OgS+nGXQPfefUAAAAKdFJOUwBirIBJlxLJ6izNl0yBAAAB40lEQVRYw71XC6KDIAwTFBHKR5D7n/UV3Pbm5uaPLgdI1iSlrmn2QbFWcDkUSClappp66FqpVyBF118n7zs+ZDYbg59cMojk3BSiLSKcXdNQIrOPYTLwBuPCWDS689ZkZ6xP8BHGZw3JztMHBxtIAc0ajksonukN7IFHCXnQqBbp/T76jAklxIG4FboTExyACejT7iEYRuvgIBLGLfY1H92PBo7DYxI7bOrRnglOwVk9bL4gatA2wUmYcTMI5B9P8yOi1t0Wv4ErCF8VkD9e4/+u0F/+/bNLH5OWNfjBoMJ6W8WF/rx0SX7YXwdVkKxuVwP2UAluLWgMAKohvMfAtDX1BGB8ffiwoVNF/mySemnQCFURlk1S1Rr06Kpd5Mx1hMrwzyPgAKm2wGIEUX+AxQhYIVdfAEdQjx0YgQDhsQuy7g7878LwiNhQCMA95pYi4jlmTukQPtuzRz2VQ9mj3KOOpkNzj9oSQaASmEoInCqCewhD/XfoKYQ+Z0zGj4etwzUb6QSiZvgQRToBjzVidCXKNRLYUk8pwPHYEAo4PDrkAoR79gOB9AuLyAVa2j3g1JssKO/NfHGUtrSPXUN3km9HWVJ8N96gdTmZnrKlDWWNfPk6JUy5ZJyvPh36+e8HGTCCP6aw1Kmsn52rAAAAAElFTkSuQmCC" />
+        <image id="image_2" class="imgC" style="
+        transform:translate(19rpx,5rpx) rotate(0deg) scale(1,1);
+        transform-origin:41.5rpx 42.5rpx;
+        width:83rpx;
+        height:85rpx;
+        " src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFMAAABVCAMAAAACNSgvAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAkelRYdENyZWF0b3IAAAiZc0zJT0pVcEwrSS1ScE1LS00uKQYAQXoGzmp6FcUAAAAJcEhZcwAAAAEAAAABAE8lxNYAAAFTUExURUdwTOLf1t6emOJ6bZ2ssPz9/pp9e+/29f3+/s/QzvLq5qSIcuDKtvHZkfDTf66Jc+bNoOdeT/e6Nvbvh9xyaPXGVPfedbGNlPrmW/J4Ys9kW/SEdK1iWcVMQ+iJTu+FJMU4J89AMMg5K+6EH8s7K8Q0J8w+MMc4J/KLI+dLOvGZLcw+LOZGNvOGJNNCMfKqIPhXSfm/Ofm0Pfv2wfeuM/SkLto5I89GOvJPRPi4M/qXdcwlE/KeIvRHNPjINvJsVPZeSuFAL/CTJOuFIPjQROxYSPrgc/jJQPq6I6g2IsJAL/raS/raZPmgI/aTJdUrFr82Jvr82OKSI79aGvvjguRQGMAtJvrVN/OBJvrTV8w5Me1vGfvzu/M1L+xjHtZ4Iu58HPzrnfz+7awpF8tlH+3GqPrxTvS7XZYdEvfh0bVMGdOXhPPUjMBsXrxZSuOGRvj7ZiZxYJ8AAABpdFJOUwAgd65OBYsMATIRlkxifpha6MWQt8C0dNjkvsHC5Nb///////////////////////////////////////////////////////////////////////////////////7//////////////vNOCIYAAAiiSURBVFjDrZn5W9rYHsZNW4bAVR9rO11m5t5AgCSyGAOJEsWIISW07IoiIgji2trp/P8/3e85WUhCop1758UsJ3nzOe9ZkvDg0pJTpGvznIjVd6vRn3Cvra8j37MC0Kpea/Li6rPG1SYv1PSVZyuH02/6siyLpdL6k+bQ0praFGVB6L95BoqQ9YGmCLIsNdefNBJNVZRlRVO0d9EnodCgeqNhQV8+Zfw1IUFMXRs0Gh8iTyKXAQlQXREEgK4FBSCXVlqqJAq6rjWqjUZ1+QlkuK6Do9qo6zpASzwRBA2lORRTgZjVanXQXwmu/Z2iIU+1oSGo2PzV3woxc2kJBkivY/tAqK0EOhVBN6ADA8ov+1rJ0JEZ00igC2LN1wlDqcgKdHq12utVNV0D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" />
+        <image id="image_1" class="imgC" style="
+        transform:translate(4rpx,66rpx) rotate(0deg) scale(1,1);
+        transform-origin:55rpx 18.5rpx;
+        width:110rpx;
+        height:37rpx;
+        " src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG4AAAAlCAMAAACUGixmAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAkelRYdENyZWF0b3IAAAiZc0zJT0pVcEwrSS1ScE1LS00uKQYAQXoGzmp6FcUAAAAJcEhZcwAAAAEAAAABAE8lxNYAAAA/UExURUdwTFMsFVMsF1ItFlMsFlIsG1MpE1MsFlArBVMsFVMsFlMsFvrnJq6RGnNTF9i8He7UHo9wGb6hHlw4Gp+CGtoxWOIAAAALdFJOUwCaccDzMFSIFt2wiSEpVAAAAUFJREFUWMO9l1mSwyAMRDE7Fma//1lHuDwpx0n+kPoCr6RulhbiLutU0LBMOqjNevFd3i0k3Zib+QVLo5W4UCUfCYn7x4QmANQcCVRGB23faRInI4GdwAqwPWgjEqq98SxAi6TKHdzLN01NQx7Av38BaiTXAdpfxqXIoHTZF+hXeeYTwJ85YRkuxnqmRfEMN9MS8PLSUHhw6J7h2+XcpsRcDi5cw2xucHDhMijENT5c4MQVXtxcpuOMyo4HoXLhDrxWDPTIdsztvKEzU1L6vKPZzGuYFDG3Wfh2KcTOE5Y2H4RzPA730Lnrs+I41pnw0F1SkKh5FcLr5+4DNa+CvhUT5HVC/3J6oyFPYSMhGrAMgPAsXRL7ViV4HHLtj0JyDbjNNpnqOJZp1NRnvTPf66tU68trcEb8lDdWumWS8tnM/wApIK6W70bcpgAAAABJRU5ErkJggg==" />
+        <image id="image_0" class="imgC" style="
+        transform:translate(18rpx,73rpx) rotate(0deg) scale(1,1);
+        transform-origin:42rpx 12rpx;
+        width:84rpx;
+        height:24rpx;
+        " src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFQAAAAYBAMAAACW38flAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAkelRYdENyZWF0b3IAAAiZc0zJT0pVcEwrSS1ScE1LS00uKQYAQXoGzmp6FcUAAAAJcEhZcwAAAAEAAAABAE8lxNYAAAAnUExURVEsEUdwTFIsFlIsElMqFFItGFIsFlEwGlYnJURDAFMnFlIsFlIsFsyQPUcAAAAMdFJOU90AdFWOsMwzIhFE7tjyIiIAAAHxSURBVDjLdZO7T9tQFMYv4SEkshyCic3EQyCl8tDKqANiICVLJQ/hIXXxAmJplYFWrdKhSyoqZWCxkACJBRfEQoa2gMSQ4SqyU6l8f1TP9SPYJJzh2r7+6Z7vfOdcQf1hudGzSWSktkUG0nK86PgYfhQk0dmHFPpzPokFoulOD50pK9S5bzbdBHWQRDeDTvuMamo/SNCqiAJyNIMWcSF1RwqRD55qtYeILl76Kz2t9pa8Romo9XcQmgfkLCf4JTjDwZHUdscaer5MboweWRxeiIr8gzAR69NtaRjO+H7XJd+L0FX1ayhElVZz2MLC64CKDtgBTeI9EWQpQll6O4XusFYtIBNvGP2CgLMvt7EVosyY/ejhu4K8rKIb5p50kGs8Qf3FBNW5W98w4kVFG0vwM6hxDtixVna2Uhj1EoMMM0ijeg3Ys/HYIR2vYrJgI8fojWXZIWq0H1irZF+5Q+fcwQl2WCiPP7exnjXrxfFjWaup2ZgN3YrMEv0OnNTr9RY6vH4l3HqUmBU3No2qcO5kQz133ahbVxvPoT9Qqv0ZcAt6aFyWqqVDx2x9Fi1WKrXfRCf7jMZmfapCskIbctvNnMrjV+bRxD81LpbFLWghUDOir8HPClgTm7yejc2xVn6Z2qOp9fiw728H3liOU5eeif+mS/+XiQc1ZgAAAABJRU5ErkJggg==" />
+</view>
\ No newline at end of file

taobao_mini/client/myComponents/giftbox/giftbox.js

+'use strict';
+Component({
+  props: {
+     showWinLists:[]
+  },
+  data: {},
+  methods: {
+    hiddenPanelEvent(e){
+      this.props.onTapHiddenPanelEvent(e);
+    },
+    openTaskPanel(){
+      this.props.onOpenTaskPanel()
+    }
+  },
+
+  onInit(props) {
+
+  },
+  
+});
\ No newline at end of file

taobao_mini/client/myComponents/giftbox/giftbox.json

+{
+  "component": true,
+  "usingComponents": {
+    "rulepanel":"../../components/comrulepanel/comrulepanel",
+    "getcardpanel":"../../components/comgetcardpanel/comgetcardpanel",
+    "joinmemberpanel":"../../components/comjoinmemberpanel/comjoinmemberpanel",
+    "nonumberpanel":"../../components/comnonumberpanel/comnonumberpanel",
+    "mycardpanel":"../../components/commycardpanel/commycardpanel",
+    "taskpanel":"../../components/comtaskpanel/comtaskpanel",
+    "prizetipspanel":"../../components/comprizetipspanel/comprizetipspanel"
+  }
+}
\ No newline at end of file

taobao_mini/client/myComponents/panel/panel.axml

@@ -2,8 +2,8 @@
     <rulepanel a:if={{showWinLists.indexOf("rulepanel")!=-1}} onTapHiddenPanelEvent="hiddenPanelEvent" />
     <getcardpanel a:if={{showWinLists.indexOf("getcardpanel")!=-1}} onTapHiddenPanelEvent="hiddenPanelEvent" />
     <joinmemberpanel a:if={{showWinLists.indexOf("joinmemberpanel")!=-1}} onTapHiddenPanelEvent="hiddenPanelEvent" />
-    <nonumberpanel a:if={{showWinLists.indexOf("nonumberpanel")!=-1}} onTapHiddenPanelEvent="hiddenPanelEvent" />
-    <mycardpanel a:if={{showWinLists.indexOf("mycardpanel")!=-1}} onTapHiddenPanelEvent="hiddenPanelEvent" />
+    <nonumberpanel a:if={{showWinLists.indexOf("nonumberpanel")!=-1}} onOpenTaskPanel="openTaskPanel" onTapHiddenPanelEvent="hiddenPanelEvent" />
+    <mycardpanel a:if={{showWinLists.indexOf("mycardpanel")!=-1}} CollectCardInfo={{CollectCardInfo}} onTapHiddenPanelEvent="hiddenPanelEvent" />
     <taskpanel a:if={{showWinLists.indexOf("taskpanel")!=-1}} onTapHiddenPanelEvent="hiddenPanelEvent" />
     <prizetipspanel a:if={{showWinLists.indexOf("prizetipspanel")!=-1}} onTapHiddenPanelEvent="hiddenPanelEvent" />
 </view>

taobao_mini/client/myComponents/panel/panel.js

@@ -7,6 +7,9 @@ Component({
   methods: {
     hiddenPanelEvent(e){
       this.props.onTapHiddenPanelEvent(e);
+    },
+    openTaskPanel(){
+      this.props.onOpenTaskPanel()
     }
   },
 

taobao_mini/client/pages/pageindexpage/pageindexpage.axml

@@ -16,7 +16,7 @@
           <view class="indexunlockprizesbody ">
             <view class="indexunlockprizesitem " 
               a:for={{collectedCardTypePrizeList}} 
-              onTap='showOptions' data-value={{index}}
+              onTap='clickOptions' data-value={{{index,status:item.status}}}
             >
               <image a:if={{item.status == 3}} class="unlockover " src={{resList['26336845-54c5-4a6f-a97e-f3f13d3fef27'].url}} />
               <view  a:if={{item.status == 2}} class="unlockready ">
@@ -46,7 +46,8 @@
                   <image class="indexdrawitemend " src={{resList['49e09b9b-b884-4921-b40f-5a1bb3b366d9'].url}} />
                   <view class="indexdrawitemcount fontVerticalCenter">{{item.needTimes}}</view>
                 </view>
-                <image  a:if={{item.status == 2}} class="indexdrawitemsuccess " src={{resList['5d8bf336-cef9-4f9f-8824-6d40e64c673e'].url}} />
+                <view class="indexdrawitemsuccess " ><giftbox a:if={{item.status == 2}} /></view>
+                <!--<image  a:if={{item.status == 2}} class="indexdrawitemsuccess " src={{resList['5d8bf336-cef9-4f9f-8824-6d40e64c673e'].url}} />-->
                 <image  a:if={{item.status == 3}} class="indexdrawitemover " src={{resList['9dbbe0b5-a157-40f0-8d13-9f8165e57246'].url}} />
                 <image  a:if={{item.status == 1}} class="indexdrawitemnone " src={{resList['7441ff80-fd13-40de-b4db-9e5d3c013b9b'].url}} />
               </view>
@@ -56,7 +57,7 @@
             <image class="indexmycardbtnbg " src={{resList['0f9fe800-6f3a-4a3d-a76c-93378a58e261'].url}} />
             <view class="indexmycardbtncount fontVerticalCenter">{{cardTypeCollectedCount}}/{{cardTypeCount}} </view>
           </view>
-          <image class="indextaskbtn btn" onTap="openTaskPanel" src={{resList['ddece383-122a-4ed6-b035-dc695987650d'].url}} />
+          <image class="indextaskbtn btn" a:if={{taskOpenStatus==2}} onTap="openTaskPanel" src={{resList['ddece383-122a-4ed6-b035-dc695987650d'].url}} />
            <view class="indexjoinbtn btn" onTap="doJoin">
             <image class="indexjoinbtnbg " src={{resList['1f2538c3-c2fb-4792-9c6d-7cd756ed64ba'].url}} />
             <view class="indexjoinbtncount ">
@@ -80,5 +81,5 @@
           <image class="indexrecordbtn " src={{resList['5a6679e0-89f7-4582-a89b-116a35e9750a'].url}} />
         </view>
 
-       <panel showWinLists="{{showWinLists}}" onTapHiddenPanelEvent="hiddenPanelEvent"/>
+       <panel showWinLists="{{showWinLists}}" CollectCardInfo={{CollectCardInfo}} onOpenTaskPanel="openTaskPanel" onTapHiddenPanelEvent="hiddenPanelEvent"/>
       </view>
\ No newline at end of file

taobao_mini/client/pages/pageindexpage/pageindexpage.js

@@ -14,7 +14,7 @@ let time1,time2
 Page({
   data: {
       showWinLists:[],
-      opacityState:"opacityShow"
+      opacityState:"opacityShow",
   },
 
   onLoad(props) {
@@ -49,7 +49,9 @@ Page({
       cardTypeCount,
       cardTypeCollectedCount,
       gameTimes,
-      joinedTimes
+      joinedTimes,
+      giftCardStatus,
+      taskOpenStatus
     } = CollectCardInfo.data;
 
     DataCenter.CollectCardInfo = CollectCardInfo.data;
@@ -64,6 +66,8 @@ Page({
       cardTypeCollectedCount,
       gameTimes,
       joinedTimes,
+      giftCardStatus,
+      taskOpenStatus
     })
 
     this.setCarouselList()
@@ -84,8 +88,10 @@ Page({
     this.setData({
       opacityState:"opacityShow"
     }) 
+    //重新初始化时，清除计时器
     clearInterval(time1)
     clearTimeout(time2)
+    //通过计时器滚动中奖信息
     time1=setInterval(()=>{
       if(list[i]){
         i++
@@ -105,11 +111,14 @@ Page({
         }, 1500);
     },2000)
   },
-  //展示不可领取礼盒中的奖励
-  async showOptions(e){
-    let i=e.target.dataset.value;
-    DataCenter.prizeList=this.data.collectedCardTypePrizeList[i].prizeList;
-    this.showPanel("prizetipspanel")
+  //点击领取礼盒
+  async clickOptions(e){
+    let i=e.target.dataset.value.index;
+    let status=e.target.dataset.value.status;
+    if(status==1){
+      DataCenter.prizeList=this.data.collectedCardTypePrizeList[i].prizeList;
+      this.showPanel("prizetipspanel")
+    }
   },
   //打开我的卡牌弹窗
   async openMyCard(){
@@ -148,12 +157,10 @@ Page({
      //抽卡
     const { activityId } = getApp();
     let doJoin = await API.doJoin({ activityId }).catch(res => {
-      console.log(res)
-     
-      if(res.code=="310003"){
+      if(res&&res.code=="310003"){
         //需要加入会员
         this.showPanel("joinmemberpanel");
-      }else if(res.code=="730004"){
+      }else if(res&&res.code=="730004"){
         //没有抽卡次数
         this.showPanel("nonumberpanel");
       }else{

taobao_mini/client/pages/pageindexpage/pageindexpage.json

 {
   "usingComponents": {
-    "panel":"../../myComponents/panel/panel"
+    "panel":"../../myComponents/panel/panel",
+    "giftbox":"../../myComponents/giftbox/giftbox"
   }
 }
\ No newline at end of file