-a

egret/publish.js

@@ -25,8 +25,8 @@ class TuiaAutoUpload {
         var _this = this;
         this.client = new OSS({
             region: 'oss-cn-hangzhou',
-            accessKeyId: 'LTAIqO2wblIxQvwc',
-            accessKeySecret: '4brsaSRbRpjxw3oDIxJi6bNMcndIR6',
+            accessKeyId: 'LTAI4Fw25WcfcGv7FvcHoiHK',
+            accessKeySecret: 'NZk1NtT9J5HFaAolNbtQdzTzLLvLYm',
             bucket: _this.type === 'prod' ? 'duiba' : 'daily-duiba'
         });
         this.bar = new ProgressBar(chalk.yellow(`  文件上传中 [:bar] :current/${this.files().length} :percent :elapseds`), {

egret/src/Panels/assistancePanel/AssistancePanel.ts

@@ -31,12 +31,9 @@ export default class AssistancePanel extends Panel {
         this.failTip.visible = !this.data.success;
         this.failTip.text = this.data.failTips;
         if(this.data.success) {
-<<<<<<< HEAD
-            NetManager.ins.showLog(getlogItem(32));
-            window['_hmt'].push(['_trackEvent', '分享打开页面-为好友助力按钮', 'showLog', '曝光']);
-=======
             NetManager.ins.showLog(getlogItem(35));
->>>>>>> a01c4bd41d5c68df4758ce0b47441794ead08eaf
+            window['_hmt'].push(['_trackEvent', '助力成功按钮', 'showLog', '曝光']);            
+
         } else {
             // "200001": "您的助力已经达到上限了哦～",
 
@@ -82,12 +79,8 @@ export default class AssistancePanel extends Panel {
     private onTap_clickJoin() {
         console.log('我也要去打榜');
         if(this.data.success) {
-<<<<<<< HEAD
-            NetManager.ins.showLog(getlogItem(32));
-            window['_hmt'].push(['_trackEvent', '分享打开页面-为好友助力按钮', 'showLog', '曝光']);
-=======
             NetManager.ins.clickLog(getlogItem(35));
->>>>>>> a01c4bd41d5c68df4758ce0b47441794ead08eaf
+            window['_hmt'].push(['_trackEvent', '助力成功按钮', 'clickLog', '点击']);   
         } else {
             if(this.data.code == '200001') {
                 NetManager.ins.clickLog(getlogItem(33))
@@ -98,10 +91,12 @@ export default class AssistancePanel extends Panel {
             }
         }
 
-        //window.location.href = window['activeUrl'];
-        window['wx'].miniProgram.navigateTo({
-            url: 'pages/gamePage/gamePage'
-        });
+        setTimeout(() => {
+            window.location.href = window['activeUrl'];
+        }, 1000);
+        // window['wx'].miniProgram.navigateTo({
+        //     url: 'pages/gamePage/gamePage'
+        // });
         this.hidePanel();
     }
 }
\ No newline at end of file

egret/src/Scenes/IndexScene/IndexScene.ts

@@ -24,6 +24,7 @@ export default class IndexScene extends Scene {
 
     private initUI(): void {
         NetManager.ins.showLog(getlogItem(32));
+        window['_hmt'].push(['_trackEvent', '分享打开页面-为好友助力按钮', 'showLog', '曝光']);
 
         // this.main.height = 750 / window.innerWidth * window.innerHeight;
 
@@ -47,6 +48,8 @@ export default class IndexScene extends Scene {
     private onTouchTap() {
         btnDelay(this.btn);
         NetManager.ins.clickLog(getlogItem(32));
+        window['_hmt'].push(['_trackEvent', '分享打开页面-为好友助力按钮', 'clickLog', '点击']);
+
         let shareCode = getRequestByKey('shareCode');
         // shareCode
         //     ?