diff --git a/api/financialCenter/business.js b/api/financialCenter/business.js
new file mode 100644
index 0000000..053a1cc
--- /dev/null
+++ b/api/financialCenter/business.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export default {
+ getByPage (data) {
+ return request({
+ url: '/oil-finance/oilCompanyAccount/getByPage',
+ method: 'post',
+ data:data
+ })
+ }
+}
diff --git a/api/financialCenter/serviceStation.js b/api/financialCenter/serviceStation.js
new file mode 100644
index 0000000..888d1ea
--- /dev/null
+++ b/api/financialCenter/serviceStation.js
@@ -0,0 +1,12 @@
+
+import request from '@/utils/request'
+
+export default {
+ getByPage (data) {
+ return request({
+ url: '/oil-finance/siteChannelAccount/getByPage',
+ method: 'post',
+ data:data
+ })
+ }
+}
diff --git a/driverManagement/index/index.vue b/driverManagement/index/index.vue
index 6079c6d..1493656 100644
--- a/driverManagement/index/index.vue
+++ b/driverManagement/index/index.vue
@@ -11,8 +11,10 @@
-
+
-
+
- {{item.userName?item.userName:' 无设置'}}
+
+ {{item.userName?item.userName:' 无设置'}}
{{item.phone?item.phone:'无设置'}}
-
+
- {{item.companyName?item.companyName :'无直属公司'}}
+
+ {{item.companyName?item.companyName :'无直属公司'}}
-
+
{{item.enableMark==1? '启用':'禁用'}}
@@ -65,15 +70,15 @@
export default {
data() {
return {
- companyName:'',
- candidates:[],
+ companyName: '',
+ candidates: [],
getData: {
pageSize: 15,
currentPage: 1,
params: {
userSource: '',
companyId: '',
- id:'',
+ id: '',
enableMark: '',
},
sorted: {
@@ -102,27 +107,32 @@
listData: []
}
},
- onPullDownRefresh() {
- //下拉的生命周期
- this.getData.currentPage = 1
- this.getList()
- console.log('下拉的生命周期')
- },
+ onPullDownRefresh() {
+ //下拉的生命周期
+ this.getData.currentPage = 1
+ this.getList()
+ console.log('下拉的生命周期')
+ },
onLoad() {
- let that =this
+ let that = this
this.styles = uni.getMenuButtonBoundingClientRect()
- uni.$on('company',function(e){
+ uni.$on('company', function(e) {
let routes = getCurrentPages();
- let routerIndex = routes[ (routes.length-2) ].$page.fullPath.indexOf('?')!=-1?
- routes[ (routes.length-2) ].$page.fullPath.split('?')[0].split('/')[routes[ (routes.length-2) ].$page.fullPath.split('?')[0].split('/').length-1]
- :routes[ (routes.length-2) ].$page.fullPath.split('/')[routes[ (routes.length-2) ].$page.fullPath.split('/').length-1]
- console.log(routes,routerIndex,'获取当前打开过的页面路由数组')
- if(routerIndex!=='index')return
- if(e){
- ( {id:that.getData.params.companyId,name:that.companyName} = e );
+ let routerIndex = routes[(routes.length - 2)].$page.fullPath.indexOf('?') != -1 ?
+ routes[(routes.length - 2)].$page.fullPath.split('?')[0].split('/')[routes[(routes.length - 2)]
+ .$page.fullPath.split('?')[0].split('/').length - 1] :
+ routes[(routes.length - 2)].$page.fullPath.split('/')[routes[(routes.length - 2)].$page
+ .fullPath.split('/').length - 1]
+ console.log(routes, routerIndex, '获取当前打开过的页面路由数组')
+ if (routerIndex !== 'index') return
+ if (e) {
+ ({
+ id: that.getData.params.companyId,
+ name: that.companyName
+ } = e);
console.log(that.getData)
- }else{
- that.getData.params.companyId=''
+ } else {
+ that.getData.params.companyId = ''
that.companyName = ''
}
})
@@ -137,11 +147,11 @@
});
},
scrolltolower() {
- this.getData.currentPage+=1
+ this.getData.currentPage += 1
console.log('触底了')
this.getList()
},
- seachFn(){
+ seachFn() {
// this.getData.params.id = this.seachValue
this.getData.currentPage = 1
this.getList()
@@ -149,52 +159,53 @@
},
getList() {
let user = uni.getStorageSync('user');
- console.log(user,'---')
+ console.log(user, '---')
// ({ userSource:this.getData.params.userSource,id:this.getData.params.id} = user);
driverManagement.getByPagesApp(this.getData).then(res => {
if (res.code !== 20000) return
- if(this.getData.currentPage!==1){
+ if (this.getData.currentPage !== 1) {
this.listData = this.listData.concat(res.data.list);
return
}
this.listData = res.data.list
})
},
- jump(e,item) {
+ jump(e, item) {
switch (e) {
case -1:
uni.navigateBack()
break;
case 0:
uni.navigateTo({
- url: "../company/company?jsData="+ JSON.stringify(this.companyName)
+ url: "../company/company?jsData=" + JSON.stringify(this.companyName)
})
break;
case 1:
- console.log(item,JSON.stringify(item))
+ console.log(item, JSON.stringify(item))
uni.navigateTo({
- url: "../driverDetails/driverDetails?jsData="+ encodeURIComponent(JSON.stringify(item))
+ url: "../driverDetails/driverDetails?jsData=" + encodeURIComponent(JSON.stringify(
+ item))
})
break;
- case 2:
- if(uni.getStorageSync('user').authList.includes('driver:info:add')){
+ case 2:
+ if (uni.getStorageSync('user').authList.includes('driver:info:add')) {
uni.navigateTo({
- url:"../addDiver/addDiver"
+ url: "../addDiver/addDiver"
})
- }else{
+ } else {
uni.showToast({
- title:'暂无权限请联系管理员',
- icon:'none'
+ title: '暂无权限请联系管理员',
+ icon: 'none'
})
}
-
+
break;
}
},
seleFn(e) {
- if(e.index!=-1){
+ if (e.index != -1) {
this.getData.params.enableMark = e.index
- }else{
+ } else {
this.getData.params.enableMark = ''
}
this.getData.currentPage = 1
@@ -209,23 +220,26 @@
diff --git a/financialCenter/business/detail.vue b/financialCenter/business/detail.vue
new file mode 100644
index 0000000..6df6e90
--- /dev/null
+++ b/financialCenter/business/detail.vue
@@ -0,0 +1,160 @@
+
+
+
+ {{info.companyName}}
+ {{handlerNumber(info.totalBalance)}}
+ 企业总余额(元)
+
+
+
+ {{handlerNumber(info.balance)}}
+ 账户总余额(元)
+
+
+
+ {{handlerNumber(+info.outCountBalance + +info.inCountBalance)}}
+ 油卡总余额
+
+
+ {{handlerNumber(info.inCountBalance)}}
+ 自营油卡余额
+
+
+ {{handlerNumber(info.outCountBalance)}}
+ 外营油卡余额
+
+
+ {{handlerNumber(+info.rechargeRebateBalance + +info.consumeRebateBalance)}}
+ 返利总余额
+
+
+ {{handlerNumber(info.rechargeRebateBalance)}}
+ 充值返利余额
+
+
+ {{handlerNumber(info.consumeRebateBalance)}}
+ 消费返利余额
+
+
+ {{handlerNumber( +info.chargeRechargeBalance + +info.totalChargeAmount)}}
+ 充值余额
+
+
+ {{handlerNumber(info.chargeRechargeBalance)}}
+ 赊销充值余额
+
+
+ {{handlerNumber(info.totalChargeAmount)}}
+ 赊销待还金额
+
+
+
+
+
+
+
+
+
diff --git a/financialCenter/business/index.vue b/financialCenter/business/index.vue
new file mode 100644
index 0000000..e5d9992
--- /dev/null
+++ b/financialCenter/business/index.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+ {{item.companyName}}
+ 企业总余额：{{handlerNumber(item.totalBalance)}}
+
+
+
+
+
+
+
+
+
+
diff --git a/financialCenter/serviceStation/detail.vue b/financialCenter/serviceStation/detail.vue
new file mode 100644
index 0000000..47732a7
--- /dev/null
+++ b/financialCenter/serviceStation/detail.vue
@@ -0,0 +1,120 @@
+
+
+
+ {{info.accountName}}
+ {{handlerNumber(info.balance)}}
+ 账户总余额(元)
+
+
+
+
+ {{handlerNumber(info.rechargeBalance)}}
+ 账户充值余额
+
+
+ {{handlerNumber(info.rechargeRebateBalance)}}
+ 充值返利余额
+
+
+ {{handlerNumber(info.consumeRebateBalance)}}
+ 消费返利余额
+
+
+
+
+
+
+
+
+
diff --git a/financialCenter/serviceStation/index.vue b/financialCenter/serviceStation/index.vue
new file mode 100644
index 0000000..139715f
--- /dev/null
+++ b/financialCenter/serviceStation/index.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+ {{item.accountName}}
+ 账户总余额：{{handlerNumber(item.balance)}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 3d2ee42..e8bf190 100644
--- a/pages.json
+++ b/pages.json
@@ -21,11 +21,11 @@
"titleNView": {
"autoBackButton": false
},
- "bounce":"none" ,// 将回弹属性关掉,
- "disableScroll": true
+ "bounce": "none", // 将回弹属性关掉,
+ "disableScroll": true
},
"navigationBarTitleText": ""
-
+
}
},
{
@@ -83,17 +83,17 @@
// }
// }
- // ,{
- // "path" : "pages/index/newindex",
- // "style" :
- // {
- // "navigationBarTitleText": "",
- // "enablePullDownRefresh": false
- // }
-
- // }
-
- ],
+ // ,{
+ // "path" : "pages/index/newindex",
+ // "style" :
+ // {
+ // "navigationBarTitleText": "",
+ // "enablePullDownRefresh": false
+ // }
+
+ // }
+
+ ],
"subPackages": [{
"root": "salesRanking",
"pages": [{
@@ -111,40 +111,36 @@
"enablePullDownRefresh": false
}
- },{
+ }, {
"path": "page/contribution/contribution",
"style": {
"navigationBarTitleText": "消费支出",
"enablePullDownRefresh": false
}
- },{
+ }, {
"path": "page/rechargeRecord/rechargeRecord",
"style": {
"navigationBarTitleText": "充值记录",
"enablePullDownRefresh": false
}
- } ,{
- "path" : "page/orderQuantity/orderQuantity",
- "style" :
- {
- "navigationBarTitleText": "订单",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "page/index/enterpriseIndex",
- "style" :
- {
+ }, {
+ "path": "page/orderQuantity/orderQuantity",
+ "style": {
+ "navigationBarTitleText": "订单",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "page/index/enterpriseIndex",
+ "style": {
"navigationStyle": "custom",
"navigationBarTitleText": "企业动销",
"enablePullDownRefresh": true
- }
-
- }
- ]
+ }
+
+ }]
},
{
"root": "driverManagement",
@@ -309,90 +305,116 @@
}
}
- ]
+ ]
},
{
"root": "priceAdjustmentTask",
"pages": [
-
+
{
"path": "page/index",
"style": {
"navigationBarTitleText": "调价任务",
"navigationStyle": "custom"
}
-
+
+ }, {
+ "path": "addTask/addTask",
+ "style": {
+ "navigationBarTitleText": "新增调价任务",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "addTask/addTask",
- "style" :
- {
- "navigationBarTitleText": "新增调价任务",
- "enablePullDownRefresh": false
- }
-
- }
- ]
+ ]
},
{
"root": "oilAccount",
"pages": [{
- "path" : "page/accountRecharge/index",
- "style" :
- {
- "navigationBarTitleText": "账户充值",
+ "path": "page/accountRecharge/index",
+ "style": {
+ "navigationBarTitleText": "账户充值",
"navigationStyle": "custom",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "page/companyRecharge/index",
- "style" :
- {
- "navigationBarTitleText": "公司充值",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "page/companyRecharge/index",
+ "style": {
+ "navigationBarTitleText": "公司充值",
"navigationStyle": "custom",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "page/companyRecharge/details",
- "style" :
- {
- "navigationBarTitleText": "油站公司充值详情",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "page/companyRecharge/add",
- "style" :
- {
- "navigationBarTitleText": "油站公司充值",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "page/accountRecharge/details",
- "style" :
- {
- "navigationBarTitleText": "油站账户充值详情",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "page/accountRecharge/add",
- "style" :
- {
- "navigationBarTitleText": "油站账户充值（仅调回拨）",
- "enablePullDownRefresh": false
- }
-
- }
- ]
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "page/companyRecharge/details",
+ "style": {
+ "navigationBarTitleText": "油站公司充值详情",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "page/companyRecharge/add",
+ "style": {
+ "navigationBarTitleText": "油站公司充值",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "page/accountRecharge/details",
+ "style": {
+ "navigationBarTitleText": "油站账户充值详情",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "page/accountRecharge/add",
+ "style": {
+ "navigationBarTitleText": "油站账户充值（仅调回拨）",
+ "enablePullDownRefresh": false
+ }
+
+ }]
+ },
+ {
+ "root": "financialCenter",
+ "pages": [{
+ "path": "business/index",
+ "style": {
+ "navigationBarTitleText": "企业账户管理",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "serviceStation/index",
+ "style": {
+ "navigationBarTitleText": "油站账户管理",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "business/detail",
+ "style": {
+ "navigationBarBackgroundColor": "#2866FF",
+ "navigationBarTitleText": "企业账户管理",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "serviceStation/detail",
+ "style": {
+ "navigationBarBackgroundColor": "#2866FF",
+ "navigationBarTitleText": "油站账户管理",
+ "enablePullDownRefresh": false
+ }
+
+ }
+
+ ]
}
],
"globalStyle": {
diff --git a/pages/index/menu.json b/pages/index/menu.json
index 0b391cd..cb41c17 100644
--- a/pages/index/menu.json
+++ b/pages/index/menu.json
@@ -112,5 +112,25 @@
"lable":"sys:siteAcct:recharge"
}
]
+ },
+ {
+ "name":"财务中心",
+ "icon":"iconqichexiangguan-jiayouzhan",
+ "label":"financialCenter",
+ "colorOpen":false,
+ "submenu":[
+ {
+ "icon":"iconxiugaijiage",
+ "name":"企业账户管理",
+ "router":"/financialCenter/business/index",
+ "lable":"sys:siteCompany:recharge"
+ },
+ {
+ "icon":"iconxiugaijiage",
+ "name":"油站账户管理",
+ "router":"/financialCenter/serviceStation/index",
+ "lable":"sys:siteAcct:recharge"
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 9ab054a..e5be27e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -2,11 +2,11 @@ import axios from 'axios'
import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
// const env = 'test'
-const env = 'production'
-const testUrl = 'http://192.168.110.10:38080'
+const env = 'test'
+const testUrl = 'http://192.168.1.83:38080'
// const productUrl = 'https://www.xingoil.com/adminapi'
// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
-const productUrl = 'http://uat.xingoil.com/adminapi'
+// const productUrl = 'http://uat.xingoil.com/adminapi'
const service = axios.create({
baseURL: env == 'production' ? productUrl : testUrl,