diff --git a/wxsdk/http/SDKApi.ts b/wxsdk/http/SDKApi.ts index 256ad30..2fb4b0a 100644 --- a/wxsdk/http/SDKApi.ts +++ b/wxsdk/http/SDKApi.ts @@ -63,8 +63,9 @@ export class SDKApi { public static client_log = (...args) => SDKHttp.httpGet(`${DataService.I.DotApi}${HostKeys.client_log}`, ...args); + + // OrderApi public static pay = (...args) => SDKHttp.httpPost(`${DataService.I.OrderApi}${HostKeys.orderReport}`, ...args); - public static orderQuery = (...args) => SDKHttp.httpPost(`${DataService.I.OrderApi}${HostKeys.orderQuery}`, ...args); public static preorder = (...args) => SDKHttp.httpPost(`${DataService.I.OrderApi}${HostKeys.preorder}`, ...args); } diff --git a/wxsdk/lib/sdk.d.ts b/wxsdk/lib/sdk.d.ts index 49446f7..06e772f 100644 --- a/wxsdk/lib/sdk.d.ts +++ b/wxsdk/lib/sdk.d.ts @@ -382,6 +382,8 @@ interface _LoginInnerData { expire?:number; isnew?:number logindays?:number + amount?:number, + pon?:number } /** diff --git a/wxsdk/service/DataService.ts b/wxsdk/service/DataService.ts index a8019ca..75bedd0 100644 --- a/wxsdk/service/DataService.ts +++ b/wxsdk/service/DataService.ts @@ -57,10 +57,16 @@ export default class DataService { if (data.hasOwnProperty('isnew')) this.setIsnew(data.isnew); - + if (data.hasOwnProperty('logindays')) this.setLogindays(data.logindays); + if (data.hasOwnProperty('amount')) + this.setLogindays(data.amount); + + if (data.hasOwnProperty('pon')) + this.setLogindays(data.pon); + } get expice() { @@ -81,7 +87,7 @@ export default class DataService { return this; } - get logindays(){ + get logindays() { return this._data.logindays; } @@ -90,6 +96,13 @@ export default class DataService { return this; } + get amount() { + return this._data.amount; + } + get pon() { + return this._data.pon; + } + get Scene() { return this._data.scene || 0; @@ -146,7 +159,7 @@ export default class DataService { setUserId(val: any) { this.setValue('userId', val); - StorageUtils.I.set("userId",val); + StorageUtils.I.set("userId", val); return this; } diff --git a/wxsdk/service/LogService.ts b/wxsdk/service/LogService.ts index 1c7f059..94c99d9 100644 --- a/wxsdk/service/LogService.ts +++ b/wxsdk/service/LogService.ts @@ -38,7 +38,7 @@ export default class LogService { setRegFinishState(state: number) { this.regFinishState = state; } - + private get LaunchTime() { return DataService.I.LaunchTime; } @@ -471,6 +471,8 @@ export default class LogService { let uid = this.UserId; let env = DataService.I.EnvEnum === 1 ? 'pre' : 'prod'; let logindays = DataService.I.logindays; + let amount = DataService.I.amount; + let pon = DataService.I.pon; return { gameid, channel, @@ -484,7 +486,9 @@ export default class LogService { scene, uid, env, - logindays + logindays, + amount, + pon }; } diff --git a/wxsdk/service/entity/SdkData.ts b/wxsdk/service/entity/SdkData.ts index 783dd77..1d69d60 100644 --- a/wxsdk/service/entity/SdkData.ts +++ b/wxsdk/service/entity/SdkData.ts @@ -36,7 +36,10 @@ export default class SdkData { public isCross: boolean; // 是否开启交叉悬浮框推广位 public isDrawer: boolean; // 是否开启交叉抽屉推广位 public isGuessLike: boolean; // 是否开启交叉猜你喜欢推广位 - public logindays:number; + public logindays:number; // 登录天数 + public amount:number; // 充值金额 + public pon:number; // 用户类型 + constructor() { this.token = ''; @@ -74,6 +77,8 @@ export default class SdkData { this.isDrawer = false; this.isGuessLike = false; this.logindays = 0; + this.amount = 0; + this.pon = 0; } } diff --git a/wxsdk/wx/WxLogin.ts b/wxsdk/wx/WxLogin.ts index b0ab07f..a9ff58c 100644 --- a/wxsdk/wx/WxLogin.ts +++ b/wxsdk/wx/WxLogin.ts @@ -94,7 +94,7 @@ export default class WxLogin { if (data) { // 设置登录信息 if (data.data) { - let { channel, uid, firstlogin, token, reftoken, openid, expire, isnew, gameconfig,logindays } = data.data; + let { channel, uid, firstlogin, token, reftoken, openid, expire, isnew, gameconfig,logindays,amount,pon } = data.data; LogService.I.setLogind({ channel, userId: uid, @@ -104,7 +104,9 @@ export default class WxLogin { token, refToken: reftoken, expire, - logindays + logindays, + amount, + pon }); OnlineService.I.setData(gameconfig) LogService.I.active(); -- libgit2 0.21.0