| @@ -24,6 +24,17 @@ App({ | |||||
| that.globalData.isIphoneX = res.model.indexOf("iPhone X") >= 0 || res.model.indexOf("iPhone 1") >= 0; | that.globalData.isIphoneX = res.model.indexOf("iPhone X") >= 0 || res.model.indexOf("iPhone 1") >= 0; | ||||
| } | } | ||||
| }); | }); | ||||
| var that = this ; | |||||
| // iphoneX顶部适配 | |||||
| wx.getSystemInfo({ | |||||
| success: function (res) { | |||||
| console.log(res); | |||||
| if (res.statusBarHeight > 20) { | |||||
| console.log("Device is iPhoneX!!!"); | |||||
| that.globalData.isIPX = true; | |||||
| } | |||||
| } | |||||
| }) | |||||
| }, | }, | ||||
| onShow() { | onShow() { | ||||
| @@ -58,6 +69,7 @@ App({ | |||||
| , | , | ||||
| systemType:'',//设备类型 Android IOS | systemType:'',//设备类型 Android IOS | ||||
| isIphoneX: false, // 用来标识当前手机机型是否为 iPhone X | isIphoneX: false, // 用来标识当前手机机型是否为 iPhone X | ||||
| isIPX:false | |||||
| }, | }, | ||||
| /** | /** | ||||
| * 从服务端获取openId | * 从服务端获取openId | ||||
| @@ -3,10 +3,13 @@ | |||||
| "pages/user/login/login", | "pages/user/login/login", | ||||
| "pages/index/index", | "pages/index/index", | ||||
| "pages/handle/liist", | "pages/handle/liist", | ||||
| "pages/handle/expenditureAudit/expenditureAudit" | |||||
| "pages/handle/expenditureAudit/expenditureAudit", | |||||
| "pages/apply/index" | |||||
| ], | ], | ||||
| "window": { | "window": { | ||||
| "backgroundTextStyle": "light", | "backgroundTextStyle": "light", | ||||
| "navigationStyle": "custom", | |||||
| "enablePullDownRefresh": true, | |||||
| "navigationBarBackgroundColor": "#fff", | "navigationBarBackgroundColor": "#fff", | ||||
| "navigationBarTitleText": "农燊高科", | "navigationBarTitleText": "农燊高科", | ||||
| "navigationBarTextStyle": "black" | "navigationBarTextStyle": "black" | ||||
| @@ -47,3 +47,18 @@ contact-button { | |||||
| white-space: nowrap; | white-space: nowrap; | ||||
| } | } | ||||
| .ns { | |||||
| width: 100%; | |||||
| text-align:center; | |||||
| background:linear-gradient(to right, #2C8E68, #B3DB62); | |||||
| } | |||||
| .ns text{ | |||||
| position: relative; | |||||
| top: 30px; | |||||
| margin-right: 30px; | |||||
| display: block; | |||||
| color: #eee; | |||||
| text-align: center; | |||||
| width: 100%; | |||||
| font-size: 16px; | |||||
| } | |||||
| @@ -0,0 +1,67 @@ | |||||
| // pages/apply/index.js | |||||
| const app = getApp(); | |||||
| Page({ | |||||
| /** | |||||
| * 页面的初始数据 | |||||
| */ | |||||
| data: { | |||||
| isIPX: app.globalData.isIPX, | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面加载 | |||||
| */ | |||||
| onLoad: function (options) { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面初次渲染完成 | |||||
| */ | |||||
| onReady: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面显示 | |||||
| */ | |||||
| onShow: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面隐藏 | |||||
| */ | |||||
| onHide: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面卸载 | |||||
| */ | |||||
| onUnload: function () { | |||||
| }, | |||||
| /** | |||||
| * 页面相关事件处理函数--监听用户下拉动作 | |||||
| */ | |||||
| onPullDownRefresh: function () { | |||||
| }, | |||||
| /** | |||||
| * 页面上拉触底事件的处理函数 | |||||
| */ | |||||
| onReachBottom: function () { | |||||
| }, | |||||
| /** | |||||
| * 用户点击右上角分享 | |||||
| */ | |||||
| onShareAppMessage: function () { | |||||
| } | |||||
| }) | |||||
| @@ -0,0 +1,3 @@ | |||||
| { | |||||
| "usingComponents": {} | |||||
| } | |||||
| @@ -0,0 +1,4 @@ | |||||
| <!--pages/apply/index.wxml--> | |||||
| <view class="ns" style="height:{{isIPX?'88px':'64px'}};"> | |||||
| <text style="top:{{isIPX?'54px':'30px'}};">支出申请</text> | |||||
| </view> | |||||
| @@ -0,0 +1 @@ | |||||
| /* pages/apply/index.wxss */ | |||||
| @@ -1,10 +1,12 @@ | |||||
| // pages/handle/expenditureAudit/expenditureAudit.js | // pages/handle/expenditureAudit/expenditureAudit.js | ||||
| const app = getApp(); | |||||
| Page({ | Page({ | ||||
| /** | /** | ||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| isIPX: app.globalData.isIPX, | |||||
| steps: [ | steps: [ | ||||
| { | { | ||||
| assigneeName: '同意', | assigneeName: '同意', | ||||
| @@ -1,9 +1,9 @@ | |||||
| <!--pages/handle/expenditureAudit/expenditureAudit.wxml--> | <!--pages/handle/expenditureAudit/expenditureAudit.wxml--> | ||||
| <image src="../../../image/expenditureAudit/bgGreen.png" class="bgPage"></image> | <image src="../../../image/expenditureAudit/bgGreen.png" class="bgPage"></image> | ||||
| <view class="top" style="height:{{isIPX?'88px':'64px'}};"> | <view class="top" style="height:{{isIPX?'88px':'64px'}};"> | ||||
| <text bindtap="recommend" style="top:{{isIPX?'54px':'30px'}};">推荐</text> | |||||
| <text style="top:{{isIPX?'59px':'35px'}};">支出申请</text> | |||||
| </view> | </view> | ||||
| <view class="main-box top-box" style="margin-top:{{isIPX?'110px':'85px'}};"> | |||||
| <view class="main-box top-box" style="margin-top:{{isIPX?'100px':'75px'}};"> | |||||
| <text class="box-title">审批事项</text> | <text class="box-title">审批事项</text> | ||||
| <text style="margin-bottom: 20px;">房屋出租整年费用</text> | <text style="margin-bottom: 20px;">房屋出租整年费用</text> | ||||
| <text>提交单位:龙华村联合社</text> | <text>提交单位:龙华村联合社</text> | ||||
| @@ -11,9 +11,11 @@ text{display: block;} | |||||
| position: relative; | position: relative; | ||||
| top: 30px; | top: 30px; | ||||
| margin-right: 30px; | margin-right: 30px; | ||||
| left: 8%; | |||||
| display: block; | display: block; | ||||
| color: #eee; | color: #eee; | ||||
| text-align: center; | |||||
| width: 100%; | |||||
| font-size: 16px; | |||||
| } | } | ||||
| .bgPage{ | .bgPage{ | ||||
| width: 140%; | width: 140%; | ||||
| @@ -29,6 +29,13 @@ | |||||
| "name": "支出审核", | "name": "支出审核", | ||||
| "pathName": "pages/handle/expenditureAudit/expenditureAudit", | "pathName": "pages/handle/expenditureAudit/expenditureAudit", | ||||
| "query": "", | "query": "", | ||||
| "launchMode": "default", | |||||
| "scene": null | |||||
| }, | |||||
| { | |||||
| "name": "支出申请", | |||||
| "pathName": "pages/apply/index", | |||||
| "query": "", | |||||
| "scene": null, | "scene": null, | ||||
| "launchMode": "default" | "launchMode": "default" | ||||
| } | } | ||||