代码暂存

taobao_mini/client/.kaitian/compileMode.json

 {
-  "current": null,
+  "current": 0,
   "modes": [
     {
       "title": "分享进",

taobao_mini/client/components/comsui_pian_dan_chuang/comsui_pian_dan_chuang.acss

@@ -90,6 +90,16 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+.sui_pian_dan_chuang .zhulimg {
+  width: 500rpx;
+  height: 500rpx;
+  opacity: 1;
+  display: block;
+  left: 125rpx;
+  top: 50rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
 .sui_pian_dan_chuang .guan_bi_an_niu6 {
   width: 48rpx;
   height: 48rpx;

taobao_mini/client/components/comsui_pian_dan_chuang/comsui_pian_dan_chuang.axml

 <view class="sui_pian_dan_chuang modal-animate-fade-in diacontmidpos" disable-scroll="true">
-        <label class="{{btntype!=5?'sui_piantit':'sui_piantit1'}}">{{tit}}</label>
-        <label class="{{btntype!=5?'sui_pian_futit':'sui_pian_futit1'}}">{{subtit}}</label>
+        <label a:if="{{btntype!=5}}"  class="{{btntype!=5?'sui_piantit':'sui_piantit1'}}">{{tit}}</label>
+        <label a:if="{{btntype!=5}}" class="{{btntype!=5?'sui_pian_futit':'sui_pian_futit1'}}">{{subtit}}</label>
         <image class="image" src={{spimg}} />
         <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="zhulimg" a:if="{{btntype==5}}" src={{resList['34441703-155f-4d54-88d4-3561749925ac'].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" />

taobao_mini/client/components/comxin_ren_li_bao/comxin_ren_li_bao.axml

 <view class="xin_ren_li_bao modal-animate-zoom-in diacontmidpos" disable-scroll="true">
   <label class="li_baotit">集碎片赢特步新品同款鞋</label>
-  <label class="li_bao_futit">集齐新品碎片既有机会带TA回家哦</label>
+  <label class="li_bao_futit">送你一个新手卡包，打开有惊喜哦</label>
   <image class="li_baoimg" src={{resList['ecf30aa1-6e23-463e-9d24-e81e1086fa9e'].url}} />
   <image class="guan_bi_an_niu7 btnclickStyle" src={{resList['6d394fc5-a3b4-4b85-a9ae-7ff535552bf1'].url}} onTap="onClose" />
   <image class="da_kai_qia_bao btnclickStyle" src={{resList['fca0bd73-87f6-4442-bc18-68c915b04f5c'].url}} onTap="onOpenGift" />

taobao_mini/client/components/comxuan_ze_dan_chuang/comxuan_ze_dan_chuang.axml

@@ -31,7 +31,7 @@
           </view>
         </view>
         <label class="xuan_zetit">你选择了{{shoesname}}系列新品</label>
-        <label class="xuan_ze_futit">集齐新品碎片既有机会带TA回家哦</label>
+        <label class="xuan_ze_futit">集齐新品碎片即有机会带TA回家哦</label>
         <image class="xuan_ze_ji_sui_pian btnclickStyle" src={{resList['227d18ca-90be-41de-bfe5-04fd4e8f8d14'].url}} onTap="chooseShoes" />
         <image class="guan_bi_an_niu1 btnclickStyle" src={{resList['6d394fc5-a3b4-4b85-a9ae-7ff535552bf1'].url}} onTap="onClose" />
       </view>
\ No newline at end of file

taobao_mini/client/components/prizeModal/prizeModal.axml

@@ -6,11 +6,11 @@
         <image class="my-prize-avatar" src="{{item.image}}"/>
         <view class="my-prize-content">
           <label class="my-prize-name">{{item.name}}</label>
-          <!-- <view class="my-prize-subtitle"> -->
-            <!-- <label class="my-prize-code">奖品编码：{{item._id}}</label> -->
+          <view class="my-prize-subtitle">
+            <label class="my-prize-code">奖品编码：{{item._id}}</label>
             <!-- 复制按钮 -->
-            <!-- <image class="my-prize-copy" data-text="{{item._id}}" onTap="handleCopyId" src="{{task.image.copyIcon}}" /> -->
-          <!-- </view> -->
+            <image class="my-prize-copy" data-text="{{item._id}}" onTap="handleCopyId" src="{{task.image.copyIcon}}" />
+          </view>
           <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FAILURE}}">{{item.remark}}</view>
           <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.REPEAT || (item.drawStatus === PRIZE_DRAW_STATUS_MAP.RECEIVE)}}">请于{{endTime}}前领取</view>
           <view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FINISHED }}">奖品已过期失效</view>

taobao_mini/client/pages/pageshou_ye/pageshou_ye.js

@@ -171,6 +171,7 @@ Page({
     if (dialogsData.length > 0) {
       let firstdianame = dialogsData[0].dianame;
       console.log("序列弹窗===》", firstdianame, this.data.selected);
+      console.log("自动弹窗233====》",firstdianame,this.data.selected);
       if (firstdianame != "zhuli" && this.data.selected != 2) {
         this.setData({
           needattion: true
@@ -199,6 +200,11 @@ Page({
         this.setData({
           dialogsData: dialogsData
         });
+        if(dianame=="zhuli"&&this.data.selected!=2){
+          this.setData({
+            needattion:true
+          });
+        }
       }, 200);
       //dianame切换弹窗
     }
@@ -207,7 +213,7 @@ Page({
   checkOpenAttion() {
     let needattion = this.data.needattion;
     let dialogsData = this.data.dialogsData;
-
+    console.log("自动弹窗233=====》检测","准备弹出",dialogsData.length,needattion);
     if (dialogsData.length > 0 && needattion) {
       this.setData({
         needattion: false
@@ -513,6 +519,7 @@ Page({
       if (myid != inid) {
         let invitename = ["jijia", "jianzhen", "erciyuan", "shanhai", "tiancheng"][Number(app.shoesType) - 1];
         let spimg = resList[invitename + "big"].url;
+        console.log("自动弹窗233=====》","zhuli");
         this.addDialogsData({
           cardType: 1,
           israre: 3,
@@ -806,6 +813,7 @@ Page({
       // if (res1 && res1.data) {
       //   this.addDialogsData({}, "xinshouprize");
       // } else {
+        console.log("自动弹窗233=====》","xinshou");
       this.addDialogsData({}, "xinshou");
       // }
     } else {
@@ -1533,6 +1541,7 @@ Page({
     if (success) {
       const { showTakeSurprisePrize, inviteResult } = data;
       if (showTakeSurprisePrize) {
+        console.log("自动弹窗233=====》","jinxi");
         this.addDialogsData({
           infobtntype: 1,
           infotopshow: true,
@@ -1544,6 +1553,7 @@ Page({
         if (inviteResult.addDrawTimes > 0) {
           infotit += "\n获得" + inviteResult.addDrawTimes + "次抽碎片机会";
         }
+        console.log("自动弹窗233=====》","invite");
         this.addDialogsData({
           infobtntype: 1,
           infotopshow: true,

taobao_mini/client/resconfig/resList.js

@@ -731,11 +731,11 @@ const resList = {
     url: '//yun.duiba.com.cn/spark/assets/为他助力.57006fd0777754592e6de0ac498a4dc9955c1be7.png',
     uuid: 'ae2a2e5c-3af2-4861-82a8-8d863c323db6'
   },
-  '8b307a60-7bbb-42bb-9da7-1e7bf5ce7600': {
-    name: '助力图',
+  '34441703-155f-4d54-88d4-3561749925ac': {
     ext: '.jpg',
-    url: '//yun.duiba.com.cn/spark/assets/助力图.1d7113d24fa34d4d2bf141aa60624afd6f93804e.jpg',
-    uuid: '8b307a60-7bbb-42bb-9da7-1e7bf5ce7600'
+    url: '//yun.duiba.com.cn/spark/assets/新助力图.f553fbe8c0ea6bd3d03c858a5a6163046e53e549.jpg',
+    uuid: '34441703-155f-4d54-88d4-3561749925ac',
+    name: '新助力图'
   }
 };
 export default resList;