diff --git a/app.js b/app.js
index e2774eb..57adf81 100644
--- a/app.js
+++ b/app.js
@@ -24,6 +24,17 @@ App({
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() {
@@ -58,6 +69,7 @@ App({
,
systemType:'',//设备类型 Android IOS
isIphoneX: false, // 用来标识当前手机机型是否为 iPhone X
+ isIPX:false
},
/**
* 从服务端获取openId
diff --git a/app.json b/app.json
index 65e4c5c..478d843 100644
--- a/app.json
+++ b/app.json
@@ -3,10 +3,13 @@
"pages/user/login/login",
"pages/index/index",
"pages/handle/liist",
- "pages/handle/expenditureAudit/expenditureAudit"
+ "pages/handle/expenditureAudit/expenditureAudit",
+ "pages/apply/index"
],
"window": {
"backgroundTextStyle": "light",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "农燊高科",
"navigationBarTextStyle": "black"
diff --git a/app.wxss b/app.wxss
index 8653c53..9442cab 100644
--- a/app.wxss
+++ b/app.wxss
@@ -47,3 +47,18 @@ contact-button {
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;
+}
diff --git a/pages/apply/index.js b/pages/apply/index.js
new file mode 100644
index 0000000..9706c1e
--- /dev/null
+++ b/pages/apply/index.js
@@ -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 () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/apply/index.json b/pages/apply/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/apply/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml
new file mode 100644
index 0000000..62e6525
--- /dev/null
+++ b/pages/apply/index.wxml
@@ -0,0 +1,4 @@
+
+
+ 支出申请
+
diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss
new file mode 100644
index 0000000..0242310
--- /dev/null
+++ b/pages/apply/index.wxss
@@ -0,0 +1 @@
+/* pages/apply/index.wxss */
\ No newline at end of file
diff --git a/pages/handle/expenditureAudit/expenditureAudit.js b/pages/handle/expenditureAudit/expenditureAudit.js
index 2564c6f..2419fee 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.js
+++ b/pages/handle/expenditureAudit/expenditureAudit.js
@@ -1,10 +1,12 @@
// pages/handle/expenditureAudit/expenditureAudit.js
+const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
+ isIPX: app.globalData.isIPX,
steps: [
{
assigneeName: '同意',
diff --git a/pages/handle/expenditureAudit/expenditureAudit.wxml b/pages/handle/expenditureAudit/expenditureAudit.wxml
index efb026e..577779d 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.wxml
+++ b/pages/handle/expenditureAudit/expenditureAudit.wxml
@@ -1,9 +1,9 @@
- 推荐
+ 支出申请
-
+
审批事项
房屋出租整年费用
提交单位:龙华村联合社
diff --git a/pages/handle/expenditureAudit/expenditureAudit.wxss b/pages/handle/expenditureAudit/expenditureAudit.wxss
index 08aeece..b68c4ab 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.wxss
+++ b/pages/handle/expenditureAudit/expenditureAudit.wxss
@@ -11,9 +11,11 @@ text{display: block;}
position: relative;
top: 30px;
margin-right: 30px;
- left: 8%;
display: block;
color: #eee;
+ text-align: center;
+ width: 100%;
+ font-size: 16px;
}
.bgPage{
width: 140%;
diff --git a/project.private.config.json b/project.private.config.json
index 2be7c82..deab258 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -29,6 +29,13 @@
"name": "支出审核",
"pathName": "pages/handle/expenditureAudit/expenditureAudit",
"query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "支出申请",
+ "pathName": "pages/apply/index",
+ "query": "",
"scene": null,
"launchMode": "default"
}