diff --git a/project.config.json b/project.config.json index f443360..fb66f53 100644 --- a/project.config.json +++ b/project.config.json @@ -29,7 +29,7 @@ "list": [] }, "miniprogram": { - "current": 1, + "current": 2, "list": [ { "id": 0, @@ -47,6 +47,18 @@ "name": "分享游戏", "pathName": "pages/index", "query": "roomId=5566743627830405120010001&gid=7002058&togame=1", + "scene": 1044, + "shareInfo": { + "groupName": "测试模拟群0", + "shareName": "l1lFQSfRNyzbmItaNydLIfww4aDGgwnR63arsQsO07E@cr4dev", + "shareKey": "lUMRXfJ9aVJvH6p3EENpKuCMv3DfAYJcvdXNnO0B1DMGOF3tfjd7W-PcTEfQeD48L4OQkB2r2OqRKme3-K31wQ~~" + } + }, + { + "id": 2, + "name": "成就分享", + "pathName": "pages/index", + "query": "isShare=1&inviter_id=6001_8004_o5FrX5a3VI5aE7kwgn7Qe7hriJ8Y&shareType=achivement", "scene": null } ] diff --git a/src/app.wpy b/src/app.wpy index e76cb8a..69ab1f7 100644 --- a/src/app.wpy +++ b/src/app.wpy @@ -201,14 +201,14 @@ export default class extends wepy.app { updateVip(vip) { this.globalData.vip = vip; } - getShareCount(cb) { - sdkManage.getAchievInviteeNum(cb); + getShareCount() { + return sdkManage.getAchievInviteeNum(); } getShareDetail(cb) { - sdkManage.queryAchievementShareDetail(cb); + return sdkManage.queryAchievementShareDetail(cb); } - updateUserInfo(allInfo, cb) { - sdkManage.updateUser(allInfo, cb); + updateUserInfo(allInfo) { + return sdkManage.updateUser(allInfo); } } diff --git a/src/jcfw/SDKManage.js b/src/jcfw/SDKManage.js index c4bb510..e824d37 100755 --- a/src/jcfw/SDKManage.js +++ b/src/jcfw/SDKManage.js @@ -151,22 +151,24 @@ var SDKManage = function() { this.getStorage(['aaa', 'bbb'], cb); }; - this.getAchievInviteeNum = function(cb) { - var callback = function(res) { - console.log('playerData.invitee_nums'); - console.log(res); - var invitee_nums = 0; - for (var i = 0; i < res.length; i++) { - if (res[i].achievement_id == 100) { - invitee_nums = res[i].invitee_num;//邀请玩家数 - break; + this.getAchievInviteeNum = function() { + return new Promise((resolve, reject) => { + const callback = function(res) { + console.log('playerData.invitee_nums'); + console.log(res); + let invitee_nums = 0; + for (let i = 0; i < res.length; i++) { + if (res[i].achievement_id == 100) { + invitee_nums = res[i].invitee_num;//邀请玩家数 + break; + } } - } - if (cb) { - cb(invitee_nums); - } - }; - jcshare.getAchievInviteeNum(callback); + resolve(invitee_nums); + }; + jcshare.getAchievInviteeNum(callback, (err) => { + reject(err); + }); + }) }; @@ -189,19 +191,27 @@ var SDKManage = function() { ]; this.doLogin(); }; - this.queryAchievementShareDetail = function(cb) { - var callback = function(res) { - console.log('playerData.invitee_detail'); - console.log(res); - if (cb) { - cb(res); - } - }; - jcshare.queryAchievementShareDetail([1001], callback, function() {}); + this.queryAchievementShareDetail = function() { + return new Promise((resolve, reject) => { + const callback = function(res) { + const result = res[100] || []; + resolve(result); + }; + jcshare.queryAchievementShareDetail([100], callback, function() { + reject(); + }); + }); + }; + this.updateUser = function(allInfo) { + return new Promise((resolve, reject) => { + jcfw.updateUser(allInfo, (obj) => { + resolve(obj); + },(err) => { + reject(err); + }) + }) + }; - this.updateUser = function(allInfo, cb) { - jcfw.updateUser(allInfo, cb) - } }; diff --git a/src/pages/index.wpy b/src/pages/index.wpy index 5f9adff..fc0a572 100644 --- a/src/pages/index.wpy +++ b/src/pages/index.wpy @@ -89,7 +89,8 @@ vip_btn_title: '激活', vip_params: '', showBuy: false, - payVer: 'develop' + payVer: 'develop', + achivement: false, }; methods = { @@ -98,10 +99,12 @@ url: '/pages/gameInfo?id=' + gid }) }, - toSearch() { - wepy.navigateTo({ - url: '/pages/search' - }) + async toSearch() { + // wepy.navigateTo({ + // url: '/pages/search' + // }) + let res = await this.$parent.getShareDetail(); + console.log(res); } }; onPullDownRefresh() { @@ -317,12 +320,15 @@ this.noMore = true; } onShareAppMessage() { - let self = this; let account = wepy.getStorageSync('account'); let shareObj = this.$getShareCfg(); + let shareUrl = `/pages/index?isShare=1&inviter_id=${account.account_id}`; + if (this.achivement) { + shareUrl += '&shareType=achivement' + } return { title: shareObj.str, - path: `/pages/index?isShare=1&inviter_id=${account.account_id}`, + path: shareUrl, imageUrl: shareObj.image, success: function (res) { wepy.getShareInfo({ diff --git a/src/pages/jumppage.wpy b/src/pages/jumppage.wpy index c7282b8..c3c8280 100644 --- a/src/pages/jumppage.wpy +++ b/src/pages/jumppage.wpy @@ -106,16 +106,14 @@ } }; - onLoad(params) { + async onLoad(params) { this.env = g.env; this.text = decodeURIComponent(params.text); this.aid = decodeURIComponent(params.aid); this.ad_price = this.$getExtCfg('ad_price'); console.log(`aid : ${this.aid}`); let self = this; - this.$parent.getShareCount(count => { - self.shareCount = count; - }); + this.shareCount = await this.$parent.getShareCount(); let cfg = wepy.getStorageSync('cfg'); let gameArr = []; (cfg && cfg.ad_games) && (gameArr = JSON.parse(cfg.ad_games)); diff --git a/src/pages/login.wpy b/src/pages/login.wpy index 6b8e246..38905b1 100644 --- a/src/pages/login.wpy +++ b/src/pages/login.wpy @@ -42,13 +42,13 @@ } methods = { - bindGetUserInfo: function(e) { + bindGetUserInfo: async function(e) { let self = this if (e.detail.userInfo) { this.jcLog(e.detail); wepy.setStorageSync('userInfo', JSON.stringify(e.detail.userInfo)); self.$parent.updateGlobalData('userInfo', e.detail.userInfo); - self.$parent.updateUserInfo(e.detail); + await self.$parent.updateUserInfo(e.detail); wepy.navigateBack({ delta: 1 }) diff --git a/wepy.config.js b/wepy.config.js index b7a82c1..b1c7b32 100644 --- a/wepy.config.js +++ b/wepy.config.js @@ -37,6 +37,7 @@ module.exports = { 'transform-decorators-legacy', 'transform-object-rest-spread', 'transform-export-extensions', + 'syntax-export-extensions' ] } },