diff --git a/app.js b/app.js index e0da38c..c583277 100644 --- a/app.js +++ b/app.js @@ -1,20 +1,19 @@ - App({ - onLaunch: function () { + onLaunch: function() { var that = this; wx.getSystemInfo({ - success: function (res) { + success: function(res) { that.globalData.winHeight = res.windowHeight; } }); }, - onShow: function (options) { + onShow: function(options) { var that = this; var path = options.path; if (options.query.id) { wx.reLaunch({ url: '/pages/login/login', - complete: function (res) { + complete: function(res) { that.globalData.shareInPath = path; that.globalData.shareInParameter = options.query; }, @@ -25,7 +24,7 @@ App({ shareInPath: "", shareInParameter: {}, shareInState: 1, - winHeight:0, + winHeight: 0, cookie: "", decryptCookie: '', userInfo: null, @@ -35,8 +34,15 @@ App({ phoneNum: "", openID: "", appID: "wx0b897783b2588147", - userID:"", - selectStartDate:null, - selectEndDate:null, + userID: "", + selectStartDate: null, + selectEndDate: null, }, + + // { + // "pagePath": "pages/homePage/homePage", + // "text": "消息", + // "iconPath": "/imgs/message1.png", + // "selectedIconPath": "/imgs/message.png" + // }, }) \ No newline at end of file diff --git a/app.json b/app.json index 8cab319..d5e8311 100644 --- a/app.json +++ b/app.json @@ -44,12 +44,6 @@ "iconPath": "/imgs/xiaoxi1.png", "selectedIconPath": "/imgs/xiaoxi.png" }, - { - "pagePath": "pages/homePage/homePage", - "text": "消息", - "iconPath": "/imgs/message1.png", - "selectedIconPath": "/imgs/message.png" - }, { "pagePath": "pages/my/my", "text": "我的", diff --git a/pages/my/my.json b/pages/my/my.json index 9e26dfe..1da73fa 100644 --- a/pages/my/my.json +++ b/pages/my/my.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "navigationBarTitleText": "我的" +} \ No newline at end of file diff --git a/pages/my/my.wxml b/pages/my/my.wxml index 4928c59..f8e3c87 100644 --- a/pages/my/my.wxml +++ b/pages/my/my.wxml @@ -4,13 +4,13 @@ - {{meName}}李丽丽 - {{mePhone}}1234567890 + {{meName}} + {{mePhone}} -设置 + \ No newline at end of file