--

taobao_mini/client/components/commycardpanel/commycardpanel.acss

+/* 程序样式 */
+@import './your.acss';
+
 .mycardpanel {
   top: 0rpx;
   left: 0rpx;

taobao_mini/client/components/commycardpanel/commycardpanel.axml

@@ -3,7 +3,7 @@
     <image class="bei_jing15 " src={{resList['6dd68f2c-4a65-4107-92f2-29464c469803'].url}} />
     <view class="mycardcontent ">
       <view class="mycarditem " a:for={{MyCardsInfo}}>
-        <view class="mycarditembody ">
+        <view class={{item.count<=0?"huise mycarditembody":"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 " a:if={{giftCardStatus==2&&item.count<2}} src={{resList['776b0825-6538-4ea4-8814-50149644f3bc'].url}} />

taobao_mini/client/components/commycardpanel/your.acss

+
+.huise {
+  filter: grayscale(100%);
+}

taobao_mini/client/components/comprizetipspanel/comprizetipspanel.axml

 <view class="prizetipspanel " >
   <text class="zheng_zai_jin_xing_zhong comWinTitle">正在进行中...</text>
-  <text class="prizetipsnumberremainingtext comWinTitle">（剩余{{CollectCardInfo.cardTypeCount-CollectCardInfo.cardTypeCollectedCount}}张解锁奖励）</text>
+  <text class="prizetipsnumberremainingtext comWinTitle">（剩余{{needCards-CollectCardInfo.cardTypeCollectedCount}}张解锁奖励）</text>
   <text class={{!prizeList[1]?"prizetipsprize1text prizetipsprize1textOne":"prizetipsprize1text"}}>{{prizeList[0].name}}</text>
   <text class="prizetipsprize2text ">{{prizeList[1].name}}</text>
   <image class="prizetipsclosebtn " onTap="hiddenPanelEvent" data-value="prizetipspanel" src={{resList['878b3751-e6b3-4ae6-9811-77e938801873'].url}} />

taobao_mini/client/components/comprizetipspanel/comprizetipspanel.js

@@ -15,6 +15,7 @@ Component({
     this.setData({
       resList: resList,
       prizeList:DataCenter.prizeList,
+      needCards:DataCenter.DataCenter.prizeListNeedCards,
       CollectCardInfo: DataCenter.CollectCardInfo
     });
   }

taobao_mini/client/components/comrulepanel/comrulepanel.axml

@@ -2,7 +2,7 @@
 <view class="rulepanel">
     <image class="dim1131 " src={{resList['603034bb-2c7d-42c4-9be4-60aea30e0820'].url}} />
     <view class="ruletext " style="width: 432rpx;height: 565rpx;" scroll-y="{{true}}">
-      <view style="min-height: calc(100% + 1px);">{{rule}}</view>
+      <text style="min-height: calc(100% + 1px);">{{rule}}</text>
     </view>
     <image class="ruleclosebtn " onTap="hiddenPanelEvent" data-value="rulepanel" src={{resList['878b3751-e6b3-4ae6-9811-77e938801873'].url}} />
 </view>

taobao_mini/client/components/comtaskpanel/comtaskpanel.axml

@@ -42,6 +42,12 @@
            onTap="onTapTaskNoneGotoBtn"
            data-value={{item}}
            src={{resList['34e9a26b-6288-4779-8eef-ad3698aab8df'].url}} />
+          <!-- 去加入 -->
+          <image class="tasknonegotobtn "
+           a:elif={{(item.taskType==="groupChat")}}
+           onTap="onTapTaskNoneGotoBtn"
+           data-value={{item}}
+           src={{resList['34e9a26b-6288-4779-8eef-ad3698aab8df'].url}} />
           <!-- 去完成 -->
           <image class="tasknonegotobtn "
            a:else

taobao_mini/client/components/comtaskpanel/comtaskpanel.js

@@ -140,9 +140,11 @@ Component({
       events.emit("doDisibleAll",false)
       await this.updateData()
       if(doCompleteTask&&doCompleteTask.success){
-        my.navigateTo({
+        my.call("navigateToOutside", {
           url
-        });
+        }, (res) => {
+          // my.alert({ content: "success - " + JSON.stringify(res)})
+        })
       }
     },
     //跳转任务
@@ -155,9 +157,11 @@ Component({
       events.emit("doDisibleAll",false)
       await this.updateData()
       if(doCompleteTask&&doCompleteTask.success){
-        my.navigateTo({
+        my.call("navigateToOutside", {
           url
-        });
+        }, (res) => {
+          // my.alert({ content: "success - " + JSON.stringify(res)})
+        })
       }
     },
     //加入会员
@@ -170,9 +174,14 @@ Component({
       events.emit("doDisibleAll",false)
       await this.updateData()
       if(doCompleteTask&&doCompleteTask.success){
-        my.navigateTo({
+        // my.navigateTo({
+        //   url
+        // });
+        my.call("navigateToOutside", {
           url
-        });
+        }, (res) => {
+          // my.alert({ content: "success - " + JSON.stringify(res)})
+        })
       }
     },
     //邀请会员

taobao_mini/client/pages/pageindexpage/pageindexpage.js

@@ -447,6 +447,7 @@ Page({
     let i=e.target.dataset.value.index;
     let status=e.target.dataset.value.status;
     if(status==1){
+      DataCenter.prizeListNeedCards=this.data.collectedCardTypePrizeList[i].needCards;
       DataCenter.prizeList=this.data.collectedCardTypePrizeList[i].prizeList;
       this.showPanel("prizetipspanel")
     }