-a

project/resource/res.json

@@ -53,7 +53,7 @@
 			"name": "share_fail"
 		},
 		{
-			"keys": "share_success_bg.png,share_success_btn.png,share_success_close.png,share_success_okbtn.png,share_success_title.png",
+			"keys": "iKnowBtn.png,qrCode.png,shareSucBg.png,share_success_bg.png,share_success_btn.png,share_success_close.png,share_success_okbtn.png,share_success_title.png",
 			"name": "share_success"
 		},
 		{

project/scripts/upload.js

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

project/scripts/uploadSingleJs.js

@@ -40,8 +40,8 @@ function uploadSingleJs(url) {
         
         var client = new OSS({
             region: 'oss-cn-hangzhou',
-            accessKeyId: 'LTAI4Fw25WcfcGv7FvcHoiHK',
-            accessKeySecret: 'NZk1NtT9J5HFaAolNbtQdzTzLLvLYm',
+            accessKeyId: 'LTAI5tLEo6SbjfmNPmH7Mz3o',
+            accessKeySecret: '8yZ6nVMg56DEupEEMRl6rz1DcpG2R7',
             bucket: 'duiba'
         })
         var originFile;

project/src/ResJson.ts

@@ -836,23 +836,34 @@ export const ResJson = {
 			}
 		},
 		{
-			"keys": "share_success_bg.png,share_success_btn.png,share_success_close.png,share_success_okbtn.png,share_success_title.png",
+			"keys": "iKnowBtn.png,qrCode.png,shareSucBg.png,share_success_bg.png,share_success_btn.png,share_success_close.png,share_success_okbtn.png,share_success_title.png",
 			"name": "share_success",
 			"atlas": {
-				"share_success_bg.png": {
+				"shareSucBg.png": {
 					"x": 2,
 					"y": 2,
+					"w": 621,
+					"h": 899,
+					"ox": 0,
+					"oy": 0,
+					"sw": 621,
+					"sh": 899,
+					"ro": false
+				},
+				"share_success_bg.png": {
+					"x": 625,
+					"y": 2,
 					"w": 594,
 					"h": 474,
 					"ox": 0,
 					"oy": 0,
 					"sw": 594,
 					"sh": 474,
-					"ro": false
+					"ro": true
 				},
 				"share_success_title.png": {
-					"x": 2,
-					"y": 478,
+					"x": 625,
+					"y": 598,
 					"w": 439,
 					"h": 124,
 					"ox": 0,
@@ -861,9 +872,20 @@ export const ResJson = {
 					"sh": 124,
 					"ro": false
 				},
+				"qrCode.png": {
+					"x": 2,
+					"y": 903,
+					"w": 406,
+					"h": 407,
+					"ox": 0,
+					"oy": 0,
+					"sw": 406,
+					"sh": 407,
+					"ro": true
+				},
 				"share_success_okbtn.png": {
-					"x": 598,
-					"y": 2,
+					"x": 411,
+					"y": 903,
 					"w": 381,
 					"h": 77,
 					"ox": 0,
@@ -872,20 +894,31 @@ export const ResJson = {
 					"sh": 77,
 					"ro": true
 				},
+				"iKnowBtn.png": {
+					"x": 490,
+					"y": 903,
+					"w": 341,
+					"h": 101,
+					"ox": 0,
+					"oy": 0,
+					"sw": 341,
+					"sh": 101,
+					"ro": true
+				},
 				"share_success_btn.png": {
-					"x": 2,
-					"y": 604,
+					"x": 593,
+					"y": 903,
 					"w": 341,
 					"h": 101,
 					"ox": 0,
 					"oy": 0,
 					"sw": 341,
 					"sh": 101,
-					"ro": false
+					"ro": true
 				},
 				"share_success_close.png": {
-					"x": 598,
-					"y": 385,
+					"x": 490,
+					"y": 1246,
 					"w": 46,
 					"h": 46,
 					"ox": 0,
@@ -901,5 +934,5 @@ export const ResJson = {
 			"name": "svga"
 		}
 	],
-	"path": "https://yun.duiba.com.cn/db_games/activity/template/1631525027/resource/"
+	"path": "https://yun.duiba.com.cn/db_games/activity/template/1632710518/resource/"
 }
\ No newline at end of file

project/src/panels/ShareHintPanel.ts

+import { RES } from "../../module/RES";
+import { layers } from "../../module/views/layers";
+import { Panel } from "../../module/views/Panel";
+import centerTextField from "../common/centerTextField";
+import getObject from "../common/getObject";
+import { WEIXIN_URL } from "../datas";
+import { Tools } from "../Tools";
+import { sendLog } from "../WebNet";
+
+export class ShareHintPanel extends Panel {
+
+	initUi() {
+		super.initUi();
+        let btn = this.addChild(Tools.getRect(750,1624))
+        btn.alpha = 0;
+		btn.addEventListener(FYGE.MouseEvent.CLICK,()=>{
+			this.btnDelay(btn)
+			this.hidePanel()
+		},this)
+
+		let bg = this.addChild(Tools.getSprite('share.png'))
+		bg.position.set(250,80+layers.stageOffsetY)
+        bg.mouseChildren = false;
+        bg.mouseEnable = false;
+        bg.addChild(Tools.getText('点击分享',30,"#ffffff")).position.set(120,240)
+	}
+
+	get groupNames() { return ["share_success"] }
+
+	async start(data) {
+		super.start();
+		sendLog("exposure",7);
+	}
+}
\ No newline at end of file

project/src/panels/prize.ts

-import { changeScene } from "../../module/ctrls";
+import { changeScene, showPanel } from "../../module/ctrls";
 import { RES } from "../../module/RES";
 import { Panel } from "../../module/views/Panel";
 import getObject from "../common/getObject";
@@ -8,6 +8,7 @@ import { MAX_MONEY, MONEY_PERCENT } from "../datas";
 import { IndexScene } from "../scenes/IndexScene";
 import updateShareFunc from "../share";
 import { getPxTokenSave, sendLog, sendWebNet, WebNetName } from "../WebNet";
+import { ShareHintPanel } from "./ShareHintPanel";
 
 const createMask = (w, h) => {
 	const s = new FYGE.Shape();
@@ -132,7 +133,8 @@ export class PrizePanel extends Panel {
 	}
 
 	onClick_inviteBtn() {
-		showShareMask();
+		// showShareMask();
+		showPanel(ShareHintPanel)
 		sendLog("click",2);
 	}
 

project/src/panels/share_success.ts

@@ -3,41 +3,32 @@ import { Panel } from "../../module/views/Panel";
 import centerTextField from "../common/centerTextField";
 import getObject from "../common/getObject";
 import { WEIXIN_URL } from "../datas";
+import { Tools } from "../Tools";
 import { sendLog } from "../WebNet";
 
 export class ShareSuccessPanel extends Panel {
-	share_success_btn(){
-		sendLog("click",7);
-		location.href=WEIXIN_URL
-	}
 
 	initUi() {
 		super.initUi();
-		var skin = RES.getSkinDataByName(this.skinName);
-        this.position.set(skin.x, skin.y);
-		centerTextField(getObject(this,'share_success_tips1'),596);
-	}
-
-	get groupNames() { return ["share_success"] }
-	get skinName() { return "share_success" }
+		let bg = this.addChild(Tools.getSprite('shareSucBg.png'))
+		bg.position.set((750-bg.width)/2+15,250)
 
+		let qrCode = bg.addChild(Tools.getSprite('qrCode.png'));
+		qrCode.position.set((bg.width-qrCode.width)/2-10,200)
 
-	//两个按钮都是关闭作用
-	get closeBtns() {
-		return [getObject(this, 'share_success_close')];
+		let btn = bg.addChild(new FYGE.Button(RES.getRes('iKnowBtn.png')))
+		btn.position.set((bg.width - btn.width)/2-10,760)
+		btn.addEventListener(FYGE.MouseEvent.CLICK,()=>{
+			this.btnDelay(btn)
+			sendLog("click",7);
+			this.hidePanel()
+		},this)
 	}
 
+	get groupNames() { return ["share_success"] }
+
 	async start(data) {
 		super.start();
 		sendLog("exposure",7);
 	}
-
-	initEvents(){
-		super.initEvents();
-		getObject(this,'share_success_btn').addEventListener(FYGE.MouseEvent.CLICK,this.share_success_btn,this);
-	}
-	removeEvents(){
-		super.removeEvents();
-		getObject(this,'share_success_btn').removeEventListener(FYGE.MouseEvent.CLICK,this.share_success_btn,this);
-	}
 }
\ No newline at end of file

project/src/scenes/IndexScene.ts

@@ -12,14 +12,19 @@ import { getStageHeight, getStageOffset } from '../common/stage';
 import { KAIHU_URL, MAX_MONEY, MONEY_PERCENT } from '../datas';
 import { DrawPanel } from '../panels/draw';
 import { RulePanel } from '../panels/rule';
+import { ShareHintPanel } from '../panels/ShareHintPanel';
 import { ShareFailPanel } from '../panels/share_fail';
 import { ShareSuccessPanel } from '../panels/share_success';
 import updateShareFunc from '../share';
 import { getPxTokenSave, getWebData, sendLog, sendWebNet, WebNetName } from '../WebNet';
 export class IndexScene extends Scene {
+    /**是否开户 */
+    _isOpenAccount:boolean = false;
 
     updateIndexUI({ alreadyOpenAccount, experienceAmount: experienceAmount2, yesterdayIncome, sumIncome, sevenDayAnnualization, assistFriendNum, otherExperienceAmount, canWithdraw }) {
         this['index_task2new'].visible = this['index_task1'].visible = !alreadyOpenAccount;
+        this._isOpenAccount = alreadyOpenAccount > 0 ? true : false;
+
         this['index_task2'].visible = alreadyOpenAccount;
 
         const experienceAmount = getWebData(WebNetName.acquireOtherExperienceAmount).data || experienceAmount2;
@@ -53,11 +58,19 @@ export class IndexScene extends Scene {
     }
 
     onclick_index_inviteBtn() {
-        showShareMask();
+        // showShareMask();
+        showPanel(ShareHintPanel)
         sendLog("click",4);
     }
+    /**
+     * 提现
+     */
     onclick_index_drawBtn() {
         sendLog("click",3);
+        if(!this._isOpenAccount){
+            showToast('请先开户再提现哦~')
+            return;
+        }
         showWaiting();
         getPxTokenSave().then(token => {
             sendWebNet(WebNetName.withDraw, { token: token },null,true).then(res => {
@@ -106,6 +119,9 @@ export class IndexScene extends Scene {
 
     async start(data) {
         super.start(data);
+
+        
+
         sendLog("exposure",3);
         sendLog("exposure",4);
         sendLog("exposure",5);
@@ -182,7 +198,9 @@ export class IndexScene extends Scene {
     onclick_index_ruleBtn() {
         showPanel(RulePanel);
     }
-
+    /**
+     * 去开户
+     */
     index_task1btn() {
         sendLog("click",5);
         window["miniJump"](KAIHU_URL)

project/yarn.lock

@@ -133,6 +133,11 @@
     "@spark/projectx" "^2.0.10"
     duiba-utils "^1.0.6"
 
+"@spark/dbdomain@^1.0.19":
+  version "1.0.19"
+  resolved "http://npm.dui88.com:80/@spark%2fdbdomain/-/dbdomain-1.0.19.tgz#68d7249ba6af7bbba35c0fb5d0c2572d6dfbf98b"
+  integrity sha512-v5YXOd0JlGp5cn0gV5wG4f81r+QqyNkkAEofb+68LVs6unfsnf3+iOj2znbPkx7dLndMJx+8TsrtNZRRe40t7A==
+
 "@spark/monitor-sdk@^1.1.3":
   version "1.1.3"
   resolved "http://npm.dui88.com:80/@spark%2fmonitor-sdk/-/monitor-sdk-1.1.3.tgz#88c6f1c4b8c7aacc2945d72a9612dd3f147d25f5"