diff --git a/api/payment.js b/api/payment.js
index 2b5f1f7..9336587 100644
--- a/api/payment.js
+++ b/api/payment.js
@@ -16,9 +16,9 @@ const getBankCardList = () => mGet(`/payment-settlement-center/bankcard/getBankC
const deleteBankcard = (id) => mPost(`/payment-settlement-center/bankcard/delete/bankCard/${id}`, null, pconfig)
const getTradeOrder = (id) => mGet(`/payment-settlement-center/get/payment-order/by-trade-order-id/${id}`, null, pconfig)
const paymentFor = (params) => mPost(`/payment-settlement-center/pay`, params, pconfig)
-const getBalanceInfo = () => mGet(`/payment-settlement-center/balance/get/balance`, null, pconfig)
-const getWithdrawalList = () => mGet(`/payment-settlement-center/balance/get/order-withdrawal-list`, null, pconfig)
-const paymentOrder = (params) => mPost(`/payment-settlement-center/balance/order/withdraw`, params, pconfig)
+const getBalanceInfo = () => mGet(`/payment-settlement-center/balance/get/factorybalance`, null, pconfig)
+const getWithdrawalList = () => mGet(`/payment-settlement-center/balance/get/factoryorder-withdrawal-list`, null, pconfig)
+const paymentOrder = (params) => mPost(`/payment-settlement-center/balance/order/factorywithdraw`, params, pconfig)
const getAgentOrderList = (params) => mGet(`/payment-settlement-center/get/agency-payment-order-receivable-list`, params, pconfig)
export {
diff --git a/colorui/main.wxss b/colorui/main.wxss
index 6ceab6c..6514fb6 100644
--- a/colorui/main.wxss
+++ b/colorui/main.wxss
@@ -619,7 +619,7 @@ view, scroll-view, swiper, button, input, textarea, label, navigator, image {
width: 100%;
top: 0;
z-index: 19;
- box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.1);
+ box-shadow: 0 0rpx 2rpx rgba(0, 0, 0, 0.1);
}
.cu-bar.foot {
@@ -827,11 +827,9 @@ view, scroll-view, swiper, button, input, textarea, label, navigator, image {
}
.cu-custom .cu-bar {
- min-height: 0px;
- padding-right: 220rpx;
+ padding-right: 190rpx;
z-index: 99;
/* box-shadow: 0rpx 0rpx 0rpx; */
- box-shadow: 0 -1rpx 4rpx rgba(0, 0, 0, 0.04)
}
.cu-custom .cu-bar .border-custom {
diff --git a/components/tabbar/index.wxml b/components/tabbar/index.wxml
index df9a07b..96b0508 100644
--- a/components/tabbar/index.wxml
+++ b/components/tabbar/index.wxml
@@ -1,4 +1,5 @@
-
+
\ No newline at end of file
diff --git a/pages/agent/index/index.js b/pages/agent/index/index.js
index 858d875..cd6a95e 100644
--- a/pages/agent/index/index.js
+++ b/pages/agent/index/index.js
@@ -1,6 +1,5 @@
// pages/index/index.js
-import Dialog from '../../../components/dialog/dialog'
-import { getStatisticsInfo } from "../../../api/saas"
+import { getBalanceInfo } from "../../../api/payment"
import util from '../../../utils/util'
const event = require('../../../utils/event')
const app = getApp()
@@ -19,7 +18,8 @@ Component({
{ status: 51, badge: '', name: '待送货', icon: '/assets/agent/icon-dsh.png' },
{ status: 53, badge: '', name: '结算中', icon: '/assets/agent/icon-sjz.png' },
{ status: 54, badge: '', name: '已完成', icon: '/assets/agent/icon-ywc.png' }
- ]
+ ],
+ banlanceInfo: {accountMoney: 0, frozenMoney: 0}
},
lifetimes: {
attached: function () {
@@ -32,29 +32,25 @@ Component({
},
methods: {
onRestart: function () {
- // this.fetchStatisticsInfo(this.data.vdate)
+ getBalanceInfo().then(result => {
+ if(result.data){
+ this.setData({ banlanceInfo: result.data })
+ }
+ }).catch(err => { })
},
onEvent: function (message) {
if (message.what == 888) {
}
},
agentList: function (e) {
- if(app.userInfo.applicationStatus == 0){
- Dialog.alert({ title: '温馨提示', message: '您的申请还在审核中,如有疑问请联系管理员。' }).then(() => {
- })
- return
- }
if(e.currentTarget.dataset.status){
- wx.navigateTo({ url: '/pages/agent/order-list/index?status=' + e.currentTarget.dataset.status })
+ wx.navigateTo({ url: `/pages/agent/order-list/index?status=${e.currentTarget.dataset.status}` })
} else {
- wx.navigateTo({ url: '/pages/agent/order-list/index' })
+ wx.navigateTo({ url: `/pages/agent/order-list/index` })
}
},
- fetchStatisticsInfo: function(vdate){
-
- },
- settlementInfo: function(vdate){
- wx.navigateTo({ url: '/pages/settlement/index/index' })
+ settlementInfo: function(){
+ wx.navigateTo({ url: `/pages/settlement/index/index` })
},
}
})
\ No newline at end of file
diff --git a/pages/agent/index/index.wxml b/pages/agent/index/index.wxml
index 59cfd0e..466bf25 100644
--- a/pages/agent/index/index.wxml
+++ b/pages/agent/index/index.wxml
@@ -51,14 +51,14 @@
未提现余额
- {{totalInfo.availableCreditLine || 0}}
+ {{banlanceInfo.accountMoney}}
提现中余额
- {{totalInfo.usedCreditLine || 0}}
+ {{banlanceInfo.frozenMoney}}
diff --git a/pages/home/employee/index.wxml b/pages/home/employee/index.wxml
index 8a973e4..631ca74 100644
--- a/pages/home/employee/index.wxml
+++ b/pages/home/employee/index.wxml
@@ -41,12 +41,12 @@
所有员工
-
+
-
- {{item.enterpriseMemberName || ''}}
+
+ {{item.enterpriseMemberName || ''}}
{{item.enterpriseRoleNames}}
{{item.mobile || ''}}