|
|
@@ -7132,11 +7132,123 @@ t.prototype = null === e ? Object.create(e) : (a.prototype = e.prototype, new a(
|
|
|
var n, i = arguments.length, r = i < 3 ? e : null === o ? o = Object.getOwnPropertyDescriptor(e, a) : o;
|
|
|
if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(t, e, a, o); else for (var s = t.length - 1; s >= 0; s--) (n = t[s]) && (r = (i < 3 ? n(r) : i > 3 ? n(e, a, r) : n(e, a)) || r);
|
|
|
return i > 3 && r && Object.defineProperty(e, a, r), r;
|
|
|
+}, r = this && this.__awaiter || function(t, e, a, o) {
|
|
|
+return new (a || (a = Promise))(function(n, i) {
|
|
|
+function r(t) {
|
|
|
+try {
|
|
|
+c(o.next(t));
|
|
|
+} catch (t) {
|
|
|
+i(t);
|
|
|
+}
|
|
|
+}
|
|
|
+function s(t) {
|
|
|
+try {
|
|
|
+c(o.throw(t));
|
|
|
+} catch (t) {
|
|
|
+i(t);
|
|
|
+}
|
|
|
+}
|
|
|
+function c(t) {
|
|
|
+t.done ? n(t.value) : (e = t.value, e instanceof a ? e : new a(function(t) {
|
|
|
+t(e);
|
|
|
+})).then(r, s);
|
|
|
+var e;
|
|
|
+}
|
|
|
+c((o = o.apply(t, e || [])).next());
|
|
|
+});
|
|
|
+}, s = this && this.__generator || function(t, e) {
|
|
|
+var a, o, n, i, r = {
|
|
|
+label: 0,
|
|
|
+sent: function() {
|
|
|
+if (1 & n[0]) throw n[1];
|
|
|
+return n[1];
|
|
|
+},
|
|
|
+trys: [],
|
|
|
+ops: []
|
|
|
+};
|
|
|
+return i = {
|
|
|
+next: s(0),
|
|
|
+throw: s(1),
|
|
|
+return: s(2)
|
|
|
+}, "function" == typeof Symbol && (i[Symbol.iterator] = function() {
|
|
|
+return this;
|
|
|
+}), i;
|
|
|
+function s(t) {
|
|
|
+return function(e) {
|
|
|
+return c([ t, e ]);
|
|
|
+};
|
|
|
+}
|
|
|
+function c(i) {
|
|
|
+if (a) throw new TypeError("Generator is already executing.");
|
|
|
+for (;r; ) try {
|
|
|
+if (a = 1, o && (n = 2 & i[0] ? o.return : i[0] ? o.throw || ((n = o.return) && n.call(o),
|
|
|
+0) : o.next) && !(n = n.call(o, i[1])).done) return n;
|
|
|
+(o = 0, n) && (i = [ 2 & i[0], n.value ]);
|
|
|
+switch (i[0]) {
|
|
|
+case 0:
|
|
|
+case 1:
|
|
|
+n = i;
|
|
|
+break;
|
|
|
+
|
|
|
+case 4:
|
|
|
+r.label++;
|
|
|
+return {
|
|
|
+value: i[1],
|
|
|
+done: !1
|
|
|
+};
|
|
|
+
|
|
|
+case 5:
|
|
|
+r.label++;
|
|
|
+o = i[1];
|
|
|
+i = [ 0 ];
|
|
|
+continue;
|
|
|
+
|
|
|
+case 7:
|
|
|
+i = r.ops.pop();
|
|
|
+r.trys.pop();
|
|
|
+continue;
|
|
|
+
|
|
|
+default:
|
|
|
+if (!(n = r.trys, n = n.length > 0 && n[n.length - 1]) && (6 === i[0] || 2 === i[0])) {
|
|
|
+r = 0;
|
|
|
+continue;
|
|
|
+}
|
|
|
+if (3 === i[0] && (!n || i[1] > n[0] && i[1] < n[3])) {
|
|
|
+r.label = i[1];
|
|
|
+break;
|
|
|
+}
|
|
|
+if (6 === i[0] && r.label < n[1]) {
|
|
|
+r.label = n[1];
|
|
|
+n = i;
|
|
|
+break;
|
|
|
+}
|
|
|
+if (n && r.label < n[2]) {
|
|
|
+r.label = n[2];
|
|
|
+r.ops.push(i);
|
|
|
+break;
|
|
|
+}
|
|
|
+n[2] && r.ops.pop();
|
|
|
+r.trys.pop();
|
|
|
+continue;
|
|
|
+}
|
|
|
+i = e.call(t, r);
|
|
|
+} catch (t) {
|
|
|
+i = [ 6, t ];
|
|
|
+o = 0;
|
|
|
+} finally {
|
|
|
+a = n = 0;
|
|
|
+}
|
|
|
+if (5 & i[0]) throw i[1];
|
|
|
+return {
|
|
|
+value: i[0] ? i[1] : void 0,
|
|
|
+done: !0
|
|
|
+};
|
|
|
+}
|
|
|
};
|
|
|
Object.defineProperty(a, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
-var r = t("../../component/SetGray"), s = cc._decorator, c = s.ccclass, l = s.property, p = function(t) {
|
|
|
+var c = t("../../component/SetGray"), l = cc._decorator, p = l.ccclass, u = l.property, d = function(t) {
|
|
|
n(e, t);
|
|
|
function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
@@ -7148,31 +7260,79 @@ e.mData_ = null;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.setItemData = function(t) {
|
|
|
-this.initUI(t);
|
|
|
-};
|
|
|
-e.prototype.initUI = function(t) {
|
|
|
this.mData_ = t;
|
|
|
+this.node.index;
|
|
|
+console.log("----");
|
|
|
};
|
|
|
-e.prototype.clickBtn = function() {};
|
|
|
-i([ l({
|
|
|
+e.prototype.initUI = function() {
|
|
|
+this.lab_value.string = this.mData_.amount / 100 + "";
|
|
|
+if (this.mData_.amount == this.mData_.payAmount) {
|
|
|
+this.lab_status.string = "提现到账";
|
|
|
+this.lab_operate.string = "已到账";
|
|
|
+this.node_setGray.setGray(!0);
|
|
|
+this.mIsGray_ = !0;
|
|
|
+} else {
|
|
|
+var t = new Date(), e = mk.time.dateToTimestamp(t), a = new Date(this.mData_.unlockDate);
|
|
|
+if (e >= this.mData_.unlockDate) {
|
|
|
+this.lab_operate.string = "提现";
|
|
|
+this.node_setGray.setGray(!1);
|
|
|
+this.mIsGray_ = !1;
|
|
|
+this.lab_status.string = "已提现" + this.mData_.payAmount / 100 + "元";
|
|
|
+} else {
|
|
|
+var o = a.getDate() - t.getDate();
|
|
|
+this.lab_operate.string = 1 == o ? "次日提现" : "待提现";
|
|
|
+this.mData_.payAmount > 0 ? this.lab_status.string = "已提现" + this.mData_.payAmount / 100 + "元" : this.lab_status.string = o + "天内到账";
|
|
|
+this.node_setGray.setGray(!0);
|
|
|
+this.mIsGray_ = !0;
|
|
|
+}
|
|
|
+}
|
|
|
+};
|
|
|
+e.prototype.clickBtn = function() {
|
|
|
+this.mIsGray_ || this.billCashOut();
|
|
|
+};
|
|
|
+e.prototype.billCashOut = function() {
|
|
|
+return r(this, void 0, void 0, function() {
|
|
|
+var t, e, a, o, n;
|
|
|
+return s(this, function(i) {
|
|
|
+switch (i.label) {
|
|
|
+case 0:
|
|
|
+(t = {}).partnerTradeNo = this.mData_.partnerTradeNo;
|
|
|
+return [ 4, mk.http.sendData("bill/billCash", t) ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+if (0 != (e = i.sent()).errcode) return [ 2, null ];
|
|
|
+a = this.node.index;
|
|
|
+if ((o = e.data.billOrderInfoView) && o.billDetailInfoList.length > a) {
|
|
|
+n = o.billDetailInfoList[a];
|
|
|
+this.mData_.unlockDate = n.unlockDate;
|
|
|
+this.mData_.payAmount = n.payAmount;
|
|
|
+this.initUI();
|
|
|
+console.log("billCashOut===" + n.unlockDate + "==" + n.amount + "==" + n.payAmount);
|
|
|
+}
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
+});
|
|
|
+});
|
|
|
+};
|
|
|
+i([ u({
|
|
|
displayName: "金额",
|
|
|
type: cc.Label
|
|
|
}) ], e.prototype, "lab_value", void 0);
|
|
|
-i([ l({
|
|
|
+i([ u({
|
|
|
displayName: "状态",
|
|
|
type: cc.Label
|
|
|
}) ], e.prototype, "lab_status", void 0);
|
|
|
-i([ l({
|
|
|
+i([ u({
|
|
|
displayName: "操作描述",
|
|
|
type: cc.Label
|
|
|
}) ], e.prototype, "lab_operate", void 0);
|
|
|
-i([ l({
|
|
|
+i([ u({
|
|
|
displayName: "操作按钮",
|
|
|
-type: r.default
|
|
|
+type: c.default
|
|
|
}) ], e.prototype, "node_setGray", void 0);
|
|
|
-return i([ c ], e);
|
|
|
+return i([ p ], e);
|
|
|
}(cc.Component);
|
|
|
-a.default = p;
|
|
|
+a.default = d;
|
|
|
cc._RF.pop();
|
|
|
}, {
|
|
|
"../../component/SetGray": "SetGray"
|
|
|
@@ -7208,6 +7368,7 @@ function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
e.scroll_view = null;
|
|
|
e.node_tip = null;
|
|
|
+e.node_tip2 = null;
|
|
|
e.tableview = null;
|
|
|
return e;
|
|
|
}
|
|
|
@@ -7215,8 +7376,9 @@ e.prototype.onLoad = function() {
|
|
|
this.tableview = this.scroll_view.node.getComponent(r.default);
|
|
|
};
|
|
|
e.prototype.start = function() {
|
|
|
-var t = this;
|
|
|
-this.scroll_view.node.emit("srollview-init", [ {}, {}, {}, {}, {}, {} ]);
|
|
|
+var t = this, e = gData.gameData.playerProp.cashOutBillData;
|
|
|
+if (e && e.billDetailInfoList.length > 0) {
|
|
|
+this.scroll_view.node.emit("srollview-init", e.billDetailInfoList);
|
|
|
this.scroll_view.vertical = !1;
|
|
|
cc.tween(this.node).delay(.06).call(function() {
|
|
|
for (var e = t.tableview.getFrontPositionItemByCount(5), a = 0; a != e.length; ++a) {
|
|
|
@@ -7228,6 +7390,11 @@ x: 0
|
|
|
}).delay(1).call(function() {
|
|
|
t.scroll_view.vertical = !0;
|
|
|
}).start();
|
|
|
+e.isShowTip && (this.node_tip.active = !0);
|
|
|
+} else {
|
|
|
+this.node_tip.active = !1;
|
|
|
+this.node_tip2.active = !0;
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.onEnable = function() {
|
|
|
mk.ad.showBanner(s.BannerAdType.banner_click_10);
|
|
|
@@ -7244,6 +7411,10 @@ i([ p({
|
|
|
displayName: "提示文本节点",
|
|
|
type: cc.Node
|
|
|
}) ], e.prototype, "node_tip", void 0);
|
|
|
+i([ p({
|
|
|
+displayName: "提示文本节点2",
|
|
|
+type: cc.Node
|
|
|
+}) ], e.prototype, "node_tip2", void 0);
|
|
|
return i([ l ], e);
|
|
|
}(cc.Component);
|
|
|
a.default = u;
|
|
|
@@ -13390,7 +13561,7 @@ Object.defineProperty(a, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
a.Fun = void 0;
|
|
|
-var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), s = t("./LoginData"), c = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), D = t("./module/RedBagCashData"), b = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), k = t("./module/GuideData"), A = t("./module/GuideWeakData"), P = t("./ConfigData"), T = t("./module/NewCashUIData"), O = t("../../before/view/data/ADUnlockData"), I = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), F = t("./module/FarmMapData"), B = t("./module/GradeRewardData"), j = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), E = t("./module/WarnTipData"), U = t("./module/SafeDepositBoxData"), G = function() {
|
|
|
+var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), s = t("./LoginData"), c = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), D = t("./module/RedBagCashData"), b = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), k = t("./module/GuideData"), A = t("./module/GuideWeakData"), P = t("./ConfigData"), T = t("./module/NewCashUIData"), O = t("../../before/view/data/ADUnlockData"), I = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), F = t("./module/FarmMapData"), B = t("./module/GradeRewardData"), j = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), E = t("./module/WarnTipData"), U = t("./module/SafeDepositBoxData"), G = t("./module/CashOutBillData"), V = function() {
|
|
|
function t() {
|
|
|
this.init();
|
|
|
}
|
|
|
@@ -13432,6 +13603,7 @@ this.walletCashOutData = new j.WalletCashOutData();
|
|
|
this.lineUpUIData = new L.LineUpUIData();
|
|
|
this.warnTipData = new E.default();
|
|
|
this.safeDepositBoxData = new U.default();
|
|
|
+this.cashOutBillData = new G.default();
|
|
|
this.moduleData = new Map();
|
|
|
this.moduleData.set(o.moreGame, this.moreGame);
|
|
|
this.moduleData.set(o.turnable, this.turnable);
|
|
|
@@ -13452,7 +13624,7 @@ t[t.sign = 6] = "sign";
|
|
|
t[t.cashNormal = 7] = "cashNormal";
|
|
|
t[t.redBagCash = 8] = "redBagCash";
|
|
|
})(o = a.Fun || (a.Fun = {}));
|
|
|
-window.gData = new G();
|
|
|
+window.gData = new V();
|
|
|
cc._RF.pop();
|
|
|
}, {
|
|
|
"../../before/main/FactorySystem": "FactorySystem",
|
|
|
@@ -13472,6 +13644,7 @@ cc._RF.pop();
|
|
|
"./WechatData": "WechatData",
|
|
|
"./module/BlessingBagData": "BlessingBagData",
|
|
|
"./module/CashNormalData": "CashNormalData",
|
|
|
+"./module/CashOutBillData": "CashOutBillData",
|
|
|
"./module/CashProData": "CashProData",
|
|
|
"./module/FarmMapData": "FarmMapData",
|
|
|
"./module/FissionData": "FissionData",
|
|
|
@@ -13920,7 +14093,6 @@ this.playerProp.turntableTimes = t.turntableTimes;
|
|
|
this.playerProp.versioncfg = t.versioncfg;
|
|
|
this.playerProp.isFirstRedMoney = t.isFirstRedMoney;
|
|
|
gData.adData.watchNumToday = null == t.dayVideoTimesForRedMoney ? 0 : t.dayVideoTimesForRedMoney;
|
|
|
-console.log("watchNumToday============" + gData.adData.watchNumToday);
|
|
|
this.playerProp.gradeLevel = t.farmLevel;
|
|
|
this.playerProp.userTuCaoInfo = t.userWelFareTaskInfo;
|
|
|
this.playerProp.farmExpValue = t.userExp;
|
|
|
@@ -13930,10 +14102,7 @@ this.playerProp.redMoneyCashPayRecordList = t.redMoneyCashPayRecordList;
|
|
|
this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
|
|
|
this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
|
|
|
this.playerProp.completeFarmTaskTimes = t.completeFarmTaskTimes;
|
|
|
-if (t.userOrderTaskInfo) {
|
|
|
-this.playerProp.orderData = t.userOrderTaskInfo;
|
|
|
-console.log("============userOrderTaskInfo123");
|
|
|
-}
|
|
|
+t.userOrderTaskInfo && (this.playerProp.orderData = t.userOrderTaskInfo);
|
|
|
this.playerProp.lineRedMoney = t.lineRedMoney;
|
|
|
this.playerProp.groupCode = parseInt(t.groupCode);
|
|
|
this.playerProp.curProductionAdTimes = t.dailyProductionTimes;
|
|
|
@@ -13952,17 +14121,14 @@ mk.data.setTAEventUser(0, "farm_lv", gData.gameData.playerProp.gradeLevel);
|
|
|
mk.data.setTAEventUserStr(0, "now_app_id", gData.appData.appVersion);
|
|
|
mk.data.setTAEventUserStr(0, "channel_id", gData.appData.umengChannel);
|
|
|
gData.safeDepositBoxData.richBankCashAmount = t.richBankCashAmount;
|
|
|
-if (t.currentRichBankCashTaskIndex) {
|
|
|
-gData.safeDepositBoxData.currentRichBankCashTaskIndex = t.currentRichBankCashTaskIndex;
|
|
|
-console.log("currentRichBankCashTaskIndex ======== " + t.currentRichBankCashTaskIndex);
|
|
|
-}
|
|
|
+t.currentRichBankCashTaskIndex && (gData.safeDepositBoxData.currentRichBankCashTaskIndex = t.currentRichBankCashTaskIndex);
|
|
|
gData.safeDepositBoxData.isStartBankTask = t.isStartRichBankTask;
|
|
|
gData.safeDepositBoxData.richBankDailyVideoTimes = t.richBankDailyVideoTimes;
|
|
|
gData.safeDepositBoxData.richbankLoginDays = t.richbankLoginDays;
|
|
|
gData.safeDepositBoxData.richBankDailyTotelVideoTimes = t.richBankDailyTotelVideoTimes;
|
|
|
gData.safeDepositBoxData.richBankTotelLoginDays = t.richBankTotelLoginDays;
|
|
|
-console.log("richBankDailyVideoTimes ======== " + t.richBankDailyVideoTimes);
|
|
|
-console.log("richBankDailyTotelVideoTimes ======== " + t.richBankDailyTotelVideoTimes);
|
|
|
+this.playerProp.cashOutBillData = t.billOrderInfoView;
|
|
|
+mk.console.logSingle("cashOutBillData======", t.billOrderInfoView);
|
|
|
};
|
|
|
t.prototype.cloneOrderData = function(t) {
|
|
|
void 0 === t && (t = !1);
|
|
|
@@ -15203,6 +15369,7 @@ this.orderData = null;
|
|
|
this.copyOrderData = null;
|
|
|
this.lineRedMoney = 0;
|
|
|
this.curProductionAdTimes = 0;
|
|
|
+this.cashOutBillData = null;
|
|
|
}
|
|
|
Object.defineProperty(t.prototype, "isSignInToday", {
|
|
|
get: function() {
|
|
|
@@ -16122,6 +16289,9 @@ e.prototype.onClickSign = function() {
|
|
|
mk.data.sendDataEvent(d.DataEventId.button_click, "签到icon");
|
|
|
mk.console.logSingle("VVVV ", "onClickSign");
|
|
|
};
|
|
|
+e.prototype.onClickCashOutBill = function() {
|
|
|
+mk.data.sendDataEvent(d.DataEventId.button_click, "提现账单icon");
|
|
|
+};
|
|
|
e.prototype.onClickShare = function() {
|
|
|
mk.data.sendDataEvent(d.DataEventId.button_click, "邀请icon");
|
|
|
gData.loginData.isAuth ? l.default.shareInviteUrl(gData.gameData.shareUrl, gData.gameData.shareTitle, gData.gameData.shareDes, gData.gameData.shareImgUrl) : mk.ui.openPanel("module/authUI/authUI");
|
|
|
@@ -19882,7 +20052,7 @@ value: !0
|
|
|
a.ServerUrl = a.HttpData = void 0;
|
|
|
var o, n = function() {
|
|
|
function t() {
|
|
|
-this.serverType = 1;
|
|
|
+this.serverType = 0;
|
|
|
}
|
|
|
t.prototype.getServerUrl = function() {
|
|
|
switch (this.serverType) {
|
|
|
@@ -24425,6 +24595,7 @@ t = gData.gameData.getProp(r.GameProp.cashTimes);
|
|
|
console.log("cashTimes2222======" + t);
|
|
|
gData.gameData.showRichBankIconLimit == t && "1" == gData.gameData.funOpenData[13] && mk.event.emit("showRichBankIcon");
|
|
|
gData.gameData.taskRedBagAutoShowLimit == t && "1" == gData.gameData.funOpenData[4] && mk.event.emit("showTaskRedBagAction");
|
|
|
+gData.cashOutBillData.getUserBillInfo();
|
|
|
};
|
|
|
e.prototype.onEnable = function() {
|
|
|
mk.ad.showNative();
|
|
|
@@ -32889,6 +33060,10 @@ return e;
|
|
|
var o = t ? new Date(t) : new Date();
|
|
|
return o.getFullYear() + e + a(o.getMonth() + 1) + e + a(o.getDate()) + " " + a(o.getHours()) + ":" + a(o.getMinutes()) + ":" + a(o.getSeconds());
|
|
|
};
|
|
|
+t.prototype.dateToTimestamp = function(t) {
|
|
|
+var e = t.getFullYear() + "-" + (t.getMonth() + 1) + "-" + t.getDate() + " 00:00:00";
|
|
|
+return new Date(e).getTime();
|
|
|
+};
|
|
|
t.prototype.WaitForSeconds = function(t) {
|
|
|
return new Promise(function(e) {
|
|
|
setTimeout(function() {
|
