Commit ce3c48e92a934fba7385b2698093d8b5036e4a3e
1 parent
f275bfc7
Exists in
master
and in
3 other branches
扫码支付
Showing
6 changed files
with
32 additions
and
24 deletions
Show diff stats
sdk/shareTools.ts
| 1 | -import { utils } from "../Base/utils"; | ||
| 2 | import { WxHelper } from "../Base/WxHelper"; | 1 | import { WxHelper } from "../Base/WxHelper"; |
| 3 | import WXSDK from "../wxsdk/WXSDK"; | 2 | import WXSDK from "../wxsdk/WXSDK"; |
| 4 | import { OnlineKeys, SDKTools } from "./SDKTools"; | 3 | import { OnlineKeys, SDKTools } from "./SDKTools"; |
| @@ -50,7 +49,11 @@ export class ShareTools { | @@ -50,7 +49,11 @@ export class ShareTools { | ||
| 50 | } | 49 | } |
| 51 | this.onShowAd = false; | 50 | this.onShowAd = false; |
| 52 | if (!params || !params.fail) { | 51 | if (!params || !params.fail) { |
| 53 | - utils.tips(err.msg) | 52 | + wx.showToast({ |
| 53 | + title: err.msg, | ||
| 54 | + icon: 'none', | ||
| 55 | + duration: 1500 | ||
| 56 | + }) | ||
| 54 | } else { | 57 | } else { |
| 55 | params && params.fail && params.fail(err); | 58 | params && params.fail && params.fail(err); |
| 56 | } | 59 | } |
wxsdk/base/SDKConst.ts
| 1 | // 游戏配置数据 只需要改动这里的配置信息 | 1 | // 游戏配置数据 只需要改动这里的配置信息 |
| 2 | // 游戏配置数据 只需要改动这里的配置信息 | 2 | // 游戏配置数据 只需要改动这里的配置信息 |
| 3 | export const GAMEDATA = { | 3 | export const GAMEDATA = { |
| 4 | - game_id: '10045', | ||
| 5 | - channel_id: '10045', | ||
| 6 | - version: '1.0.0', | ||
| 7 | - appkey: '6c7d8ee586f3c4a1a6b5c84554f49079', | ||
| 8 | - interstitialAdId: 'adunit-e8f80e01fb6e1b8e',//插屏ID | ||
| 9 | - bannerId: 'adunit-cc8fff6dee9188d4',//banner | 4 | + game_id: '10000', |
| 5 | + channel_id: '10080', | ||
| 6 | + version: '1.0.0', //游戏版本号，发版前+1 | ||
| 7 | + appkey: 'cf2ea5aca60b562d927805c52876a96c', | ||
| 8 | + interstitialAdId: 'adunit-638f9158bce2c31e',//插屏ID | ||
| 9 | + bannerId: '',//banner | ||
| 10 | gridId: '',//格子 | 10 | gridId: '',//格子 |
| 11 | - customId: 'adunit-cf69738dc3970fa7',//原生模板单个 //adunit-fb925feb16d2c13b | ||
| 12 | - videoAd: 'adunit-4f1adc59ecc219bb',//初始化视频广告id | 11 | + customId: 'adunit-3ecef510636baa07',//原生模板单个 //adunit-fb925feb16d2c13b |
| 12 | + videoAd: 'adunit-638f9158bce2c31e',//初始化视频广告id | ||
| 13 | shareMessageToFriend: { // 暂时只支持一个场景值 | 13 | shareMessageToFriend: { // 暂时只支持一个场景值 |
| 14 | scene: 10, //定向分享场景值1-50 配>0的会初始化 | 14 | scene: 10, //定向分享场景值1-50 配>0的会初始化 |
| 15 | sharekey: 'shareMessageToFriendScene',//定向分享对应后台的分享key | 15 | sharekey: 'shareMessageToFriendScene',//定向分享对应后台的分享key |
| 16 | share_id: 26,//定向分享对应后台的分享key | 16 | share_id: 26,//定向分享对应后台的分享key |
| 17 | }, | 17 | }, |
| 18 | default_share: { | 18 | default_share: { |
| 19 | - content: '2021最新的数独题库来啦！', | ||
| 20 | - icon: 'https://cdn-wxsdk.miso-lab.com/0a/1c4c9d24237b33a4c6fd81d35e7ade.png?attname=share.png', | 19 | + content: '分享标题.....', |
| 20 | + icon: '分享图链接', | ||
| 21 | id: '9999', | 21 | id: '9999', |
| 22 | key: 'default', | 22 | key: 'default', |
| 23 | title: '默认', | 23 | title: '默认', |
| @@ -25,7 +25,7 @@ export const GAMEDATA = { | @@ -25,7 +25,7 @@ export const GAMEDATA = { | ||
| 25 | videoid: '' | 25 | videoid: '' |
| 26 | }, | 26 | }, |
| 27 | MidasPay: { // 米大师虚拟支付配置 | 27 | MidasPay: { // 米大师虚拟支付配置 |
| 28 | - OfferId: "1450031480", // 在米大师申请的应用id | 28 | + OfferId: "0000000000", // 在米大师申请的应用id |
| 29 | ZoneId: "1", // 分区ID，默认：1 | 29 | ZoneId: "1", // 分区ID，默认：1 |
| 30 | Mode: "game", // 默认：game | 30 | Mode: "game", // 默认：game |
| 31 | CurrencyType: "CNY", // 默认：CNY | 31 | CurrencyType: "CNY", // 默认：CNY |
wxsdk/service/GameService.ts
| @@ -137,11 +137,12 @@ export default class GameService { | @@ -137,11 +137,12 @@ 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 == "ios" ? "ios" : "android"; | 140 | + let platform = WxSystem.I.platform; |
| 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; |
| 144 | let env = DataService.I.EnvEnum === 1 ? 'pre' : 'prod'; | 144 | let env = DataService.I.EnvEnum === 1 ? 'pre' : 'prod'; |
| 145 | + let openid = DataService.I.OpenId; | ||
| 145 | return { | 146 | return { |
| 146 | gameid, | 147 | gameid, |
| 147 | channel, | 148 | channel, |
| @@ -153,7 +154,8 @@ export default class GameService { | @@ -153,7 +154,8 @@ export default class GameService { | ||
| 153 | sdkversion, | 154 | sdkversion, |
| 154 | scene, | 155 | scene, |
| 155 | uid, | 156 | uid, |
| 156 | - env | 157 | + env, |
| 158 | + openid | ||
| 157 | }; | 159 | }; |
| 158 | } | 160 | } |
| 159 | 161 |
wxsdk/service/LogService.ts
| @@ -38,11 +38,7 @@ export default class LogService { | @@ -38,11 +38,7 @@ export default class LogService { | ||
| 38 | setRegFinishState(state: number) { | 38 | setRegFinishState(state: number) { |
| 39 | this.regFinishState = state; | 39 | this.regFinishState = state; |
| 40 | } | 40 | } |
| 41 | - | ||
| 42 | - private get SystemId() { | ||
| 43 | - return DataService.I.SystemId; | ||
| 44 | - } | ||
| 45 | - | 41 | + |
| 46 | private get LaunchTime() { | 42 | private get LaunchTime() { |
| 47 | return DataService.I.LaunchTime; | 43 | return DataService.I.LaunchTime; |
| 48 | } | 44 | } |
wxsdk/service/ShareVideoService.ts
| @@ -48,7 +48,7 @@ export default class ShareVideoService { | @@ -48,7 +48,7 @@ export default class ShareVideoService { | ||
| 48 | * 分享 | 48 | * 分享 |
| 49 | * @param shareKey | 49 | * @param shareKey |
| 50 | * @param params | 50 | * @param params |
| 51 | - * @param opts 目前支持4个key 1，title自定义分享标题 2，img_url自定义分享图片 3，share_type（不走后台配置写死走视频or分享。1分享2视频3无视频则分享）4，closeSimulate是否关闭模拟分享 | 51 | + * @param opts 目前支持4个key 1，title自定义分享标题 2，img_url自定义分享图片 3，share_type（不走后台配置写死走视频or分享。1分享2视频3无视频则分享）4，closeSimulate是否关闭模拟分享 5，query需要拼接到query的字段 |
| 52 | */ | 52 | */ |
| 53 | share(shareKey: string, params: any = {}, opts: any = {}): Promise<any> { | 53 | share(shareKey: string, params: any = {}, opts: any = {}): Promise<any> { |
| 54 | return new Promise((resolve, reject) => { | 54 | return new Promise((resolve, reject) => { |
| @@ -57,7 +57,7 @@ export default class ShareVideoService { | @@ -57,7 +57,7 @@ export default class ShareVideoService { | ||
| 57 | title: content, | 57 | title: content, |
| 58 | imageUrl: icon, | 58 | imageUrl: icon, |
| 59 | share_id: id, | 59 | share_id: id, |
| 60 | - query: this.createQuery({ share_key: key, share_id: id }), | 60 | + query: this.createQuery({ share_key: key, share_id: id, query: opts.query }), |
| 61 | }; | 61 | }; |
| 62 | if (opts) { | 62 | if (opts) { |
| 63 | if (opts.title) _params.title = opts.title; | 63 | if (opts.title) _params.title = opts.title; |
| @@ -399,11 +399,18 @@ export default class ShareVideoService { | @@ -399,11 +399,18 @@ export default class ShareVideoService { | ||
| 399 | } | 399 | } |
| 400 | 400 | ||
| 401 | private createQuery(params = {}): string { | 401 | private createQuery(params = {}): string { |
| 402 | + let q = params["query"]; | ||
| 403 | + delete params["query"]; | ||
| 404 | + if (q) { | ||
| 405 | + for (let i in q) { | ||
| 406 | + params[i] = q[i]; | ||
| 407 | + } | ||
| 408 | + } | ||
| 402 | params = { | 409 | params = { |
| 403 | ...params, | 410 | ...params, |
| 404 | channel_id: GAMEDATA.channel_id, | 411 | channel_id: GAMEDATA.channel_id, |
| 405 | user_invite_uid: DataService.I.UserId, | 412 | user_invite_uid: DataService.I.UserId, |
| 406 | - user_invite_openid:DataService.I.OpenId | 413 | + user_invite_openid: DataService.I.OpenId |
| 407 | }; | 414 | }; |
| 408 | let query = ''; | 415 | let query = ''; |
| 409 | for (let key in params) { | 416 | for (let key in params) { |
wxsdk/wx/WxPay.ts
| @@ -15,7 +15,7 @@ export default class WxPay { | @@ -15,7 +15,7 @@ export default class WxPay { | ||
| 15 | // 环境配置，0：米大师正式环境 1：米大师沙箱环境 | 15 | // 环境配置，0：米大师正式环境 1：米大师沙箱环境 |
| 16 | let env = DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1; | 16 | let env = DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1; |
| 17 | // 平台类型，android or ios，config.js有配置走配置，否则判断系统id | 17 | // 平台类型，android or ios，config.js有配置走配置，否则判断系统id |
| 18 | - let platform = Platform || (DataService.I.SystemId === 0 ? 'ios' : 'android'); | 18 | + let platform = DataService.I.Platform; |
| 19 | let pms = { | 19 | let pms = { |
| 20 | mode: Mode, | 20 | mode: Mode, |
| 21 | env, | 21 | env, |