From 46ef9e48d701e2c45e81c015c17228943f8d15ac Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Thu, 29 Nov 2018 15:36:58 +0800
Subject: [PATCH] .

---
 app.json                     |  2 +-
 pages/homePage/homePage.js   | 38 +++++++++++++++++++-----------------
 pages/homePage/homePage.wxml | 14 ++++++++-----
 pages/login/login.js         |  4 ++--
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/app.json b/app.json
index 2730238..5d0154c 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/homePage/homePage",
     "pages/login/login",
+    "pages/homePage/homePage",
     "pages/saleForecastList/saleForecastList",
     "pages/saleForecastList/Detail/Detail",
     "pages/saleForecastList/query/query",
diff --git a/pages/homePage/homePage.js b/pages/homePage/homePage.js
index 7624432..94fb74d 100644
--- a/pages/homePage/homePage.js
+++ b/pages/homePage/homePage.js
@@ -4,20 +4,10 @@ var network = require("../../utils/net.js")
 var timechage = require("../../utils/dateTimeUtil.js")
 
 function GetUserProfile(successtion) {
-  let method = '/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetUserProfile';
+  let method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/AccountBalanceRpc/GetCurrentBalanceMoney';
   let params = [];
-
-  network.transfer_request(method, params, function (res) {
-    successtion();
-    if (res.result.AccountingUnit_ID != null) {
-      app.globalData.accountingUnit_ID = res.result.AccountingUnit_ID;
-      app.globalData.accountingUnit_Name = res.result.AccountingUnit_Name
-    }
-
-    if (res.result.Department_ID != null) {
-      app.globalData.department_ID = res.result.Department_ID;
-      app.globalData.department_Name = res.result.Department_Name
-    }
+  network.requestLoading(method, params, function (res) {
+    successtion(res);
   })
 }
 
@@ -28,10 +18,16 @@ Page({
   },
 
   onLoad: function (options) {
+    var that = this;
     // 添加接口请求当前余额
-    // GetUserProfile(function (res) {
-      
-    // });
+    GetUserProfile(function (res) {
+      console.log(res);
+       if (res != null) {
+         that.setData({
+           balance: res.result
+         });
+       }
+     });
   },
 
   /**
@@ -49,9 +45,9 @@ Page({
       case "2":
         transferURL = '/pages/statementOfAccount/statementOfAccount';
         break;
-      // 订单
+      // 客户找车
       case "3":
-        transferURL = '/pages/orderInquiry/orderInquiry';
+        transferURL = '/pages/sendCargo/sendCargo';
         break;
       // 销售出库
       case "4":
@@ -61,6 +57,12 @@ Page({
       case "5":
         transferURL = '/pages/guarantee/guarantee';
         break;
+      case "6":
+        transferURL = '/pages/statementOfAccount/statementOfAccount';
+        break; 
+        case "7":
+        transferURL = '/pages/homePage/homePage';
+        break;
     }
 
     wx.navigateTo({
diff --git a/pages/homePage/homePage.wxml b/pages/homePage/homePage.wxml
index ec63c84..16cd4b0 100644
--- a/pages/homePage/homePage.wxml
+++ b/pages/homePage/homePage.wxml
@@ -8,34 +8,38 @@
       <text class='totalMoney'>当前余额</text>
     </view>
     <view class='balanceView'>
-      <text class='balance'>¥2032323{{balance}}</text>
+      <text class='balance'>¥{{balance}}</text>
     </view>
   </image>
 </view>
 
 <view class="body-box">
-  <view class="ico" catchtap='transBtnClicked' data-itemid='1'>
+  <!-- <view class="ico" catchtap='transBtnClicked' data-itemid='1'>
     <image src="/imgs/saleForecast.png"></image>
     <text class='text'>销售预报</text>
   </view>
   <view class="ico" catchtap='transBtnClicked' data-itemid='2'>
     <image src="/imgs/orderList.png"></image>
     <text class='text'>销售订单</text>
-  </view>
+  </view> -->
   <view class="ico" catchtap='transBtnClicked' data-itemid='3'>
     <image src="/imgs/findDriver.png"></image>
     <text class='text'>客户找车</text>
   </view>
-  <view class="ico" catchtap='transBtnClicked' data-itemid='4'>
+  <!-- <view class="ico" catchtap='transBtnClicked' data-itemid='4'>
     <image src="/imgs/saleOutStore.png"></image>
     <text class='text'>销售出库</text>
   </view>
   <view class="ico" catchtap='transBtnClicked' data-itemid='5'>
     <image src="/imgs/customerCheck.png"></image>
     <text class='text'>客户验收</text>
-  </view>
+  </view> -->
   <view class="ico" catchtap='transBtnClicked' data-itemid='6'>
     <image src="/imgs/statementOfAccount.png"></image>
     <text class='text'>客户对账</text>
   </view>
+  <view class="ico" catchtap='transBtnClicked' data-itemid='7'>
+    <image src="/imgs/arrearsRecord.png"></image>
+    <text class='text'>欠款单</text>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/login/login.js b/pages/login/login.js
index 7099c31..9462865 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -52,7 +52,7 @@ function IsBindWeixinMP(phone) {
     // res.result = false;
     if (res.result == true) {
       wx.switchTab({
-        url: '/pages/information/information',
+        url: '/pages/homePage/homePage',
       })
     } else {
       wx.showModal({
@@ -189,7 +189,7 @@ Page({
 
   // 绑定客户服务器
   bindCustomerPreviousURL: function(successaction) {
-    var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/AccountRpc/QinBindByPhone';
+    var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/AccountRpc/XuBindByPhone';
     var previousParams = [{
       OpenId: openid,
       Phone: app.globalData.Phone,