diff --git a/app.js b/app.js
index a2815a7..673f993 100644
--- a/app.js
+++ b/app.js
@@ -3,32 +3,32 @@ App({
onLaunch: function() {
var that = this;
wx.getSystemInfo({
- success: function (res) {
+ success: function(res) {
that.globalData.winWidth = res.windowWidth;
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;
},
});
}
},
-
+
globalData: {
shareInPath: "",
shareInParameter: {},
shareInState: 1,
- customerArray:[],
- goodsNameArray:[],
+ customerArray: [],
+ goodsNameArray: [],
winHeight: 0,
winWidth: 0,
phoneNum: "",
@@ -47,9 +47,16 @@ App({
selectBillState: null,
billInfo: [],
billInfoUp: [],
- accountingUnit_ID:0,
+ accountingUnit_ID: 0,
accountingUnit_Name: "请选择会计单位",
- department_ID:0,
+ department_ID: 0,
department_Name: "请选择部门",
}
+
+ // {
+ // "pagePath": "pages/message/message",
+ // "text": "消息",
+ // "iconPath": "/imgs/message.png",
+ // "selectedIconPath": "/imgs/messageSelected.png"
+ // },
})
\ No newline at end of file
diff --git a/app.json b/app.json
index cdc0727..6f86003 100644
--- a/app.json
+++ b/app.json
@@ -45,12 +45,6 @@
"iconPath": "/imgs/main1.png",
"selectedIconPath": "/imgs/main.png"
},
- {
- "pagePath": "pages/message/message",
- "text": "消息",
- "iconPath": "/imgs/message.png",
- "selectedIconPath": "/imgs/messageSelected.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
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index 89ed8c8..fd1ce3e 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -376,7 +376,6 @@ Page({
dmo: this.data.dmo
})
}
-
},
// 删除