From f028c0088c7d6cc9c65aca2dea19e91ee0ecb439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=B7=E6=B4=8B=E4=B9=8B=E5=A3=B0?= Date: Mon, 22 Oct 2018 16:37:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=9B=B8=E5=85=B3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2merge=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 5 ++- config/config.js | 17 +++----- pages/game/index.js | 16 ++------ pages/index/gameentry/gentry.js | 66 +++++++++++++++++++++++++++++++ pages/index/gameentry/gentry.json | 1 + pages/index/gameentry/gentry.wxml | 2 + pages/index/gameentry/gentry.wxss | 1 + project.config.json | 2 +- 8 files changed, 82 insertions(+), 28 deletions(-) create mode 100644 pages/index/gameentry/gentry.js create mode 100644 pages/index/gameentry/gentry.json create mode 100644 pages/index/gameentry/gentry.wxml create mode 100644 pages/index/gameentry/gentry.wxss diff --git a/app.json b/app.json index fab9bca..249917c 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,6 @@ { "pages": [ "pages/index/index", - "pages/game/index", "pages/edit/edit", "pages/cartest/cartest", "pages/actdetail/actdetail", @@ -31,7 +30,9 @@ "pages/passCar/couponDetail/couponDetail", "pages/managelicenseplate/managelicenseplate", "pages/payrule/payrule", - "pages/grade/grade" + "pages/grade/grade", + "pages/game/index", + "pages/index/gameentry/gentry" ], "tabBar": { "color": "#9F9F9F", diff --git a/config/config.js b/config/config.js index 245a24b..559c3c9 100755 --- a/config/config.js +++ b/config/config.js @@ -1,7 +1,7 @@ var config = { // url: "http://10.11.205.51:7000/C/api", - // url: "https://ciformall.youlane.cn/C/api", - url:"https://c.malls.iformall.com/C/api", + url: "https://ciformall.youlane.cn/C/api", + // url:"https://c.malls.iformall.com/C/api", // url: "http://31adc9ce.ngrok.io/C/api", api: { /** @@ -146,22 +146,15 @@ var config = { * title * 描述 */ - getWeapNote: '/mall/getWeapNote', - scoreLevelInfo: '/mall/scoreLevelInfo', - getWeRunData: '/user/getWeRunData', + getWeapNote:'/mall/getWeapNote', /** * 小程序获取游戏路径 */ - getGame:'/game/getOne', - /** - * 用户更新信息 - */ - updateInfo:"/user/updateUserInfo" - + getGame:'/game/getOne' }, weapp: { - AppId: "wx026ee7f6290aa336" + AppId: "wxea71200db93d756b" }, ErrorCode: { NICK_NOT_AUTH: 11004, diff --git a/pages/game/index.js b/pages/game/index.js index 801ba84..05238f1 100644 --- a/pages/game/index.js +++ b/pages/game/index.js @@ -12,11 +12,10 @@ Page({ onShareAppMessage: function (res) { let _this=this; return { - title: '富茂小游戏', - path: 'pages/game/index', + title: '自定义转发标题', + path: 'pages/index/index', success: function (res) { // 转发成功 - }, fail: function (res) { // 转发失败 @@ -39,18 +38,9 @@ Page({ if (options.share){ // wx.onShareAppMessage(); }else{ - // Http.get({ - // url: config.api.getGame, - // data: { - // token: app.globalData.token, - // } - // }) - // .then(res => { - // console.log(res.data, 333); - // }) this.setData({ url: options.url + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id, - // url: "http://10.11.195.31:8080/luckCard/" + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id, + // url: "http://10.11.195.31:8080/goldEgg/" + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id, }); } } diff --git a/pages/index/gameentry/gentry.js b/pages/index/gameentry/gentry.js new file mode 100644 index 0000000..a3185cf --- /dev/null +++ b/pages/index/gameentry/gentry.js @@ -0,0 +1,66 @@ +// pages/index/gameentry/gentry.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/index/gameentry/gentry.json b/pages/index/gameentry/gentry.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/pages/index/gameentry/gentry.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/pages/index/gameentry/gentry.wxml b/pages/index/gameentry/gentry.wxml new file mode 100644 index 0000000..ad0a5e7 --- /dev/null +++ b/pages/index/gameentry/gentry.wxml @@ -0,0 +1,2 @@ + +pages/index/gameentry/gentry.wxml diff --git a/pages/index/gameentry/gentry.wxss b/pages/index/gameentry/gentry.wxss new file mode 100644 index 0000000..c729821 --- /dev/null +++ b/pages/index/gameentry/gentry.wxss @@ -0,0 +1 @@ +/* pages/index/gameentry/gentry.wxss */ \ No newline at end of file diff --git a/project.config.json b/project.config.json index 3b57d21..e840d99 100644 --- a/project.config.json +++ b/project.config.json @@ -12,7 +12,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx026ee7f6290aa336", + "appid": "wxea71200db93d756b", "projectname": "C", "isGameTourist": false, "condition": {