1

.buildrc.js

@@ -17,6 +17,7 @@ module.exports = {
         '/activityPlugin/*': 'http://localhost:3000',
         '/aaw/*': 'http://localhost:3000',
         '/crecord/*': 'http://localhost:3000',
+        '/chw/*': 'http://localhost:3000',
         '/summer/*': 'http://localhost:3000'
     }
 }
\ No newline at end of file

egret/libs/new_wx/onNotSuccess.ts

@@ -5,24 +5,24 @@ import PanelCtrl from "./ctrls/panelCtrl";
 import { ModuleTypes } from "./types/sceneTypes";
 
 export default (data?: Data, netname?: NetName) => {
-    if (!data) {
+    // if (!data) {
         return showToast('网络异常\n请隔一段时间再尝试');
-    }
-    if (data.code == 'E999999999')//系统级别错误  系统异常，\n请刷新后重试。
-        showToast('网络异常\n请隔一段时间再尝试');
-    else if (data.code == 'E100201001')
-        showToast('请登录后重试。')
-    else if (data.code == 'E100201004')
-        showToast('无权参与此活动')
-    else if (data.code == 'E1002090002')
-        PanelCtrl.instance.show('Alert3')
-    else if (data.code == 'E1002090003')
-        PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL)
-    else if (data.code == 'E100201007') {
-        showToast(`对不起\n您的${CFG.unitName}不足`);
-    }
-    else if (data.code == 'E100202007' || data.code == 'E100202008' || data.code == 'E100202009' || data.code == 'E100202010')
-        showToast('对不起\n您的次数不足。')
-    else//其他异常
-        showToast('网络异常\n请隔一段时间再尝试')
+    // }
+    // if (data.code == 'E999999999')//系统级别错误  系统异常，\n请刷新后重试。
+    //     showToast('网络异常\n请隔一段时间再尝试');
+    // else if (data.code == 'E100201001')
+    //     showToast('请登录后重试。')
+    // else if (data.code == 'E100201004')
+    //     showToast('无权参与此活动')
+    // else if (data.code == 'E1002090002')
+    //     PanelCtrl.instance.show('Alert3')
+    // else if (data.code == 'E1002090003')
+    //     PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL)
+    // else if (data.code == 'E100201007') {
+    //     showToast(`对不起\n您的${CFG.unitName}不足`);
+    // }
+    // else if (data.code == 'E100202007' || data.code == 'E100202008' || data.code == 'E100202009' || data.code == 'E100202010')
+    //     showToast('对不起\n您的次数不足。')
+    // else//其他异常
+    //     showToast('网络异常\n请隔一段时间再尝试')
 }
\ No newline at end of file

egret/libs/tw/manager/NetManager.ts

@@ -1072,7 +1072,7 @@ export class NetManager extends ABNetManager {
             dataType: 'json',
             param: param,
             callback: callback,
-            hideMsg:true
+            // hideMsg:false
         };
         this.send(net);
     }
