代码暂存

taobao_mini/client/components/comsui_pian_dan_chuang/comsui_pian_dan_chuang.acss

@@ -112,3 +112,13 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+.sui_pian_dan_chuang .wei_ta_zhu_li {
+  width: 500rpx;
+  height: 118rpx;
+  opacity: 1;
+  display: block;
+  left: 125rpx;
+  top: 560rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}

taobao_mini/client/components/comsui_pian_dan_chuang/comsui_pian_dan_chuang.axml

@@ -2,12 +2,13 @@
         <label class="sui_piantit">{{tit}}</label>
         <label class="sui_pian_futit">{{subtit}}</label>
         <image class="image" src={{spimg}} />
-        <image class="prizekuang1" a:if="{{!israre}}" src={{resList['2a016267-8fd5-4524-8f7b-e3bdfa541fe1'].url}} />
-        <image class="prizekuang2" a:if="{{israre}}" src={{resList['a6f59e24-ff10-4aab-b9c2-3dacf6c91399'].url}} />
+        <image class="prizekuang1" a:if="{{israre==1}}" src={{resList['2a016267-8fd5-4524-8f7b-e3bdfa541fe1'].url}} />
+        <image class="prizekuang2" a:if="{{israre==2}}" src={{resList['a6f59e24-ff10-4aab-b9c2-3dacf6c91399'].url}} />
 
         <image class="guan_bi_an_niu6 btnclickStyle" src={{resList['6d394fc5-a3b4-4b85-a9ae-7ff535552bf1'].url}} onTap="onClose" />
         <image class="zai_chou_yi_ci btnclickStyle" a:if="{{btntype==1}}" src={{resList['a25c3e6f-3e27-4da3-9e2e-2066e5f81f63'].url}} onTap="onCollectSp" />
         <image class="fen_xiang_sui_pian btnclickStyle" a:if="{{btntype==2}}" src={{resList['d3990484-1981-4c10-b796-7776576312b5'].url}} onTap="onShareSp" />
         <image class="wo_ye_yao_can_jia btnclickStyle" a:if="{{btntype==3}}" src={{resList['9a1452c5-2e8e-4170-8b25-b0988ac8d90f'].url}} onTap="onJoinGame" />
         <image class="jia_ru_hui_yuan_da_kai_qia_bao btnclickStyle" a:if="{{btntype==4}}" src={{resList['af9655fd-7321-4b11-8aae-c7353a4ceb60'].url}} onTap="onJoinVip" />
+        <image class="wei_ta_zhu_li btnclickStyle" a:if="{{btntype==5}}" src={{resList['ae2a2e5c-3af2-4861-82a8-8d863c323db6'].url}} onTap="checkJoinVip" />
       </view>
\ No newline at end of file

taobao_mini/client/components/comsui_pian_dan_chuang/comsui_pian_dan_chuang.js

