1

egret/index.html

@@ -47,7 +47,7 @@
         window['activeRule'] = '<br>    唤醒梦想，赋能亚运！<br>    为打造一届充满情怀的亚运盛会，让更多公众通过公益+互联网的新模式参与到杭州亚运会的筹备中来，杭州亚组委于2019年12月15日正式启动“寻找2022个亚运梦想”大型公益品牌活动。<br>    从现在至杭州亚运会开幕，我们将汇聚包括吉利汽车、中国电信、中国移动、工商银行、长龙航空、支付宝、阿里集团、杭州市体育彩票管理中心、青少年足球成长公益基金、浙江省青少年发展基金会、浙江省慈善联合总会、新浪微博、网易新闻、浙江之声及浙江电视台公共新闻频道在内的15家企业、组织和单位一起组成“联合助梦方”搭建“寻梦通道”，同时在全球范围内“寻梦”。只要您的梦想与亚运有关，只要您对梦想的坚持一如既往，您便可以通过文字、视频、音频、图画等任何您想到的形式将您的梦想告诉我们。我们将与“联合助梦方”一起让您的梦想被更多的人看见，被更多的人关注，通过杭州亚组委开设的“杭州亚运圆梦行动”（暂名）公募项目汇聚公众的爱心为梦想助力。最后，我们将在所有亚运梦想中挑选2022个，以亚运的名义为您圆梦。  <br>    我们坚信，每个梦想都值得被尊重。来吧，唤醒您的梦想，让您的梦想汇聚成亚运梦想的“星空”。';
         window['rule'] = '1111<br>2222';
         window['projectID']='p32804e45';
-        // window.firstScene='admin';
+        window.firstScene='admin';
         // window.firstScene='invite';
         window['renderMode'] = 'webgl';
         window['development'] = true;

