代码暂存

taobao_mini/client/components/comsui_pian_dan_chuang/comsui_pian_dan_chuang.js

@@ -45,7 +45,7 @@ Component({
     let subtit = "";
     if (btntype == 1) {
       tit = "你获得了" + cardType + "碎片";
-      if(nearchashare&&nearchaprize.length>0){
+      if(nearchashare&&nearchaprize.length>0&&nearchashare<=3){
         subtit = "再召唤"+nearchashare+"位好友就能获得"+nearchaprize;
       }
     } else if (btntype == 2) {

taobao_mini/client/mocks/tmallCat.doCardDraw.json

@@ -2,7 +2,7 @@
     "success": true,
     "message":"",
     "data": {
-        "cardType": 1,
+        "cardType": 2,
         "uncommon": true
     }
 }
\ No newline at end of file

taobao_mini/client/mocks/tmallCat.getInviteAwardsList.json

@@ -28,6 +28,6 @@
                 "times":30
             }
         ],
-        "inviteCount": 30
+        "inviteCount": 17
     }
 }
\ No newline at end of file

taobao_mini/client/mocks/tmallCat.getUserCardInfo.json

@@ -2,7 +2,7 @@
     "success": true,
     "message":"网络异常",
     "data": {
-        "shoesName": "",
+        "shoesName": "jijia",
         "cardCountList": {
             "1":99,
             "2":1,
@@ -14,7 +14,7 @@
             "8":0,
             "9":0
         },
-        "collectedCount": 9,
+        "collectedCount": 2,
         "canTakeRankPrize":false,
         "shoesType": 1,
         "inviteResult": {

taobao_mini/client/pages/pageshou_ye/pageshou_ye.acss

 .shou_ye {
-  top: 0rpx;
-  left: 0rpx;
+  /* top: 50%;
+  left: 50%; */
+  /* margin-top: -100rpx; */
+  /* margin-left: -375rpx; */
+  /* right: 0rpx; */
+  /* bottom: 0rpx; */
   width: 750rpx;
   height: 1624rpx;
   display: block;
@@ -1228,6 +1232,7 @@
   position: absolute;
   font-size: 22rpx;
   color: #ffffff;
+  letter-spacing: 1rpx;
   transform-origin: 0rpx 0rpx 0rpx;
   text-align: center;
 }
@@ -1693,17 +1698,17 @@
 }
 .shou_ye .botnode .homedi .hui_yuan_zhuan_qu {
   width: 304rpx;
-  height: 266rpx;
+  height: 192rpx;
   opacity: 1;
   display: block;
   left: 52rpx;
-  top: 446rpx;
+  top: 450rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .shou_ye .botnode .homedi .shuang_shi_yi_zhuan_qu {
   width: 304rpx;
-  height: 266rpx;
+  height: 192rpx;
   opacity: 1;
   display: block;
   left: 392rpx;

taobao_mini/client/pages/pageshou_ye/pageshou_ye.axml

 <view class="style1">
-  <view class="shou_ye" disable-scroll="{{canscroll}}">
+  <scroll-view class="shou_ye" scroll-y="{{true}}" scroll-top="{{100}}" disable-scroll="{{canscroll}}">
   <image class="bg" src={{resList['05608aab-d250-45fe-9cd0-6c55b3a7b821'].url}} />
   <view class="homescroll" />
   <view class="topnode">
@@ -197,7 +197,7 @@
       <image class="shuang_shi_yi_zhuan_qu" onTap="registerD11" src={{resList['e9a0ad73-6fe7-40bd-98cc-9a985bc413e7'].url}} />
     </view>
   </view>
-</view>
+</scroll-view>
 </view>
 <dialog-modal a:if="{{showdia}}"></dialog-modal>
 <view class="page-game" disable-scroll="true">

taobao_mini/client/pages/pageshou_ye/pageshou_ye.js

@@ -113,6 +113,11 @@ Page({
     app.nickName = "张三";
     app.avatar = "//yun.duiba.com.cn/spark/assets/头像test.30f8cbe95c93400e90281b524e1ab7685b7ccb16.png";
     this.login();
+
+    console.log("onload========>");
+  },
+  firstShow(e){
+    console.log("firstshow",Document);
   },
   onReady() {
     let main = this.spark_startEngine(); //main.addEventListener....
@@ -377,7 +382,7 @@ Page({
       if (nearchashare > 0) {
         nearchatxt = "再召唤" + nearchashare + "好友必得" + nearchaprize;
       }
-      console.log("sharepropos", sharepropos);
+      console.log("sharepropos55555555===>", sharepropos,nearchatxt,nearchashare);
       this.setData({
         inviteAwardList: list,
         inviteCount: inviteCount,
@@ -450,7 +455,8 @@ Page({
     const { success, data } = firstprize;
     if (success) {
       let { cardType } = data;
-      let spimg = resList["shanhai2"].url;
+      let cardname = this.data.shoesName;
+      let spimg = resList[cardname+""+cardType].url;
       let uncommon = false;
       let btntype = uncommon ? 2 : 1;
       this.setData({
@@ -666,8 +672,10 @@ Page({
     let drawTimes = this.data.drawTimes;
     if (drawTimes < 1) {//无次数
       let infotit = "今日免费次数已用完";
-      if (this.data.nearchashare > 0) {
+      if (this.data.nearchashare > 0&&this.data.nearchashare<=3) {
         infotit += "\n再召唤" + this.data.nearchashare + "好友就能获得" + this.data.nearchaprize;
+      }else{//有个每次最多抽取次数
+        infotit += "\n请明日再来";
       }
       this.setData({
         infobtntype: 2,
@@ -677,22 +685,24 @@ Page({
       this.openInfo();
       return;
     }
-    // let docardata = await API.doCardDraw().catch(res => {
-    //   commonToast(res && res.message);
-    // }) || {};
-    let docardata = {
-      "success": true,
-      "message": "",
-      "data": {
-        "cardType": 1,
-        "uncommon": true
-      }
-    }
+    let docardata = await API.doCardDraw().catch(res => {
+      commonToast(res && res.message);
+    }) || {};
+    // let docardata = {
+    //   "success": true,
+    //   "message": "",
+    //   "data": {
+    //     "cardType": 1,
+    //     "uncommon": true
+    //   }
+    // }
     const { success, data } = docardata;
     console.log("抽卡结果", docardata);
     if (success) {
       const { cardType, uncommon } = data;
-      let spimg = resList["shanhai2"].url;
+      let cardname = this.data.shoesName;
+      console.log(cardname,cardType);
+      let spimg = resList[cardname+""+cardType].url;
       let btntype = uncommon ? 2 : 1;
       this.setData({
         cardType: cardType,
@@ -724,6 +734,7 @@ Page({
    */
   onShareSp() {
     console.log("分享碎片");
+    this.shareAct();
   },
   /**
    * 助力-会员直接加入游戏
@@ -861,7 +872,9 @@ Page({
         if (success) {
           let { cardType, uncommon, rewardType, addDrawTimes } = data;
           if (cardType) {//给卡片
-            let spimg = resList["shanhai2"].url;
+            let cardname = this.data.shoesName;
+
+            let spimg = resList[cardname+""+cardType].url;
             let btntype = uncommon ? 2 : 1;
             this.setData({
               cardType: cardType,