@@ -17,8 +17,9 @@ Component({
       onClose && onClose();
     },
     onCollectSp() {
-      const { onCollectSp } = this.props;
-      onCollectSp && onCollectSp();
+      // const { onCollectSp } = this.props;
+      // onCollectSp && onCollectSp();
+      this.onClose();
     },
     onShareSp() {
       const { onShareSp } = this.props;
@@ -36,6 +37,15 @@ Component({
     onUpdateUinfo(){
       const { onUpdateUinfo } = this.props;
       onUpdateUinfo && onUpdateUinfo();
+    },
+    //老用户，关闭，新用户加入会员
+    checkJoinVip(){
+      const {isvip} = this.props;
+      if(isvip){
+        this.onClose();
+      }else{
+        this.onJoinVip();
+      }
     }
   },
 

taobao_mini/client/mocks/tmallCat.getUserCardInfo.json

@@ -2,7 +2,7 @@
     "success": true,
     "message":"网络异常",
     "data": {
-        "shoesName": "jijia",
+        "shoesName": "",
         "cardCountList": {
             "1":99,
             "2":1,
@@ -18,8 +18,10 @@
         "canTakeRankPrize":false,
         "shoesType": 1,
         "inviteResult": {
-            "inviteCount":13,
+            "inviteCount":0,
             "addDrawTimes":12
-        }
+        },
+        "hasTakeCollectedPrize":false,
+        "hasTakeFirstPrize":true
     }
 }
\ No newline at end of file

taobao_mini/client/pages/pageshou_ye/pageshou_ye.acss

@@ -714,6 +714,37 @@
   position: absolute;
   transform-origin: 50% 50%;
 }
+.shou_ye .contnode .finapt {
+  width: 589rpx;
+  height: 389rpx;
+  opacity: 1;
+  display: block;
+  left: 80.5rpx;
+  top: 30rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
+.shou_ye .contnode .finapt .finaptdi{
+  width: 589rpx;
+  height: 389rpx;
+  opacity: 1;
+  display: block;
+  left: 0rpx;
+  top: 0rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
+.shou_ye .contnode .finapt .finaptimg{
+  width: 554rpx;
+  height: 362rpx;
+  opacity: 1;
+  display: block;
+  left: 17.5rpx;
+  top: 12.5rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
+
 .ptimgani {
   transform: scale(0);
   animation: modalAnimatePtAni 1.0s forwards;
@@ -860,22 +891,22 @@
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .shou_ye .botnode .selshoes .selscroll .shoes2 .shoes2u {
-  width: 130rpx;
-  height: 107rpx;
+  width: 125rpx;
+  height: 112rpx;
   opacity: 1;
   display: block;
   left: 8rpx;
-  top: 10rpx;
+  top: 8rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .shou_ye .botnode .selshoes .selscroll .shoes2 .shoes2s {
-  width: 158rpx;
-  height: 162rpx;
+  width: 156rpx;
+  height: 168rpx;
   opacity: 1;
   display: block;
   left: -5rpx;
-  top: -20rpx;
+  top: -22rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }

taobao_mini/client/pages/pageshou_ye/pageshou_ye.axml

-<view class="style1">
-  <scroll-view class="shou_ye" scroll-y="{{true}}" scroll-top="{{100}}" disable-scroll="{{canscroll}}">
+<view class="style1" scroll-y="{{true}}" scroll-top="{{scrolltop}}" disable-scroll="{{canscroll}}">
+  <scroll-view class="shou_ye">
   <image class="bg" src={{resList['05608aab-d250-45fe-9cd0-6c55b3a7b821'].url}} />
   <view class="homescroll" />
   <view class="topnode">
@@ -16,7 +16,7 @@
     </view>
   </view>
   <view class="contnode">
-    <view class="pintudiv">
+    <view class="pintudiv" a:if="{{selected==2}}">
       <image class="pin_tu_di" src={{resList['85f45c26-b7df-4dbc-ae37-5e9325c35677'].url}} />
       <image class="pin_tu_di_kuang" src={{resList['2a1adc3a-b4db-47db-bf6e-6f1000e64a83'].url}} />
       <view class="pic1{{selected==2&&cardCountList[1]==0?' blackWhiteFilter':''}}">
@@ -87,6 +87,11 @@
     <view class="ptnode">
       <image class="showallimg ptimgani" a:if="{{ptimg_v}}" src={{ptimgbig}} />
     </view>
+    <view class="finapt" a:if="{{selected!=2||isduihuan}}">
+      <image class="finaptdi" src={{resList['56d322ae-bfcb-4d03-b5bc-81603cb2fe5b'].url}} />
+      <image class="finaptimg" src={{ptimgbig}} />
+    </view>
+    
   </view>
   <view class="botnode">
     <view class="selshoes" a:if="{{selected==1}}">

taobao_mini/client/pages/pageshou_ye/pageshou_ye.js

@@ -39,6 +39,7 @@ Page({
     selectShoesList: [
       "", "", "", "", ""
     ],//选择得鞋子得数量
+    scrolltop:100,//默认滑动位置
     //兑换新品动画
     whitept_v: false,//白底动画
     ptimg_v: false,//拼图整图
@@ -52,9 +53,10 @@ Page({
     vipLink: "",
     giftype: 3,//1-新手礼盒，2-惊喜礼盒，3-锦鲤礼盒，0-都不显示
     ptimgbig: "",//选中的鞋子big
+
     //两个全局按钮点击，除我的奖品和活动规则外，1活动已结束，2请先打开新手礼盒
     actover: true,//活动是否已经结束
-    opengift: false,//是否打开过新手礼盒
+    opengift: false,//是否领取新人奖励，对应接口hasTakeFirstPrize
 
     nickname: "张三",
     avatar: "//yun.duiba.com.cn/spark/assets/28092c7c919a2c8ea9b750fb79abd2416ba8f90f.png",
@@ -63,7 +65,7 @@ Page({
     collectedCount: 8,//已收集数量
     collectxt: [],//已收集富文本
     // 你已收集{{collectedCount}}/9碎片
-    isduihuan: true,//是否兑换过，兑换过置灰
+    isduihuan: true,//是否已领集满奖励,对应接口hasTakeCollectedPrize
     shoesType: 0,
     inviteResult: {},//
     drawTimes: 1,//剩余抽卡次数
@@ -90,9 +92,21 @@ Page({
 
     //选鞋阶段，单选不可取消
     nselid: 1,//默认选中1,,,,psd顺序，1-机甲，2-减震，3-二次元，4-山海，5--暂无，定山海
+    //弹窗序列
+    dialogsData:[
+      {
+        data:{
+
+        },
+        dianame:""
+      }
+    ],
   },
 
-  onLoad(props) {
+  onLoad(query) {
+    this.setData({
+      scrolltop:150
+    });
     checkSystem().then(r => {
       if (!r) {
         my.showToast({
@@ -115,9 +129,31 @@ Page({
     this.login();
 
     console.log("onload========>");
+
+    //助力弹窗
+    if(query){
+      app.inviteId = query.openId;
+      let cardType = query.cardType;
+      let spimg = resList["shanhaibig"].url;
+       this.setData({
+        cardType: cardType,
+        israre: 3,
+        spimg: spimg,
+        btntype: 5
+      });
+      this.openSp();
+    }
+  },
+  //弹窗序列233
+  openDialogSx(){
+    let onedata = this.data.dialogsData.shift();
+    let data = onedata.data;
+    let dianame = onedata.dianame;
+    this.setData(data);
+    //dianame切换弹窗
   },
-  firstShow(e){
-    console.log("firstshow",Document);
+  firstShow(e) {
+    console.log("firstshow", Document);
   },
   onReady() {
     let main = this.spark_startEngine(); //main.addEventListener....
@@ -261,7 +297,7 @@ Page({
     }) || {};
     const { success, data } = userinfo;
     if (success) {
-      let { shoesName, cardCountList, collectedCount, canTakeRankPrize, shoesType, inviteResult } = data;
+      let { shoesName, cardCountList, collectedCount, canTakeRankPrize, shoesType, inviteResult, hasTakeCollectedPrize, hasTakeFirstPrize } = data;
       let selected = 2;
       let nselid = 1;
       if ((!shoesName || shoesName.length == 0) && this.data.selected == 0) {//当前未选择鞋子
@@ -307,19 +343,23 @@ Page({
         }
       ]
 
-
+      let ptimgbig = resList[shoesName+"big"].url;
       this.setData({
         selected: selected,
         shoesName: shoesName,
+        ptimgbig:ptimgbig,
         cardCountList: cardCountList,
         collectedCount: collectedCount,
         collectxt: collectxt,
         canTakeRankPrize: canTakeRankPrize,
         shoesType: shoesType,
-        inviteResult: inviteResult
+        inviteResult: inviteResult,
+        isduihuan: hasTakeCollectedPrize,//是否已领集满奖励
+        opengift: hasTakeFirstPrize
       });
 
       this.checkOpenNgift();
+      this.checkOpenInfo1();
     } else {
       if (this.data.selected == 0) {
         this.setData({
@@ -332,6 +372,26 @@ Page({
       this.getPickShoesList();
     }
   },
+  /**
+   * 进首页，弹出新邀请提示
+   */
+  checkOpenInfo1(){
+    let inviteResult = this.data.inviteResult;
+    let inviteCount = inviteResult.inviteCount;
+    let addDrawTimes = inviteResult.addDrawTimes;
+    if(inviteCount>0){
+      let infotit = "召回了"+inviteCount+"位好友";
+      if(addDrawTimes>0){
+        infotit += "\n获得"+addDrawTimes+"次抽碎片机会";
+      }
+      this.setData({
+        infobtntype: 1,
+        infotopshow: true,
+        infotit: infotit
+      });
+      this.openInfo();
+    }
+  },
   /**
    * 获得抽卡次数
    */
@@ -382,7 +442,7 @@ Page({
       if (nearchashare > 0) {
         nearchatxt = "再召唤" + nearchashare + "好友必得" + nearchaprize;
       }
-      console.log("sharepropos55555555===>", sharepropos,nearchatxt,nearchashare);
+      console.log("sharepropos55555555===>", sharepropos, nearchatxt, nearchashare);
       this.setData({
         inviteAwardList: list,
         inviteCount: inviteCount,
@@ -398,13 +458,14 @@ Page({
    */
   async checkOpenNgift() {
     let collectedCount = this.data.collectedCount;
+    let opengift = this.data.opengift;
     let selected = this.data.selected;
-    if (collectedCount == 0 && selected == 2) {//新人
+    if (!opengift && selected == 2) {//新人
       this.openGift();
     } else {
-      this.setData({
-        opengift: true
-      });
+      // this.setData({
+      //   opengift: true
+      // });
     }
   },
   /**
@@ -456,13 +517,13 @@ Page({
     if (success) {
       let { cardType } = data;
       let cardname = this.data.shoesName;
-      let spimg = resList[cardname+""+cardType].url;
+      let spimg = resList[cardname + "" + cardType].url;
       let uncommon = false;
       let btntype = uncommon ? 2 : 1;
       this.setData({
         opengift: true,
         cardType: cardType,
-        israre: uncommon,
+        israre: btntype,
         spimg: spimg,
         btntype: btntype
       });
@@ -672,9 +733,9 @@ Page({
     let drawTimes = this.data.drawTimes;
     if (drawTimes < 1) {//无次数
       let infotit = "今日免费次数已用完";
-      if (this.data.nearchashare > 0&&this.data.nearchashare<=3) {
+      if (this.data.nearchashare > 0 && this.data.nearchashare <= 3) {
         infotit += "\n再召唤" + this.data.nearchashare + "好友就能获得" + this.data.nearchaprize;
-      }else{//有个每次最多抽取次数
+      } else {//有个每次最多抽取次数
         infotit += "\n请明日再来";
       }
       this.setData({
@@ -701,12 +762,12 @@ Page({
     if (success) {
       const { cardType, uncommon } = data;
       let cardname = this.data.shoesName;
-      console.log(cardname,cardType);
-      let spimg = resList[cardname+""+cardType].url;
+      console.log(cardname, cardType);
+      let spimg = resList[cardname + "" + cardType].url;
       let btntype = uncommon ? 2 : 1;
       this.setData({
         cardType: cardType,
-        israre: uncommon,
+        israre: btntype,
         spimg: spimg,
         btntype: btntype
       });
@@ -874,11 +935,11 @@ Page({
           if (cardType) {//给卡片
             let cardname = this.data.shoesName;
 
-            let spimg = resList[cardname+""+cardType].url;
+            let spimg = resList[cardname + "" + cardType].url;
             let btntype = uncommon ? 2 : 1;
             this.setData({
               cardType: cardType,
-              israre: uncommon,
+              israre: btntype,
               spimg: spimg,
               btntype: btntype
             });

taobao_mini/client/resconfig/resList.js

@@ -476,55 +476,55 @@ const resList = {
   'jianzhen1': {
     name: 'jianzhen_1_spe',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_1_spe.b7cc5441655e69d2a84ef5eb6359d1dfa9bfb025.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_1_spe.7b385d47c9dd454d79adebdf22abdd80ffcb7c49.jpg',
     uuid: '64881d5d-55ae-4246-afbd-0376a028fbcb',
   },
   'jianzhen2': {
     name: 'jianzhen_2_nor',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_2_nor.e4554b3ef46d530762165e1486a5f0213420446a.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_2_nor.56a6574abacd3f09a2b5037ee67475d5d88fd4b7.jpg',
     uuid: '11ab57bf-4c98-4143-9a2f-cae3eb394b86',
   },
   'jianzhen3': {
     name: 'jianzhen_3_nor',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_3_nor.d5e5c0695ff86010d752e9d27968acd772794b52.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_3_nor.8ec4ae8fbf1851a696df096587945df3dfbd53ea.jpg',
     uuid: '0f712c71-a2c8-422f-bc88-819fe63f5026',
   },
   'jianzhen4': {
     name: 'jianzhen_4_nor',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_4_nor.f768f93e68e8ec51cea222617e8b7ab42b80caf7.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_4_nor.d3d40de8f73b9c72f378728ba71fec91b96a032b.jpg',
     uuid: 'cb503491-3812-4b3e-a00f-958203a06035',
   },
   'jianzhen5': {
     name: 'jianzhen_5_spe',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_5_spe.be56e6d626445c2d4d86cc485c35dbb6a9cbd8e4.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_5_spe.0412f104a3ef86ac1d1e6f3c7a839d92415f1bed.jpg',
     uuid: '63e089ff-afb9-4f13-a16a-9cc03268c050',
   },
   'jianzhen6': {
     name: 'jianzhen_6_nor',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_6_nor.9c489b6d886ea9e31402b215a52235b913ebf117.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_6_nor.6dcc86dd63b17083d70d8b7967ac124f11f778c9.jpg',
     uuid: '55e56e88-554f-4ec9-91a3-77b05b67ad17',
   },
   'jianzhen7': {
     name: 'jianzhen_7_nor',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_7_nor.e8064929c5c574dcc27a0b1bdd4040c9ccc04582.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_7_nor.4bd06e359e3e1ae6393a8cae447d279ef5acb98d.jpg',
     uuid: '26ed03dd-1743-4697-817c-2cd4625cc0bb',
   },
   'jianzhen8': {
     name: 'jianzhen_8_nor',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_8_nor.63a0ffa962e2e5188975ac7c570f056d3a33ee82.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_8_nor.076d4099e2233d2f9b79d80c6fb5dbade547e6ba.jpg',
     uuid: '002a5bda-9b9c-4ff4-b4d2-9a0754e80cb7',
   },
   'jianzhen9': {
     name: 'jianzhen_9_spe',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/jianzhen_9_spe.8dd9ab2db0271d30151fdeddf3e289ca98dcca40.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/jianzhen_9_spe.caff47eae908c1c8e0955eb4d9fae0d592b7ead4.jpg',
     uuid: '9e27be8d-fe53-49c4-b1b3-adfed0d4c27f',
   },
   '4c9bde31-742d-46a1-8b66-8110c301049c': {
@@ -560,13 +560,13 @@ const resList = {
   'dda70a50-7a0f-4e43-a72b-ec3214b6f57a': {
     name: 'shoes2s',
     ext: '.png',
-    url: '//yun.duiba.com.cn/spark/assets/shoes2sy.f16626053a0e72e905635f96af13e89d34755eec.png',
+    url: '//yun.duiba.com.cn/spark/assets/shoes2s.0b683226d15e5191da9175b26702b0cee20d3a2b.png',
     uuid: 'dda70a50-7a0f-4e43-a72b-ec3214b6f57a',
   },
   '9d30269a-c5b0-4151-97e6-b17c4c529431': {
     name: 'shoes2u',
     ext: '.png',
-    url: '//yun.duiba.com.cn/spark/assets/shoes2u.e8b12ea4d3fbefc29525b134348b57310fb4d10b.png',
+    url: '//yun.duiba.com.cn/spark/assets/shoes2u.b84128c8b48276269e611f114dc2370a9968258f.png',
     uuid: '9d30269a-c5b0-4151-97e6-b17c4c529431',
   },
   'bfa49cc2-a46b-4424-8ebd-34703670bc2e': {
@@ -698,32 +698,38 @@ const resList = {
   'shanhaibig': {
     name: '原图山海',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/原图山海.96afc140d81d7a0dccc61940fd8fb6c1f7357739.jpg',
+    url: '//yun.duiba.com.cn/aurora/assets/d1f90c97b26a74aec9cff80c93a384324e8f0384.jpg',
     uuid: 'a985c8a1-1e7d-4122-bd47-eb46bbf713f3'
   },
   'erciyuanbig': {
     name: '原图二次元',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/原图二次元.a0ae5554ff69d2bd72fe3ad759da2fe6c914f280.jpg',
+    url: '//yun.duiba.com.cn/aurora/assets/51f4eeb589adfb4038c3685a6b46040916035fdf.jpg',
     uuid: '92c29ab8-a2f0-4663-b7a8-ed00a2be6025'
   },
   'jijiabig': {
     name: '原图机甲',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/原图机甲.25fe086c250795de2683c7aba735a263ebfdc1b3.jpg',
+    url: '//yun.duiba.com.cn/aurora/assets/c325cb25fcab41670ec49c14f96c9633d82765ba.jpg',
     uuid: '60ae510a-d865-403c-a729-0daac0c9cd9f'
   },
   'jianzhenbig': {
     name: '原图减震',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/原图减震.110a56d706e0f4eccb3a9b65fbd8562008e45834.jpg',
+    url: '//yun.duiba.com.cn/aurora/assets/3a17213ce76ad196d02256acca747f3c135ba7a6.jpg',
     uuid: 'd070c22a-0436-491d-b4f5-274a2ff02e18'
   },
   'tianchengbig': {
     name: '原图天乘',
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/原图天乘.3ec8bc3dce803aa6e120a415e9b1118e9f9d388c.jpg',
+    url: '//yun.duiba.com.cn/aurora/assets/3167192e2b911b55e1e3083b3941c9cb07f16f97.jpg',
     uuid: 'c221bde6-5afa-46c4-885b-0ffcd5402cc2'
+  },
+  'ae2a2e5c-3af2-4861-82a8-8d863c323db6': {
+    name: '为他助力',
+    ext: '.png',
+    url: '//yun.duiba.com.cn/spark/assets/为他助力.57006fd0777754592e6de0ac498a4dc9955c1be7.png',
+    uuid: 'ae2a2e5c-3af2-4861-82a8-8d863c323db6'
   }
 };
 export default resList;