egret/resource/default.res.json

 {
 	"groups": [
 		{
-			"keys": "track_sb_png,toast_png,roundthumb_png,dream_textbg_png,dream_text1_png,dream_bg_png,common_share_png,common_progress2_png,common_progress1_png,common_pic_bg2_png,common_pic_bg_png,common_nums_bg_png,common_line_png,common_dot_png,common_default_avatar_png,common_closeBtn_png,common_btn9_png,common_btn8_png,common_btn7_png,common_btn6_png,common_btn5_png,common_btn4_png,common_btn3_png,common_btn2_png,common_btn12_png,common_btn11_png,common_btn10_png,common_btn1_png,common_avatar_bg_png,admin_btn4_png,admin_btn3_png,admin_bg1_png",
+			"keys": "track_sb_png,toast_png,roundthumb_png,dream_textbg_png,dream_text1_png,dream_bg_png,common_share_png,common_progress2_png,common_progress1_png,common_pic_bg2_png,common_pic_bg_png,common_nums_bg_png,common_line_png,common_dot_png,common_default_avatar_png,common_closeBtn_png,common_btn9_png,common_btn8_png,common_btn7_png,common_btn6_png,common_btn5_png,common_btn4_png,common_btn3_png,common_btn2_png,common_btn12_png,common_btn11_png,common_btn10_png,common_btn1_png,common_avatar_bg_png,admin_btn4_png,admin_btn3_png,admin_bg1_png,common_btn20_png,common_backbtn_png",
 			"name": "common"
 		},
 		{
@@ -39,10 +39,6 @@
 		{
 			"keys": "success_png",
 			"name": "success"
-		},
-		{
-			"name": "preload",
-			"keys": "common_btn20_png"
 		}
 	],
 	"resources": [
@@ -447,9 +443,14 @@
 			"name": "main_iconxx_png"
 		},
 		{
-			"name": "common_btn20_png",
+			"url": "assets/common/common_btn20.png",
+			"type": "image",
+			"name": "common_btn20_png"
+		},
+		{
+			"url": "assets/common/common_backbtn.png",
 			"type": "image",
-			"url": "assets/common/common_btn20.png"
+			"name": "common_backbtn_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/ListSkin.exml

@@ -24,7 +24,7 @@
 			</e:skinName>
 		</e:Button>
 	</e:Group>
-	<e:Group id="group" x="0" y="365.09">
+	<e:Group id="group" x="0" y="365.09" locked="true">
 		<e:Scroller id="scroll" width="740" height="699" x="0" y="94.91" scrollPolicyH="off" scrollPolicyV="auto">
 			<e:List id="list" width="750" x="0" y="0" itemRendererSkinName="ListItemSkin">
 			
@@ -52,4 +52,5 @@
 		</e:layout>
 		</e:List>
 	</e:Scroller>
+	<e:Label id="tips" text="还未给梦想助力哦~ \n前往“所有梦想”可为他人梦想充能" y="603" textColor="0x000000" verticalAlign="middle" textAlign="center" horizontalCenter="0" lineSpacing="10" visible="false"/>
 </e:Skin>
\ No newline at end of file

egret/src/DreamAdminScene.ts

@@ -33,6 +33,7 @@ export default class DreamAdminScene extends Scene {
     }
     ontap_btn2() {
         console.log('不通过');
+        // PanelCtrl.instance.show('AdminPanel2',{id:this.id});
         this.touchEnabled = false;
         this.touchChildren = false;
         NetManager.ins.yyh_assist1_reviewDream((s) => {

egret/src/ListScene.ts

@@ -44,6 +44,10 @@ export default class ListScene extends Scene {
                 datalist2
             );
             this.list2.dataProvider = ac2;
+            this['datalist2']=datalist2;
+            // if(this['datalist2'].length <=0 ) {
+            //     this['tips'].visible=true;
+            // }
         });
 
         this.list2.useVirtualLayout = true;
@@ -57,19 +61,24 @@ export default class ListScene extends Scene {
         this['group'].visible = true;
         this['scroll2'].visible = false;
 
-        console.log(this['scroll2'])
     }
 
     onTap_btn() {
         this['group'].visible = false;
         this['scroll2'].visible = true;
+        this['tips'].visible=false;
         egret.Tween.get(this['line']).to({ x: 500 }, 150);
+        if(this['datalist2'].length <=0 ) {
+            this['tips'].visible=true;
+        }
     }
 
     onTap_btnall() {
         this['group'].visible = true;
         this['scroll2'].visible = false;
+        this['tips'].visible=false;
         egret.Tween.get(this['line']).to({ x: 149 }, 150);
+
     }
 
     onTap_searchbtn() {

egret/src/MainBase.ts

@@ -23,6 +23,7 @@ import layers from "../libs/new_wx/views/layers";
 import getResPath from "../libs/new_tc/getResPath";
 import { NetManager } from "../libs/tw/manager/NetManager";
 import { updateCredits } from "./getcredits";
+import AdminPanel2 from "./panels/AdminPanel2";
 
 
 export default class MainBase extends eui.UILayer {
@@ -40,6 +41,7 @@ export default class MainBase extends eui.UILayer {
             ['ReFusePanel', { cls: ReFusePanel }],
             ['SuccessPanel', { cls: SuccessPanel }],
             ['AdminPanel', { cls: AdminPanel }],
+            ['AdminPanel2', { cls: AdminPanel2 }],
             ['CostPanel', { cls: CostPanel }],
         ];
 

egret/src/gotoShare.ts

@@ -5,7 +5,7 @@ export default () => {
     const { avatar, dreamPic: url, address, id, dreamTitle: title, dreamContent: content } = DataManager.ins.getData('yyh_join1_dreamDetail').data;
 
 
-    let shareUrl = 'http://activity.m.duiba.com.cn/projectx/pa1462f11/fea2bff6f.html';
+    let shareUrl = location.origin + '/projectx/pa1462f11/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;

egret/src/panels/AdminPanel2.ts

+import Panel from "../../libs/new_wx/components/Panel";
+import { HtmlTextParser } from "../../libs/new_wx/HtmlTextParser";
+import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
+import { NetManager } from "../../libs/tw/manager/NetManager";
+
+
+export default class AdminPanel2 extends Panel {
+    public labContent: eui.Label;
+    public scroller: eui.Scroller;
+    id;
+    start(data) {
+        super.start();
+        this.id = data.id;
+        this['okbtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.ontap_btn1, this);
+    }
+
+    ontap_btn1() {
+        console.log('确认通过');
+        this.touchEnabled = false;
+        this.touchChildren = false;
+        NetManager.ins.yyh_assist1_reviewDream((s) => {
+            this.touchEnabled = true;
+            this.touchChildren = true;
+            // if(s){
+                this.hidePanel();
+                SceneCtrl.instance.change('AdminScene');
+            // }
+            
+        }, this.id, true);
+    }
+
+    protected get closeBtns(): eui.Button[] { return [this['closeBtn'], this['closeBtn2']] }
+
+    get skinKey() { return 'AdminPanel2' }
+    get skinResKey() { return 'admin' }
+
+}
\ No newline at end of file

mock/esports/assist1myAssistDreamList.json

@@ -3,29 +3,5 @@
     "message": "",
     "code": "",
     "data": [
-        {
-            "id": 1,
-            "dreamTitle": "梦想标题",
-            "name": "姓名11",
-            "tel": "13711111111333",
-            "idNumber": "333333333333333333",
-            "address": "浙江省,杭州市,上城区1",
-            "dreamContent": "梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容梦想内容",
-            "dreamPic": "http://yun.duiba.com.cn/db_games/img2.jpg",
-            "rank": 1,
-            "energy": 1000
-        },
-        {
-            "id": 2,
-            "dreamTitle": "梦想标题2",
-            "name": "姓名",
-            "tel": "13711111111",
-            "idNumber": "333333333333333333",
-            "address": "浙江省,杭州市,上城区",
-            "dreamContent": "梦想内容",
-            "dreamPic": "http://yun.duiba.com.cn/db_games/img1.png",
-            "rank": 2,
-            "energy": 1000
-        }
     ]
 }
\ No newline at end of file