From 08ceb9e1f0c80b61351fdc4b5775c1b3865cc435 Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Thu, 20 Dec 2018 15:46:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9A=90=E8=97=8F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=202=E3=80=81=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         | 23 +++++++++++++++--------
 app.json                       |  6 ------
 pages/my/my.json               |  4 +++-
 pages/my/my.wxml               |  8 ++++----
 pages/order/newBill/newBill.js |  1 -
 5 files changed, 22 insertions(+), 20 deletions(-)

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 @@
   <image class="userinfo-avatar" src="{{avatarUrl}}" mode="cover"></image>
 
   <view class='view_me_infos'>
-    <text class='view_me_text'>{{meName}}李丽丽</text>
-    <text class='view_me_text'>{{mePhone}}1234567890</text>
+    <text class='view_me_text'>{{meName}}</text>
+    <text class='view_me_text'>{{mePhone}}</text>
   </view>
 
 </view>
 
-<view class='unregirst'>设置
+<!-- <view class='unregirst'>设置
 <image class='unregirstImage' src='/imgs/jiantou.png'>
 </image>
-</view>
\ No newline at end of file
+</view> -->
\ 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
       })
     }
-
   },
 
   // 删除