代码暂存

taobao_mini/client/components/comattion_dan_chuang/comattion_dan_chuang.acss

@@ -48,6 +48,7 @@
   color: #000000;
   transform-origin: 0rpx 0rpx 0rpx;
   text-align: center;
+  white-space:pre-wrap;
 }
 .attion_dan_chuang .prizeimg {
   width: 500rpx;

taobao_mini/client/components/comattion_dan_chuang/comattion_dan_chuang.axml

@@ -3,8 +3,9 @@
         <image class="guan_bi_an_niu2" src={{resList['6d394fc5-a3b4-4b85-a9ae-7ff535552bf1'].url}} onTap="onClose" />
         <image class="gong_xi_ni" src={{resList['c94d9aad-00a6-40fe-8f2a-f76fdda5428a'].url}} />
         <label class="attiontit">{{tit}}</label>
-        <image class="prizeimg" src="{{prizeimg}}" />
-        <label class="attiontxt1">{{subtit}}</label>
+        <image class="prizeimg" src="{{prizeimg}}" style="top:{{prizetop}}" />
+
+        <rich-text nodes="{{subtit}}" class="attiontxt1"></rich-text>
         <image class="kai_xin_shou_xia" a:if="{{btntype==1}}" src={{resList['8f03f3b2-3ac3-4f5a-8c86-1ca251174f3a'].url}} onTap="onClose" />
         <image class="li_ji_chou_jiang" a:if="{{btntype==2}}" src={{resList['07579ad9-d3d4-410a-a95f-0683d9bdda8c'].url}} onTap="onOpenJlGift" />
       </view>
\ No newline at end of file

taobao_mini/client/components/comattion_dan_chuang/comattion_dan_chuang.js

@@ -6,11 +6,12 @@ Component({
   data: {
     resList: resList,
     tit:"",
-    subtit:"",
+    subtit:[],
     prizeimg: "",
     prizename: "",
     prizetype: "",
     btntype:1,//开心收下，2立即抽奖
+    prizetop:"220rpx"
   },
   methods: {
     onClose() {
@@ -25,14 +26,55 @@ Component({
     }
   },
   didMount() {
-    let { prizeimg, prizename, prizetype,btntype } = this.props;
+    let { prizeimg, prizename, prizetype,btntype,attionfrom } = this.props;
     //tit=== 特步减震旋系列新品一双
     // subtit== 请至“我的奖品”处查看
-    let tit = prizename+"新品一双";
-    let subtit = "";
+    let tit = "";
+    if(attionfrom=="gift"){
+      tit = "获得抽取年度人气锦鲤大奖的机会\n快去抽奖吧";
+    }else if(attionfrom=="prize"){
+      tit = prizename+"新品一双";
+    }
+    
+    let subtit = [];
+    let prizetop = "275rpx";
     if(btntype==1){
-      subtit = "请至”我的奖品“处查看奖品";
+      prizetop = "220rpx";
+      subtit = [
+        {
+          name:"label",
+          attrs:{
+            style:"color:#000000"
+          },
+          children:[{
+            type:"text",
+            text:"请至“"
+          }]
+        },
+         {
+          name:"label",
+          attrs:{
+            style:"color:#cc3333"
+          },
+          children:[{
+            type:"text",
+            text:"我的奖品"
+          }]
+        },
+         {
+          name:"label",
+          attrs:{
+            style:"color:#000000"
+          },
+          children:[{
+            type:"text",
+            text:"”处查看奖品"
+          }]
+        }
+      ]
+      // subtit = "请至”我的奖品“处查看奖品";
     }
+    console.log(subtit);
     // prizetype  1优惠券，3实物，5谢谢参与
     this.setData({
       prizeimg: prizeimg,
@@ -41,6 +83,7 @@ Component({
       tit:tit,
       subtit:subtit,
       btntype:btntype,
+      prizetop:prizetop,
     });
   }
 

taobao_mini/client/components/compai_xing_bang/compai_xing_bang.acss

@@ -157,7 +157,7 @@
   left: 0rpx;
   top: 420rpx;
   position: absolute;
-  overflow-y:auto;
+  /* overflow-y:auto; */
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .pai_xing_bang .pai_ming_lie_biao .rankitem {

taobao_mini/client/components/compai_xing_bang/compai_xing_bang.axml

-<view class="pai_xing_bang modal-animate-fly-in diacontbotpos" disable-scroll="true">
+<view class="pai_xing_bang modal-animate-fly-in diacontbotpos" disable-scroll={{false}}>
   <image class="pai_xing_bang_dibg" src={{resList['fbded3c5-6e0f-45b5-ab8c-9cc3ecaad006'].url}} />
   <image class="guan_bi_an_niu4" src={{resList['6d394fc5-a3b4-4b85-a9ae-7ff535552bf1'].url}} onTap="onClose" />
   <label class="ren_qi_pai_ming">-人气排名-</label>
@@ -13,11 +13,11 @@
     <label class="uname">{{myData.userNick}}</label>
     <label class="uscore">{{myData.count}}</label>
   </view>
-  <view class="pai_ming_lie_biao">
+  <scroll-view class="pai_ming_lie_biao" scroll-y="{{true}}" onScrollToUpper="upper" onScrollToLower="lower" onScroll="scroll" >
     <view class="rankitem" a:for="{{rankdata}}" a:key="*this" style="top:{{index*80+'rpx;'}}">
       <label class="prank">{{item.rank}}</label>
       <label class="pname">{{item.userNick}}</label>
       <label class="pscore">{{item.count}}</label>
     </view>
-  </view>
+  </scroll-view>
 </view>
\ No newline at end of file

taobao_mini/client/components/compai_xing_bang/compai_xing_bang.js

@@ -8,36 +8,80 @@ Component({
   props: {},
   data: {
     resList: resList,
-    rankdata:[],
-    myData:{
-      rank:"--",
-      userNick:"用户x",
-      count:0
-    }
+    rankdata: [],
+    myData: {
+      rank: "--",
+      userNick: "用户x",
+      count: 0
+    },
+    pageidx: 0,
+    getpage: false
   },
   methods: {
     onClose() {
       const { onClose } = this.props;
       onClose && onClose();
     },
-  async getRankData(){
-    const rankdata = await API.getChartList().catch(res=>{
-      commonToast(res&&res.message);
-    })||{};
-    console.log("rankdata=====>",rankdata);
-    const {success,data} = rankdata;
-    if(success){
-      const {myData,list} = data;
+    upper(e) {
+      // console.log("upper=========>", e);
+    },
+    lower(e) {
+      let getpage = this.data.getpage;
+      console.log("lower=========>", e,getpage);
+      if(!getpage){
+        this.getRankData();
+      }
+    },
+    scroll(e) {
+      // let scrollTop = e.detail.scrollTop;
+      // console.log("scroll=========>", scrollTop);
+    },
+    async getRankData() {
+      let topN = 200;
+      let setpagesize = 20;
+      let pagesize = setpagesize;
+      let nleng = this.data.rankdata.length;
+      if (nleng + pagesize > topN) {
+        pagesize = topN - nleng;
+      }
+      this.setData({
+        getpage: true
+      });
+      let pageno = this.data.pageidx;
+      const rankdata = await API.getChartList(
+        {
+          pageNo: pageno,
+          pageSize: pagesize
+        }
+      ).catch(res => {
+        commonToast(res && res.message);
+      }) || {};
+      console.log("rankdata=====>", rankdata);
+      const { success, data } = rankdata;
+      if (success) {
+        const { myData, list } = data;
+        let getpage = false;
+        if (list.length < pagesize) {
+          getpage = true;
+        }
+
         let nrankdata = this.data.rankdata;
         nrankdata.push(...list);
         this.setData({
-        rankdata:nrankdata,
-        myData:myData
+          rankdata: nrankdata,
+          myData: myData,
+          getpage: getpage,
+          pageidx: pageno + 1
         });
       }
     }
   },
   didMount() {
+    this.setData({
+      getpage: false,
+      pageidx: 0,
+      rankdata: []
+    });
     this.getRankData();
   },
 

taobao_mini/client/components/comsui_pian_dan_chuang/comsui_pian_dan_chuang.js

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

taobao_mini/client/components/comxuan_ze_dan_chuang/comxuan_ze_dan_chuang.acss

@@ -41,7 +41,7 @@
   height: 114rpx;
   opacity: 1;
   display: block;
-  left: 37rpx;
+  left: 36rpx;
   top: 30rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
@@ -101,7 +101,7 @@
   height: 114rpx;
   opacity: 1;
   display: block;
-  left: 37rpx;
+  left: 36rpx;
   top: 150rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
@@ -161,14 +161,14 @@
   height: 114rpx;
   opacity: 1;
   display: block;
-  left: 37rpx;
+  left: 36rpx;
   top: 270rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .xuan_ze_dan_chuang .pintudiv1 .pic7l .picimg7l {
   width: 176rpx;
-  height: 117rpx;
+  height: 118rpx;
   opacity: 1;
   display: block;
   left: 0rpx;
@@ -188,7 +188,7 @@
 }
 .xuan_ze_dan_chuang .pintudiv1 .pic8l .picimg8l {
   width: 179rpx;
-  height: 117rpx;
+  height: 118rpx;
   opacity: 1;
   display: block;
   left: 0rpx;
@@ -208,7 +208,7 @@
 }
 .xuan_ze_dan_chuang .pintudiv1 .pic9l .picimg9l {
   width: 178rpx;
-  height: 117rpx;
+  height: 118rpx;
   opacity: 1;
   display: block;
   left: 0rpx;

taobao_mini/client/mocks/tmallCat.getChartList.json

@@ -27,6 +27,106 @@
                 "rank":4,
             "userNick":"张4",
             "count":10
+            },
+            {
+                "rank":1,
+            "userNick":"张1",
+            "count":17
+            },
+            {
+                "rank":2,
+            "userNick":"张2",
+            "count":16
+            },
+            {
+                "rank":3,
+            "userNick":"张3",
+            "count":13
+            },
+            {
+                "rank":4,
+            "userNick":"张4",
+            "count":10
+            },
+            {
+                "rank":1,
+            "userNick":"张1",
+            "count":17
+            },
+            {
+                "rank":2,
+            "userNick":"张2",
+            "count":16
+            },
+            {
+                "rank":3,
+            "userNick":"张3",
+            "count":13
+            },
+            {
+                "rank":4,
+            "userNick":"张4",
+            "count":10
+            },
+            {
+                "rank":1,
+            "userNick":"张1",
+            "count":17
+            },
+            {
+                "rank":2,
+            "userNick":"张2",
+            "count":16
+            },
+            {
+                "rank":3,
+            "userNick":"张3",
+            "count":13
+            },
+            {
+                "rank":4,
+            "userNick":"张4",
+            "count":10
+            },
+            {
+                "rank":1,
+            "userNick":"张1",
+            "count":17
+            },
+            {
+                "rank":2,
+            "userNick":"张2",
+            "count":16
+            },
+            {
+                "rank":3,
+            "userNick":"张3",
+            "count":13
+            },
+            {
+                "rank":4,
+            "userNick":"张4",
+            "count":10
+            },
+            {
+                "rank":1,
+            "userNick":"张1",
+            "count":17
+            },
+            {
+                "rank":2,
+            "userNick":"张2",
+            "count":16
+            },
+            {
+                "rank":3,
+            "userNick":"张3",
+            "count":13
+            },
+            {
+                "rank":4,
+            "userNick":"张over",
+            "count":10
             }
         ]
     }

taobao_mini/client/mocks/tmallCat.getInviteAwardsList.json

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

taobao_mini/client/mocks/tmallCat.getUserCardInfo.json

@@ -14,7 +14,7 @@
             "8":0,
             "9":0
         },
-        "collectedCount": 2,
+        "collectedCount": 1,
         "canTakeRankPrize":false,
         "shoesType": 1,
         "inviteResult": {

taobao_mini/client/mocks/tmallCat.takeRankPrize.json

@@ -4,6 +4,6 @@
     "data": {
         "name": "奖品名称",
         "type": 1,
-        "image": ""
+        "image": "//yun.duiba.com.cn/spark/assets/原图机甲.25fe086c250795de2683c7aba735a263ebfdc1b3.jpg"
     }
 }
\ No newline at end of file

taobao_mini/client/pages/pageshou_ye/pageshou_ye.acss

@@ -12,11 +12,12 @@
   left: 0rpx;
   right: 0rpx;
   bottom: 0rpx;
-  width: 750rpx;
-  height: 1624rpx;
+  /* width: 750rpx; */
+  /* height: 1624rpx; */
   display: block;
   position: fixed;
   margin: auto;
+  overflow: auto;
 }
 .shou_ye .bg {
   width: 750rpx;
@@ -196,18 +197,18 @@
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .shou_ye .contnode .pintudiv .pic1 {
-  width: 176rpx;
+  width: 178rpx;
   height: 114rpx;
   opacity: 1;
   display: block;
-  left: 37rpx;
+  left: 36rpx;
   top: 30rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .shou_ye .contnode .pintudiv .pic1 .picimg1 {
-  width: 176rpx;
-  height: 114rpx;
+  width: 178rpx;
+  height: 116rpx;
   opacity: 1;
   display: block;
   left: 0rpx;
@@ -249,7 +250,7 @@
   text-align: center;
 }
 .shou_ye .contnode .pintudiv .pic2 {
-  width: 176rpx;
+  width: 178rpx;
   height: 114rpx;
   opacity: 1;
   display: block;
@@ -260,7 +261,7 @@
 }
 .shou_ye .contnode .pintudiv .pic2 .picimg2 {
   width: 179rpx;
-  height: 114rpx;
+  height: 116rpx;
   opacity: 1;
   display: block;
   left: 0rpx;
@@ -313,7 +314,7 @@
 }
 .shou_ye .contnode .pintudiv .pic3 .picimg3 {
   width: 179rpx;
-  height: 114rpx;
+  height: 116rpx;
   opacity: 1;
   display: block;
   left: 0rpx;
@@ -355,11 +356,11 @@
   text-align: center;
 }
 .shou_ye .contnode .pintudiv .pic4 {
-  width: 176rpx;
+  width: 178rpx;
   height: 114rpx;
   opacity: 1;
   display: block;
-  left: 37rpx;
+  left: 36rpx;
   top: 150rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
@@ -514,17 +515,17 @@
   text-align: center;
 }
 .shou_ye .contnode .pintudiv .pic7 {
-  width: 176rpx;
+  width: 178rpx;
   height: 114rpx;
   opacity: 1;
   display: block;
-  left: 37rpx;
+  left: 36rpx;
   top: 270rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .shou_ye .contnode .pintudiv .pic7 .picimg7 {
-  width: 176rpx;
+  width: 178rpx;
   height: 117rpx;
   opacity: 1;
   display: block;
@@ -1113,6 +1114,16 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+.shou_ye .botnode .homedi .xinshou_li_he {
+  width: 99rpx;
+  height: 101rpx;
+  opacity: 1;
+  display: block;
+  left: 48rpx;
+  top: 0rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
 .shou_ye .botnode .homedi .liang_xi_li_he {
   width: 99rpx;
   height: 101rpx;
@@ -1249,7 +1260,7 @@
   transform-origin: 0rpx 0rpx 0rpx;
 }
 .shou_ye .botnode .homedi .lei_ji_zhao_huangro .lei_ji_zhao_huan_jin_du_tu {
-  width: 300rpx;
+  width: 438rpx;
   height: 30rpx;
   opacity: 1;
   display: block;
@@ -1258,9 +1269,9 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
   mask-image: url(//yun.duiba.com.cn/spark/assets/黑底.54ea847f28fc2b31b03f85323ae24a5cba93c63b.png);
-  mask-size: 300rpx 30rpx;
+  mask-size: 438rpx 30rpx;
   mask-repeat: no-repeat;
-  mask-position: -300rpx 0rpx;
+  mask-position: -438rpx 0rpx;
 }
 .shou_ye .botnode .homedi .lei_ji_zhao_huangro .zhao_huanl1 {
   width: 120rpx;

taobao_mini/client/pages/pageshou_ye/pageshou_ye.axml

-<view class="shou_ye" disable-scroll="{{canscroll}}">
+<view class="style1">
+  <view class="shou_ye" disable-scroll="{{canscroll}}">
   <image class="bg" src={{resList['05608aab-d250-45fe-9cd0-6c55b3a7b821'].url}} />
   <view class="homescroll" />
   <view class="topnode">
@@ -84,7 +85,7 @@
     </view>
     <image class="whitept" a:if="{{whitept_v}}" src={{resList['56d322ae-bfcb-4d03-b5bc-81603cb2fe5b'].url}} />
     <view class="ptnode">
-      <image class="showallimg ptimgani" a:if="{{ptimg_v}}" src={{resList['jijia7'].url}} />
+      <image class="showallimg ptimgani" a:if="{{ptimg_v}}" src={{ptimgbig}} />
     </view>
   </view>
   <view class="botnode">
@@ -131,8 +132,9 @@
       <!--<image class="sure2" src={{resList['3e0853e3-fee0-46a2-89f6-734ae01e426f'].url}} /> -->
     </view>
     <view class="homedi" a:if="{{selected==2}}">
-      <image class="liang_xi_li_he" a:if="{{!canTakeRankPrize&&inviteCount==0}}" src={{resList['2aecf93a-ded0-413b-8ce8-d93d1c9d3725'].url}} />
-      <image class="jin_li_ren_qi_li_he" a:if="{{canTakeRankPrize}}" src={{resList['da0ca4e4-85fe-49da-85b8-d9cf493ec6a2'].url}} />
+    <image class="xinshou_li_he" a:if="{{giftype==1}}" src={{resList['fdb09ae1-f82f-45c8-bb48-07e2ebd83cc7'].url}} onTap="onOpenGift" />
+      <image class="liang_xi_li_he" a:if="{{giftype==2}}" src={{resList['2aecf93a-ded0-413b-8ce8-d93d1c9d3725'].url}} onTap="onOpenGift" />
+      <image class="jin_li_ren_qi_li_he" a:if="{{giftype==3}}" src={{resList['da0ca4e4-85fe-49da-85b8-d9cf493ec6a2'].url}} onTap="onOpenGift" />
       <view class="ji_sui_piangro" onTap="collectSp" a:if="{{collectedCount!=9}}">
         <image class="li_ji_ji_sui_pian" src={{resList['7529fa18-551f-43eb-8fc6-315badcf1e8c'].url}} />
         <view class="redinfo">
@@ -196,6 +198,7 @@
     </view>
   </view>
 </view>
+</view>
 <dialog-modal a:if="{{showdia}}"></dialog-modal>
 <view class="page-game" disable-scroll="true">
   <canvas disable-scroll="true" id="canvas" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
@@ -203,8 +206,8 @@
 </view>
 <rule-modal a:if="{{rule_v}}" onClose="closeRule" ruletxt={{rule}}></rule-modal>
 <rank-modal a:if="{{rank_v}}" onClose="closeRank"></rank-modal>
-<attion-modal a:if="{{attion_v}}" onClose="closeAttion" onOpenJlGift="onOpenJlGift" prizeimg="{{prizeimg}}" prizename="{{prizename}}" prizetype="{{prizetype}}" btntype="{{prizebtntype}}"></attion-modal>
+<attion-modal a:if="{{attion_v}}" onClose="closeAttion" onOpenJlGift="onOpenJlGift" prizeimg="{{prizeimg}}" prizename="{{prizename}}" prizetype="{{prizetype}}" btntype="{{prizebtntype}}" attionfrom="{{attionfrom}}" ></attion-modal>
 <info-modal a:if="{{info_v}}" onClose="closeInfo" onShareFriends="shareAct" infobtntype="{{infobtntype}}" infotopshow="{{infotopshow}}" infotit="{{infotit}}"></info-modal>
 <sp-modal a:if="{{sp_v}}" onClose="closeSp" onCollectSp="onCollectSp" onShareSp="onShareSp" onJoinGame="onJoinGame" onJoinVip="onJoinVip" onUpdateUinfo="getUserCardInfo" cardType={{cardType}} israre={{israre}} btntype={{btntype}} spimg={{spimg}} nearchashare={{nearchashare}} nearchaprize={{nearchaprize}} ></sp-modal>
-<gift-modal a:if="{{gift_v}}" onClose="closeGift" onOpenGift="onOpenGift"></gift-modal>
+<gift-modal a:if="{{gift_v}}" onClose="closeGift" onOpenGift="getOpenNgift"></gift-modal>
 <choose-modal a:if="{{choose_v}}" onClose="closeChoose" onPickShoes="pickShoesComp" selshoesidx="{{nselid}}"></choose-modal>
\ No newline at end of file

taobao_mini/client/pages/pageshou_ye/pageshou_ye.js

@@ -26,7 +26,7 @@ Page({
     gift_v: false,//gift
     choose_v: false,//choose
     showdia: false,//有无弹窗层
-    canscroll:false,//可否滑动
+    canscroll: false,//可否滑动
 
     //活动基本信息
     rule: "",
@@ -44,13 +44,14 @@ Page({
     ptimg_v: false,//拼图整图
     ptimg_ani: false,//拼图动画
     //用户信息
-    selected: 2,//0还未获得信息，1用户未选鞋，2用户已选鞋
-    sharepropos: -100 + 'rpx 0rpx',//召唤进度maskpos
+    selected: 0,//0还未获得信息，1用户未选鞋，2用户已选鞋
+    sharepropos: -438 + 'rpx 0rpx',//召唤进度maskpos
     nearchashare: 0,//再召唤xx好友数量
     nearchaprize: "",//再召唤xx好友得奖励x
     isVip: false,
     vipLink: "",
-    giftype: 1,//1-新手礼盒，2-惊喜礼盒，3-锦鲤礼盒
+    giftype: 3,//1-新手礼盒，2-惊喜礼盒，3-锦鲤礼盒，0-都不显示
+    ptimgbig:"",//选中的鞋子big
 
     nickname: "张三",
     avatar: "//yun.duiba.com.cn/spark/assets/28092c7c919a2c8ea9b750fb79abd2416ba8f90f.png",
@@ -74,6 +75,7 @@ Page({
     prizename: "",
     prizetype: "",
     prizebtntype: 1,
+    attionfrom:"",//啥功能gift--人气抽奖，prize--中奖弹窗
     //info弹窗
     infobtntype: 1,//1知道了，2召唤好友，3马上去抽碎片
     infotopshow: false,//顶部恭喜你是否显示
@@ -363,13 +365,15 @@ Page({
         }
       }
       let sharepro = inviteCount / list[list.length - 1].times;
+      // console.log("代码暂存233====》",sharepro,inviteCount,list[list.length-1].times);
       if (sharepro > 1) sharepro = 1;
-      let sharepropos = 300 * (sharepro - 1) + 'rpx 0rpx';
+      let sharepropos = 438 * (sharepro - 1) + 'rpx 0rpx';
 
       let nearchatxt = "";
       if (nearchashare > 0) {
         nearchatxt = "再召唤" + nearchashare + "好友必得" + nearchaprize;
       }
+      console.log("sharepropos", sharepropos);
       this.setData({
         inviteAwardList: list,
         inviteCount: inviteCount,
@@ -394,16 +398,33 @@ Page({
    * 打开礼盒
    */
   async onOpenGift() {
-    console.log("打开礼盒");
     let giftype = this.data.giftype;
-    if (giftype == 1) {
-      await this.getOpenNgift();
+    console.log("打开礼盒", giftype);
+
+    if (giftype == 1) {//新手
+      this.openGift();
+    } else if (giftype == 2) {//惊喜
+      this.setData({
+        infobtntype: 1,
+        infotopshow: true,
+        infotit: "解锁了惊喜礼盒\n召唤1位好友即可获得3次抽取碎片机会"
+      })
+      this.openInfo();
+    } else if (giftype == 3) {//人气锦鲤
+      this.setData({
+        attionfrom:"gift",
+        prizebtntype:2,
+        prizeimg:resList["shanhaibig"].url
+      });
+      this.openAttion();
     }
   },
   /**
    * 领取新人奖励
    */
   async getOpenNgift() {
+    console.log("领取新人礼===========》？");
+    //领取新人礼
     await this.checkIsVip();
     if (this.data.isVip) {
 
@@ -497,7 +518,7 @@ Page({
   showDialog(_v) {
     this.setData({
       showdia: _v,
-      canscroll:_v
+      canscroll: _v
     });
     // console.log("切换滑动=====>",this.data.canscroll);
   },
@@ -615,11 +636,12 @@ Page({
     if (dataset) {
       let sel = Number(dataset.sel);
       if (sel && sel != this.data.nselid) {
-        let nselname = ["jijia", "jianzhen", "erciyuan", "shanhai", "shanhai"][sel - 1];
-
+        let nselname = ["jijia", "jianzhen", "erciyuan", "shanhai", "tiancheng"][sel - 1];
+        let ptimgbig = resList[nselname+"big"].url
         this.setData({
           nselid: sel,
-          selshoesname: nselname
+          selshoesname: nselname,
+          ptimgbig:ptimgbig
         });
       }
     }
@@ -665,7 +687,12 @@ Page({
         btntype: btntype
       });
       this.showDialog(true);
+      try {
         this.onStartAni();
+      } catch (e) {
+
+      }
+
       setTimeout(() => {
         this.openSp();
       }, 500);
@@ -731,14 +758,16 @@ Page({
    * @param {*} success 
    * @param {*} data 
    */
-  showPrizePage(success, data, type = "prize") {
+  showPrizePage(success, data, atype = "prize") {
     if (success) {
       //中奖了
       let { name, type, image } = data;
       this.setData({
         prizeimg: image,
         prizename: name,
-        prizetype: type
+        prizetype: type,
+        prizebtntype:1,
+        attionfrom:"prize",
       });
       if (type == 5) {//谢谢参与
         this.setData({
@@ -748,7 +777,7 @@ Page({
         })
         this.openInfo();
       } else {
-        if (type == "prize") {
+        if (atype == "prize") {
           this.openAttion();
         } else {//动效
           this.setData({

taobao_mini/client/resconfig/resList.js

@@ -110,7 +110,7 @@ const resList = {
   '69b5fe6c-10f6-418e-8901-370b52d5f059': {
     name: '奖品btn',
     ext: '.png',
-    url: '//yun.duiba.com.cn/spark/assets/进度条条.82d19452ff572e992652467612488b7ef06783d6.png',
+    url: '//yun.duiba.com.cn/spark/assets/E04D9280-E3E3-4DA4-B451-C34D0BED5C36.b86b384a3332c62919b31ac042030d03c044d595.png',
     uuid: '69b5fe6c-10f6-418e-8901-370b52d5f059',
   },
   'fb7bd4b1-bbab-4fc3-ad4c-7b61a732205c': {
@@ -634,6 +634,96 @@ const resList = {
     ext: '.png',
     url: '//yun.duiba.com.cn/spark/assets/白色.08a8b4bea2ef5778966eba1b96a40a207041c1f2.png',
     uuid: '1e4870aa-4859-4541-a3b8-adc29113a946'
+  },
+  'tiancheng1': {
+    name: 'tiancheng_1_spe',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_1_spe.07e365221bbd8a8449ea1a13e0b8eab6f6858904.jpg',
+    uuid: '93ec649f-6d6b-47db-96c8-3770fd149208'
+  },
+  'tiancheng2': {
+    name: 'tiancheng_2_nor',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_2_nor.fc3e85b9277a8be1590f7f1d9376ee86de40ccf4.jpg',
+    uuid: 'c260fd10-04e5-4f19-a0e2-d7e9ea51f72d'
+  },
+  'tiancheng3': {
+    name: 'tiancheng_3_nor',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_3_nor.bebedb8829231f242b00c4e5c0ce6371f813b822.jpg',
+    uuid: '2d83291f-1ad2-4626-b3dd-d4cdf1555487'
+  },
+  'tiancheng4': {
+    name: 'tiancheng_4_nor',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_4_nor.675bd610a481cb99e1773619af7270fedfb4f563.jpg',
+    uuid: '741da40f-6c53-49ea-9c73-e446dfd0de58'
+  },
+  'tiancheng5': {
+    name: 'tiancheng_5_nor',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_5_nor.b0384b0e8069ee0d6d153a91bbf92c51581b245c.jpg',
+    uuid: '96a354b2-5cc4-497a-9420-c45b2d96cdb8'
+  },
+  'tiancheng6': {
+    name: 'tiancheng_6_spe',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_6_spe.4ed3cbfb9f66ac333cd1b068d606a6771417c41b.jpg',
+    uuid: 'aa588bf0-28ea-46a2-99ed-6b085301d597'
+  },
+  'tiancheng7': {
+    name: 'tiancheng_7_nor',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_7_nor.0fc80998ec82a292665ef973442d6f733d5b212e.jpg',
+    uuid: '78799dc6-8eed-4d63-90f6-df52bf69c61c'
+  },
+  'tiancheng8': {
+    name: 'tiancheng_8_spe',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_8_spe.c41c098130ac5db11b3ba3549bad752754ad73ee.jpg',
+    uuid: 'bc62d4f5-c4ef-4880-a69c-b5fdb47d452d'
+  },
+  'tiancheng9': {
+    name: 'tiancheng_9_nor',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/tiancheng_9_nor.1232e7992f5fed112413bd074deb5b7da481113b.jpg',
+    uuid: '422668f3-2d66-4c31-81b8-8aa583be9476'
+  },
+  'fdb09ae1-f82f-45c8-bb48-07e2ebd83cc7': {
+    name: '新手礼盒',
+    ext: '.png',
+    url: '//yun.duiba.com.cn/spark/assets/新手礼盒.eafd6af42c41bf30ebc269bdbc28b084bf1b2244.png',
+    uuid: 'fdb09ae1-f82f-45c8-bb48-07e2ebd83cc7'
+  },
+  'shanhaibig': {
+    name: '原图山海',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/原图山海.96afc140d81d7a0dccc61940fd8fb6c1f7357739.jpg',
+    uuid: 'a985c8a1-1e7d-4122-bd47-eb46bbf713f3'
+  },
+  'erciyuanbig': {
+    name: '原图二次元',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/原图二次元.a0ae5554ff69d2bd72fe3ad759da2fe6c914f280.jpg',
+    uuid: '92c29ab8-a2f0-4663-b7a8-ed00a2be6025'
+  },
+  'jijiabig': {
+    name: '原图机甲',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/原图机甲.25fe086c250795de2683c7aba735a263ebfdc1b3.jpg',
+    uuid: '60ae510a-d865-403c-a729-0daac0c9cd9f'
+  },
+  'jianzhenbig': {
+    name: '原图减震',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/原图减震.110a56d706e0f4eccb3a9b65fbd8562008e45834.jpg',
+    uuid: 'd070c22a-0436-491d-b4f5-274a2ff02e18'
+  },
+  'tianchengbig': {
+    name: '原图天乘',
+    ext: '.jpg',
+    url: '//yun.duiba.com.cn/spark/assets/原图天乘.3ec8bc3dce803aa6e120a415e9b1118e9f9d388c.jpg',
+    uuid: 'c221bde6-5afa-46c4-885b-0ffcd5402cc2'
   }
 };
 export default resList;