Commit f275bfc7cb83758e8eec4e77444e54e8c71c2883
1 parent
930efdb0
Exists in
master
and in
3 other branches
X
Showing
4 changed files
with
6 additions
and
5 deletions
Show diff stats
wxsdk/service/GameService.ts
| @@ -104,7 +104,7 @@ export default class GameService { | @@ -104,7 +104,7 @@ export default class GameService { | ||
| 104 | * @param opts | 104 | * @param opts |
| 105 | * @returns | 105 | * @returns |
| 106 | */ | 106 | */ |
| 107 | - pay(params: {payid:string, goodid:string, money: number; orderid: string }, opts: any = {}) { | 107 | + pay(params: { payid: string, goodid: string, money: number; orderid: string }, opts: any = {}) { |
| 108 | return WxPay.I.pay(params, opts); | 108 | return WxPay.I.pay(params, opts); |
| 109 | } | 109 | } |
| 110 | /** | 110 | /** |
| @@ -137,7 +137,7 @@ export default class GameService { | @@ -137,7 +137,7 @@ export default class GameService { | ||
| 137 | let model = WxSystem.I.model; | 137 | let model = WxSystem.I.model; |
| 138 | let version = WxSystem.I.version; | 138 | let version = WxSystem.I.version; |
| 139 | let system = WxSystem.I.system; | 139 | let system = WxSystem.I.system; |
| 140 | - let platform = WxSystem.I.platform == "android" ? "android" : "ios"; | 140 | + let platform = WxSystem.I.platform == "ios" ? "ios" : "android"; |
| 141 | let sdkversion = WxSystem.I.SDKVersion; | 141 | let sdkversion = WxSystem.I.SDKVersion; |
| 142 | let scene = DataService.I.Scene + ''; | 142 | let scene = DataService.I.Scene + ''; |
| 143 | let uid = DataService.I.UserId; | 143 | let uid = DataService.I.UserId; |
wxsdk/service/ShareVideoService.ts
| @@ -402,7 +402,8 @@ export default class ShareVideoService { | @@ -402,7 +402,8 @@ export default class ShareVideoService { | ||
| 402 | params = { | 402 | params = { |
| 403 | ...params, | 403 | ...params, |
| 404 | channel_id: GAMEDATA.channel_id, | 404 | channel_id: GAMEDATA.channel_id, |
| 405 | - user_invite_uid: DataService.I.UserId | 405 | + user_invite_uid: DataService.I.UserId, |
| 406 | + user_invite_openid:DataService.I.OpenId | ||
| 406 | }; | 407 | }; |
| 407 | let query = ''; | 408 | let query = ''; |
| 408 | for (let key in params) { | 409 | for (let key in params) { |
wxsdk/wx/WxInterstitial.ts
| @@ -38,8 +38,8 @@ export default class WxInterstitial { | @@ -38,8 +38,8 @@ export default class WxInterstitial { | ||
| 38 | WxInterstitial.interstitialSuccell = true; | 38 | WxInterstitial.interstitialSuccell = true; |
| 39 | LogService.I.adStat('InterstitialAd', this.interstitialAdId, DOT_AD_TYPE.interstitial, DOT_AD_STATUS.rt) | 39 | LogService.I.adStat('InterstitialAd', this.interstitialAdId, DOT_AD_TYPE.interstitial, DOT_AD_STATUS.rt) |
| 40 | if (isShow) { | 40 | if (isShow) { |
| 41 | + this.interstitialAd.show(); | ||
| 41 | LogService.I.adStat('InterstitialAd', this.interstitialAdId, DOT_AD_TYPE.interstitial, DOT_AD_STATUS.show) | 42 | LogService.I.adStat('InterstitialAd', this.interstitialAdId, DOT_AD_TYPE.interstitial, DOT_AD_STATUS.show) |
| 42 | - this.interstitialAd.show() | ||
| 43 | } | 43 | } |
| 44 | }) | 44 | }) |
| 45 | this.interstitialAd.onError(err => { | 45 | this.interstitialAd.onError(err => { |
wxsdk/wx/WxPay.ts
| @@ -59,7 +59,7 @@ export default class WxPay { | @@ -59,7 +59,7 @@ export default class WxPay { | ||
| 59 | resolve(res); | 59 | resolve(res); |
| 60 | } else { | 60 | } else { |
| 61 | t = Math.min(t * 2, 60000) | 61 | t = Math.min(t * 2, 60000) |
| 62 | - console.error("上报失败，重新上报", t) | 62 | + // console.error("上报失败，重新上报", t) |
| 63 | setTimeout(() => { | 63 | setTimeout(() => { |
| 64 | that.handlePaySuccess(data, opts, resolve, reject, t) | 64 | that.handlePaySuccess(data, opts, resolve, reject, t) |
| 65 | }, t); | 65 | }, t); |