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 @@
当前余额
- ¥2032323{{balance}}
+ ¥{{balance}}
-
+
客户找车
-
+
客户对账
+
+
+ 欠款单
+
\ 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,