1

egret/index.html

@@ -53,7 +53,7 @@
     <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
     <script src="//statics-web.iqiyi.com/common/jssdk/iqiyiJsBridge-v2-min.js"></script>
     <script>
-        window['hbRainTime'] = 20;
+        window['hbRainTime'] = 1;
         window['hbTips'] = 88.8;
 
         function iqiyiShare() {

egret/resource/skins/HbNoPrizeSkin.exml

@@ -10,7 +10,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="ok_btn" label="" y="701" x="102">
+	<e:Button id="ok_btn" label="" y="701" x="102" scaleY="1" scaleX="1">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="hbNoPrize_ok_btn_png" source.down="hbNoPrize_ok_btn_png" source.disabled="hbNoPrize_ok_btn_png"/>

egret/src/HongbaoRain/HbNoPrize.ts

@@ -33,9 +33,11 @@ export default class HbNoPrize extends Panel {
         if(extra.shared) {
             this.share_btn.visible = false;
             this.shareTips.visible = false;
+            this.ok_btn.x = 240;
         } else {
             this.share_btn.visible = true;
             this.shareTips.visible = true;
+            this.ok_btn.x = 102;
         }
     }
 
@@ -52,7 +54,7 @@ export default class HbNoPrize extends Panel {
                         console.log(res.kShareChannel);
                         if(res.kShareChannel != 'copyURL') {    // 如果是复制链接，则不算分享成功
                             NetManager.ins.iqiyiHbRainAddTime((success, res) => {
-                                SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE);
+                                this.onTouchClose();
                                 if(!success) {
                                     showToast('分享次数达到上限');
                                     return;
@@ -74,7 +76,6 @@ export default class HbNoPrize extends Panel {
 
     onTouchClose(): any {
         super.onTouchClose();
-        NetManager.ins.clickLog(getlogItem(13));
         SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE);
     }
 

egret/src/HongbaoRain/HbPrize.ts

@@ -37,9 +37,11 @@ export default class HbPrize extends Panel {
         if(extra.shared) {
             this.share_btn.visible = false;
             this.shareTips.visible = false;
+            this.ok_btn.x = 146;
         } else {
             this.share_btn.visible = true;
             this.shareTips.visible = true;
+            this.ok_btn.x = 0;
         }
         // console.log(this.data);
         this.prizeImg.source = this.data.imgUrl;
@@ -59,7 +61,7 @@ export default class HbPrize extends Panel {
                         console.log(res.kShareChannel);
                         if(res.kShareChannel != 'copyURL') {    // 如果是复制链接，则不算分享成功
                             NetManager.ins.iqiyiHbRainAddTime((success, res) => {
-                                SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE);
+                                this.onTouchClose();
                                 if(!success) {
                                     showToast('分享次数达到上限');
                                     return;
@@ -84,7 +86,6 @@ export default class HbPrize extends Panel {
 
     onTouchClose(): any {
         super.onTouchClose();
-        NetManager.ins.clickLog(getlogItem(13));
         SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE);
     }
 

mock/json/iqiyiAjaxElement.json

@@ -10,7 +10,7 @@
         },
         "extra": {
             "shared": false,
-            "joinCount": 0,
+            "joinCount": 1,
             "nextTimestamp": 1574684710000,
             "currentTimeSlot": 5
         },