diff --git a/project.config.json b/project.config.json index d83a08e..fb9d557 100644 --- a/project.config.json +++ b/project.config.json @@ -29,7 +29,7 @@ "list": [] }, "miniprogram": { - "current": 0, + "current": 1, "list": [ { "id": 0, @@ -41,6 +41,13 @@ "appId": "wxbf333d56b4de3905", "extraData": "{ \"type\": \"item\", \"event_type\": \"pay_result\", \"success\": true, \"gid\": 1100309 }" } + }, + { + "id": 1, + "name": "分享游戏", + "pathName": "pages/index", + "query": "roomId=1100309&gid=7000006&togame=1", + "scene": null } ] } diff --git a/src/common/global.js b/src/common/global.js index 06a08f8..3fa8f3a 100644 --- a/src/common/global.js +++ b/src/common/global.js @@ -1,7 +1,7 @@ export default { // apiBase: 'http://192.168.100.226', apiBase: 'https://ghost-test.kingsome.cn', - cdnBase: 'https://resource.kingsome.cn/emulator/v1.0.0/', + cdnBase: 'http://h5games-al.kingsome.cn/emulator-static/', version: '1.0.0', gameTypes: ['射击','格斗', '角色扮演','动作角色扮演', '赛车', '动作游戏','策略战棋', '其他', diff --git a/src/jcfw/common/httpcli.js b/src/jcfw/common/httpcli.js index 3409c41..554e97f 100755 --- a/src/jcfw/common/httpcli.js +++ b/src/jcfw/common/httpcli.js @@ -99,29 +99,29 @@ var httpcli = function(){ cbRes && cbRes(restext); }else{ cbErr && cbErr(res.statusCode, res.msg); - } + } }, fail: function(res){ - console.log("[wx]request fail!"+ JSON.stringify(res)); - if(!isretry && this._needretry){ + console.log("[wx]request fail!"+ JSON.stringify(res)); + if(!isretry && self._needretry){ let obj = { u: url, v: urldata, successcb: cbRes, errcb: cbErr }; - this.cachemsg.push(obj); + self.cachemsg.push(obj); }else{ cbErr && cbErr(-1, res.msg); - } - // cbErr && cbErr(-1, res.msg); + } + // cbErr && cbErr(-1, res.msg); }, complete: function(){ - this._runningcount--; + self._runningcount--; console.log("[wx]request complete!"); - } + } }); - return xhr; + return xhr; } return null; }; @@ -140,7 +140,7 @@ var httpcli = function(){ } obj.passtime += this._retryms; bneedretry = (obj.passtime >= obj.retry_count * this._retryms); - + if(bneedretry && !obj.retrying){ obj.retrying = true; let method = obj.v? 'POST': 'GET'; diff --git a/src/pages/game.wpy b/src/pages/game.wpy index 7ecd3e1..9fbee48 100644 --- a/src/pages/game.wpy +++ b/src/pages/game.wpy @@ -2,7 +2,7 @@ @@ -13,14 +13,56 @@ export default class GameWebPage extends wepy.page { components = {}; data = { - link: '' + link: '', + roomId: '', + gid: '' + }; + methods = { + webloaded: function(e) { + console.log('page load finished'); + console.log(e); + }, + webloaderror: function(e) { + console.log('page load error'); + console.log(e); + }, + onMessage: function(e) { + if (e.detail.data) { + let data = e.detail.data; + this.roomId = data[0]; + } + } }; - methods = {}; onLoad(params) { + this.gid = params.gid; this.link = decodeURIComponent(params.link); - console.log(this.link); + console.log('load page: ' + this.link); this.$apply(); } + onShareAppMessage() { + let self = this; + let account = wepy.getStorageSync('account'); + return { + title: '来玩啊', + path: `/pages/index?isShare=1&inviter_id=${account.account_id}&roomId=${this.roomId}&gid=${this.gid}&togame=1`, + imageUrl: 'https://resource.kingsome.cn/dalmatian/wapp/share.jpg', + success: function (res) { + wepy.getShareInfo({ + shareTicket: res.shareTickets[0] + }) + .then(res => { + console.log(res); + }) + .catch(err => { + console.log(err) + }) + }, + fail: function (res) { + // 分享失败 + console.log(res) + } + } + } } diff --git a/src/pages/gameInfo.wpy b/src/pages/gameInfo.wpy index 2fae671..6705914 100644 --- a/src/pages/gameInfo.wpy +++ b/src/pages/gameInfo.wpy @@ -113,7 +113,11 @@ bottomMainTap(e) { console.log('bottomMainTap'); if (this.record.owned || this.vip) { - this.playGame(); + if (this.record.category === 'fc') { + this.openPlayMenu(); + } else { + this.playGame(); + } } else { //显示购买游戏界面 this.showBuyMenu(); @@ -187,22 +191,25 @@ this.zActionSheetCfg.goldTitle = `金币开通(${this.record.score})`; this.zActionSheetCfg.hide = false; } - playGame() { + playGame(multip) { http.post('/api/emulated/play_game', { gid: this.id }) .then(res => { console.log('success update game history'); jcEvent.emit(jcEvent.events.UPDATE_RECENT_GAMES, {}); let url; if (this.record.category === 'fc') { - url = `${this.fcUrl}/id=${this.id}`; + url = `${this.fcUrl}?id=${this.id}`; + if (multip) { + url += '&roomId=0'; + } } else { - url = `${this.gbaUrl1}/id=${this.id}`; + url = `${this.gbaUrl1}?id=${this.id}`; if (this.record.fixed) { - url = `${this.gbaUrl2}/id=${this.id}`; + url = `${this.gbaUrl2}?id=${this.id}`; } } wepy.navigateTo({ - url: '/pages/game?link=' + url + url: '/pages/game?link=' + encodeURIComponent(url) + '&gid=' + this.id }); }) .catch(err => { @@ -290,5 +297,15 @@ console.log(err); } } + async openPlayMenu () { + let res = await wepy.showActionSheet({ + itemList: ['单人', '联机'] + }); + + if (!res.cancel) { + console.log(res.tapIndex); + this.playGame(res.tapIndex) + } + } } diff --git a/src/pages/index.wpy b/src/pages/index.wpy index db5169a..7ca2c54 100644 --- a/src/pages/index.wpy +++ b/src/pages/index.wpy @@ -119,18 +119,7 @@ } async onLoad(options) { - let userInfo = this.$parent.getUserInfo(); let self = this; - if (userInfo) { - this.nickname = userInfo.nickName; - this.avatar = userInfo.avatarUrl; - this.$apply(); - } - if (this.$parent.checkAuthorize()) { - wepy.navigateTo({ - url: '/pages/login' - }) - } if (!this.$parent.checkClientLogin()) { this.getAllData(); this.vip_params = `token=${this.$parent.getGlobalDate('gameToken')}`; @@ -169,6 +158,16 @@ this.showToast('购买失败', 2000); } }) + if (options.togame) { + let cfg = wepy.getStorageSync('cfg'); + let fcUrl = cfg.fcurl; + let roomId = options.roomId; + let gid = options.gid; + let link = `${fcUrl}?id=${gid}&roomId=${roomId}`; + wepy.navigateTo({ + url: '/pages/game?link=' + encodeURIComponent(link) + '&gid=' + gid + }); + } } getAllData() { this.getRecords(); @@ -194,6 +193,11 @@ this.avatar = userInfo.avatarUrl; this.$apply(); } + if (this.$parent.checkAuthorize()) { + wepy.navigateTo({ + url: '/pages/login' + }) + } } initPageParam() { this.all_count = 999;