@@ -1093,9 +1093,13 @@ export class NetManager extends ABNetManager {
     //2 3
     public yyh_assist1_doAssist(callback: Function,assistItemId,dreamId,credits,ticketNum): void {
         const param: any = { assistItemId:assistItemId,dreamId:dreamId,credits:credits,ticketNum:ticketNum};
+        let key = 'doAssist';
+        if(credits > 1) {
+            key+=credits;
+        }
         const net: INetData = {
             name: 'yyh_assist1_doAssist',
-            uri: '/projectx/'+window['projectID']+'/assist_1/doAssist.do?_=' +new Date().getTime(),
+            uri: '/projectx/'+window['projectID']+'/assist_1/'+key+'.do?_=' +new Date().getTime(),
             type: 'get',
             dataType: 'json',
             param: param,
@@ -1114,7 +1118,7 @@ export class NetManager extends ABNetManager {
             dataType: 'json',
             param: param,
             callback: callback,
-            // hideMsg:true
+            hideMsg:false
         };
         this.send(net);
     }

egret/src/DreamAdminScene.ts

@@ -35,9 +35,10 @@ export default class DreamAdminScene extends Scene {
         console.log('不通过');
         this.touchEnabled = false;
         this.touchChildren = false;
-        NetManager.ins.yyh_assist1_reviewDream(() => {
+        NetManager.ins.yyh_assist1_reviewDream((s) => {
             this.touchEnabled = true;
             this.touchChildren = true;
+            if(s)
             SceneCtrl.instance.change('AdminScene');
         }, this.id, false);
     }

egret/src/gotoShare.ts

@@ -4,7 +4,8 @@ export default () => {
 
     const { avatar, dreamPic: url, address, id, dreamTitle: title, dreamContent: content } = DataManager.ins.getData('yyh_join1_dreamDetail').data;
 
-    let shareUrl = `https://activity.m.duiba.com.cn/projectx/${window['projectID']}/fea2bff6f.html`;
+    
+    let shareUrl = window.location.href.replace('index','fea2bff6f');
     const prefix = `?avatar=${encodeURIComponent(avatar)}&url=${encodeURIComponent(url)}&address=${address}&id2=${id}&title=${title}&content=${content}`
     shareUrl += prefix;
 
@@ -13,9 +14,9 @@ export default () => {
     window['AlipayJSBridge'].call(
         'esportsShare',
         {
-            title: '测试标题',
-            content: '测试内容',
-            imgUrl: 'http://yun.duiba.com.cn/duibaManagerWeb/fgzpqk6zzo.png',
+            title: '寻找2022个亚运梦想活动火热进行中',
+            content: '快来为我的亚运梦想充能吧',
+            imgUrl: 'https://yun.duiba.com.cn/db_games/yyhlogo.png',
             url: shareUrl, type: '3'
         });
 }
\ No newline at end of file

egret/src/interfaces/join_1_index_data.ts

@@ -6,6 +6,7 @@ export default interface join_1_index_data extends database {
     reviewPassedWindow;//是否展示审核通过弹窗
     reviewFailedWindow;//是否展示审核失败弹窗	
     reviewDeadline:number;
+    assistDeadline:number;
     dreamList:join_1_index_dream[];
     doAssistLimit;
     doAssistCount;

egret/src/panels/AdminPanel.ts

@@ -18,11 +18,14 @@ export default class AdminPanel extends Panel {
         console.log('确认通过');
         this.touchEnabled = false;
         this.touchChildren = false;
-        NetManager.ins.yyh_assist1_reviewDream(() => {
+        NetManager.ins.yyh_assist1_reviewDream((s) => {
             this.touchEnabled = true;
             this.touchChildren = true;
-            this.hidePanel();
-            SceneCtrl.instance.change('AdminScene');
+            // if(s){
+                this.hidePanel();
+                SceneCtrl.instance.change('AdminScene');
+            // }
+            
         }, this.id, true);
     }
 

egret/src/panels/CostPanel.ts

@@ -75,6 +75,9 @@ export default class CostPanel extends Panel {
         console.log(this.selectOrder);
         const detail = DataManager.ins.getData('yyh_join1_dreamDetail').data;
         //助力成功之后重新拿一下数据
+        let key = `doAssist`;
+        if(this.selectOrder>1)
+        key+=`${this.selectOrder}`;
         NetManager.ins.yyh_creditsCost((success) => {
             if (success) {
                 const ticketNum = DataManager.ins.getData('yyh_creditsCost').data;
@@ -93,7 +96,7 @@ export default class CostPanel extends Panel {
                 updateCredits();
                 Loading.instace.hide();
             }
-        }, 'assist_1', `credits_${this.selectOrder}`);
+        }, 'assist_1', key);
     }
 
     protected get closeBtns(): eui.Button[] { return [this['closeBtn'], this['closeBtn2']] }

mock/esports/assist1reviewDream.json

 {
-    "success":true,
+    "success":0,
     "message":"",
     "code":"",
     "data":null

mock/esports/credits.json

-{"data":{"consumerId":null,"appId":1,"credits":"994","uid":"2177","dcustom":{},"creditsUnitName":"金币"},"success":true}
\ No newline at end of file
+{
+    "data": {
+        "consumerId": null,
+        "appId": 1,
+        "credits": "994",
+        "uid": "2177",
+        "dcustom": {},
+        "creditsUnitName": "金币"
+    },
+    "success": true
+}
\ No newline at end of file

mock/esports/creditsCost.json

 {
-    "code": "E1002090003",
-    "data": {
-        "hdtoolOrderId": 231314,
-        "isLightWord": true,
-        "presentGiftsNum": 1,
-        "remainGiftsNum": 5,
-        "wateringTimes": 6
-    },
+    "code": "",
+    "data": "123",
     "desc": "OK",
-    "success": true,
+    "success": 1,
     "timestamp": 1563787629254
 }
\ No newline at end of file

mock/esports/index.json

@@ -5,7 +5,7 @@
     "data": {
         "lightUpWindow": 0,
         "reviewPassedWindow": 0,
-        "reviewFailedWindow": 1,
+        "reviewFailedWindow": 0,
         "reviewDeadline": 157489441000,
         "doAssistCount":10,
         "doAssistLimit":11,

mock/esports/join1dreamDetail.json

@@ -2,7 +2,7 @@
     "code": null,
     "data": {
         "address": "天津,河东区,大直沽街道",
-        "assist": true,
+        "assist": 0,
         "assistItemId": 208,
         "avatar": null,
         "consumerId": "500208012",