diff --git a/api/financialCenter/business.js b/api/financialCenter/business.js
index 053a1cc..9f5a348 100644
--- a/api/financialCenter/business.js
+++ b/api/financialCenter/business.js
@@ -1,11 +1,19 @@
import request from '@/utils/request'
export default {
- getByPage (data) {
- return request({
- url: '/oil-finance/oilCompanyAccount/getByPage',
- method: 'post',
- data:data
- })
- }
+ getByPage(data) {
+ return request({
+ url: '/oil-finance/oilCompanyAccount/getByPage',
+ method: 'post',
+ data: data
+ })
+ },
+ getByPageRecharge(data) {
+ return request({
+ url: '/oil-finance/oilCompanyAccountReverse/getByPage',
+ method: 'post',
+ data: data
+ })
+ },
+
}
diff --git a/components/datePopup.vue b/components/datePopup.vue
new file mode 100644
index 0000000..ccd35c1
--- /dev/null
+++ b/components/datePopup.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+ {{item.label}}
+
+ 自定义
+
+
+
+
+
+
+
+
+
+
diff --git a/driverManagement/index/index.vue b/driverManagement/index/index.vue
index 1493656..e96db21 100644
--- a/driverManagement/index/index.vue
+++ b/driverManagement/index/index.vue
@@ -91,19 +91,19 @@
seachValue: '',
styles: {},
seleindex: 0,
- navigation: [{
- text: '所有',
- index: -1
- },
- {
- text: '启用',
- index: 1
- },
- {
- text: '禁用',
- index: 0
- }
- ],
+ // navigation: [{
+ // text: '所有',
+ // index: -1
+ // },
+ // {
+ // text: '启用',
+ // index: 1
+ // },
+ // {
+ // text: '禁用',
+ // index: 0
+ // }
+ // ],
listData: []
}
},
@@ -265,20 +265,20 @@
align-items: center;
}
- .form-item_body_left_bottom_text {
+/* .form-item_body_left_bottom_text {
font-size: 24rpx;
color: #999999;
- }
+ } */
.form-item_body_left {
display: flex;
align-items: center;
}
- .form_body_item_body_container {
+/* .form_body_item_body_container {
margin-left: 24rpx;
font-size: 28rpx;
- }
+ } */
.form_body_item_body {
display: flex;
@@ -306,7 +306,7 @@
box-sizing: border-box;
}
- .navigation_seleitem {
+/* .navigation_seleitem {
width: 150rpx;
height: 59rpx;
background: #F0F2FF;
@@ -320,9 +320,9 @@
transition: all 0.3s;
position: relative;
bottom: -2px;
- }
+ } */
- .navigation_item {
+/* .navigation_item {
width: 150rpx;
height: 59rpx;
border-top-left-radius: 11rpx;
@@ -334,14 +334,14 @@
align-items: center;
transition: all 0.3s;
bottom: -2px;
- }
+ } */
- .Navigation {
+/* .Navigation {
display: flex;
position: absolute;
bottom: 0px;
transition: all .5s;
- }
+ } */
.header_seach_butten {
font-size: 24rpx !important;
@@ -400,13 +400,4 @@
height: var(--status-bar-height);
}
- .copy {
- position: relative;
- top: 7rpx;
- display: inline-block;
- margin-left: 15rpx;
- width: 32rpx;
- height: 32rpx;
- background: url('../../static/copy.png') 100%/ 100%;
- }
diff --git a/financialCenter/enterprise/account/detail.vue b/financialCenter/enterprise/account/detail.vue
new file mode 100644
index 0000000..378c1cf
--- /dev/null
+++ b/financialCenter/enterprise/account/detail.vue
@@ -0,0 +1,161 @@
+
+
+
+ {{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.rechargeBalance)}}
+ 充值余额
+
+
+ {{handlerNumber(info.chargeRechargeBalance)}}
+ 赊销充值余额
+
+
+ {{handlerNumber(info.totalChargeAmount)}}
+ 赊销待还金额
+
+
+
+
+
+
+
+
+
diff --git a/financialCenter/enterprise/account/index.vue b/financialCenter/enterprise/account/index.vue
new file mode 100644
index 0000000..a6150b0
--- /dev/null
+++ b/financialCenter/enterprise/account/index.vue
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.companyName}}
+ 企业总余额:{{handlerNumber(item.totalBalance)}}
+
+
+
+
+
+
+
+
+
+
diff --git a/financialCenter/enterprise/recharge/index.vue b/financialCenter/enterprise/recharge/index.vue
new file mode 100644
index 0000000..9505ca5
--- /dev/null
+++ b/financialCenter/enterprise/recharge/index.vue
@@ -0,0 +1,392 @@
+
+
+
+
+
+
+
+ {{typeEnum[item.transactionType]}}
+
+
+ {{item.companyName}}
+
+ 付
+ {{item.offlinePaymentCompany || '暂无'}}
+
+
+ 收
+ {{item.internalCompanyName || '暂无'}}
+
+
+ {{statusEnum.find(_item => _item.value == item.transactionState).label}}
+
+
+
+ {{item.createTime}}
+ ¥{{item.transactionAmount}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/financialCenter/enterprise/recharge/selEnterprise.vue b/financialCenter/enterprise/recharge/selEnterprise.vue
new file mode 100644
index 0000000..5a835aa
--- /dev/null
+++ b/financialCenter/enterprise/recharge/selEnterprise.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
diff --git a/financialCenter/serviceStation/account/detail.vue b/financialCenter/serviceStation/account/detail.vue
new file mode 100644
index 0000000..49c15c5
--- /dev/null
+++ b/financialCenter/serviceStation/account/detail.vue
@@ -0,0 +1,125 @@
+
+
+
+ {{info.accountName}}
+ {{handlerNumber(info.balance)}}
+ 账户总余额(元)
+
+
+
+
+ {{handlerNumber(info.rechargeBalance)}}
+ 账户充值余额
+
+
+ {{handlerNumber(info.rechargeRebateBalance)}}
+ 充值返利余额
+
+
+ {{handlerNumber(info.consumeRebateBalance)}}
+ 消费返利余额
+
+
+ {{handlerNumber(info.calibrationBalance)}}
+ 校准金额
+
+
+
+
+
+
+
+
+
diff --git a/financialCenter/serviceStation/account/index.vue b/financialCenter/serviceStation/account/index.vue
new file mode 100644
index 0000000..4485248
--- /dev/null
+++ b/financialCenter/serviceStation/account/index.vue
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.accountName}}
+ 账户总余额:{{handlerNumber(item.balance)}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 35001f1..914f17b 100644
--- a/pages.json
+++ b/pages.json
@@ -393,13 +393,36 @@
{
"root": "financialCenter",
"pages": [{
- "path": "business/index",
+ "path": "enterprise/account/index",
"style": {
"navigationBarTitleText": "企业账户管理",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
+ }, {
+ "path": "enterprise/account/detail",
+ "style": {
+ "navigationBarBackgroundColor": "#2866FF",
+ "navigationBarTitleText": "企业账户管理",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "enterprise/recharge/index",
+ "style": {
+ "navigationBarTitleText": "企业充值",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "enterprise/recharge/selEnterprise",
+ "style": {
+ "navigationBarTitleText": "请选择公司",
+ "enablePullDownRefresh": false
+ }
+
}, {
"path": "serviceStation/index",
"style": {
@@ -409,15 +432,7 @@
}
},
- {
- "path": "business/detail",
- "style": {
- "navigationBarBackgroundColor": "#2866FF",
- "navigationBarTitleText": "公司账户管理",
- "enablePullDownRefresh": false
- }
-
- },
+
{
"path": "serviceStation/detail",
"style": {
@@ -425,7 +440,7 @@
"navigationBarTitleText": "油站账户管理",
"enablePullDownRefresh": false
}
-
+
}
]
@@ -439,7 +454,7 @@
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
-
+
},
{
"path": "customer/detail",
@@ -448,7 +463,7 @@
"navigationBarTitleText": "用户详情",
"enablePullDownRefresh": false
}
-
+
},
{
"path": "customer/components/company",
@@ -456,7 +471,7 @@
"navigationBarTitleText": "请选择公司",
"enablePullDownRefresh": false
}
-
+
},
{
"path": "customer/components/auth",
@@ -464,18 +479,18 @@
"navigationBarTitleText": "请选择权限",
"enablePullDownRefresh": false
}
-
- },{
+
+ }, {
"path": "yunSite/index",
"style": {
"navigationBarTitleText": "星油云站用户信息",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
-
+
},
-
+
{
"path": "yunSite/detail",
"style": {
@@ -483,7 +498,7 @@
"navigationBarTitleText": "用户详情",
"enablePullDownRefresh": false
}
-
+
},
{
"path": "yunSite/components/serviceStation",
@@ -491,7 +506,7 @@
"navigationBarTitleText": "请选择油站",
"enablePullDownRefresh": false
}
-
+
},
{
"path": "yunSite/components/auth",
@@ -499,9 +514,9 @@
"navigationBarTitleText": "请选择权限",
"enablePullDownRefresh": false
}
-
+
}
-
+
]
}
],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index edb353d..93769ca 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,7 +16,8 @@
{{user.name?user.name:'暂未设置'}}
@@ -28,8 +29,8 @@
-
+
@@ -43,7 +44,7 @@
司机列表
-
+
新增司机
@@ -57,12 +58,14 @@
油品分发
-
+
分发列表
-
+
新增分发
@@ -70,32 +73,35 @@
-
-
+
+
+
订单管理
-
+
订单列表
-
+
-
-
+
+
动销排名
-
+
油站动销
-
+
企业动销
@@ -103,23 +109,25 @@
-
-
+
+
调价管理
-
+
调价申请
-
+
调价任务
-
+
@@ -138,59 +146,50 @@
title: 'Hello',
shikHeig: '',
user: {
- authList:[]
+ authList: []
},
}
},
onShow() {
this.user = uni.getStorageSync('user')
-
+
},
onLoad() {
try {
- let that = this
+ // let that = this
let style = uni.getMenuButtonBoundingClientRect()
const query = uni.createSelectorQuery().in(this);
query.select('.index_top_car').boundingClientRect(data => {
let shikHeig = Number(style.height) + Number(style.top) + (Number(data.height) / 2)
- that.shikHeig = shikHeig + 'px'
- console.log("得到布局位置信息" + JSON.stringify(data));
- console.log("节点离页面顶部的距离为" + data.top, shikHeig);
+ this.shikHeig = shikHeig + 'px'
}).exec();
} catch (err) {
- console.log('失败')
+ console.log('onLoad err')
}
this.upDate()
},
methods: {
- upDate(){
- console.log('检查更新中----');
+ upDate() {
const updateManager = wx.getUpdateManager();
- updateManager.onCheckForUpdate(function (res) {
- // 请求完新版本信息的回调
- console.log(res.hasUpdate,'版本信息')
+ updateManager.onCheckForUpdate(function(res) {
+ // 请求完新版本信息的回调
+ console.log(res.hasUpdate, '版本信息')
})
- // updateManager.onUpdateFailed(function () {
- // console.log('安装包下载失败')
- // // 新版本下载失败
- // });
- updateManager.onUpdateReady(function () {
- wx.showModal({
- title: '更新提示',
- content: '新版本已经准备好,是否重启应用?',
- success: function (res) {
- console.log(res,'****')
- if (res.confirm) {
- // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
- updateManager.applyUpdate()
- }
- }
- })
+
+ updateManager.onUpdateReady(function() {
+ wx.showModal({
+ title: '更新提示',
+ content: '新版本已经准备好,是否重启应用?',
+ success: function(res) {
+ if (res.confirm) {
+ // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
+ updateManager.applyUpdate()
+ }
+ }
+ })
})
},
- jurisdiction(e){
- // console.log(`%c 当前校验项:${e},校验结果:${this.user.authList.includes(e)},返回权限数据↓`,'color:red;font-size:50px;');
- // console.log(this.user.authList)
+ jurisdiction(e) {
return this.user.authList.includes(e)
},
jump(e) {
@@ -198,9 +197,6 @@
case 0:
uni.navigateTo({
url: "/driverManagement/index/index",
- fail(e) {
- console.log(e, '--')
- },
})
break;
case 1:
@@ -208,40 +204,40 @@
url: "/oilDistribution/index/index",
})
break;
- case 2:
+ case 2:
uni.navigateTo({
- url:'/driverManagement/addDiver/addDiver'
+ url: '/driverManagement/addDiver/addDiver'
})
break
- case 3:
+ case 3:
uni.navigateTo({
- url:'/oilDistribution/distribute/distribute'
+ url: '/oilDistribution/distribute/distribute'
})
-
+
break
- case 4:
+ case 4:
uni.navigateTo({
- url:'/orderList/index/index'
+ url: '/orderList/index/index'
})
break
- case 5:
+ case 5:
uni.navigateTo({
- url:'/priceAdjustment/page/index/index'
+ url: '/priceAdjustment/page/index/index'
})
break
- case 6:
+ case 6:
uni.navigateTo({
- url:'/salesRanking/page/index/index'
+ url: '/salesRanking/page/index/index'
})
break
- case 7:
+ case 7:
uni.navigateTo({
- url:'/priceAdjustmentTask/page/index'
+ url: '/priceAdjustmentTask/page/index'
})
break
- case 8:
+ case 8:
uni.navigateTo({
- url:'/salesRanking/page/index/enterpriseIndex'
+ url: '/salesRanking/page/index/enterpriseIndex'
})
break
}
diff --git a/pages/index/menu.json b/pages/index/menu.json
index 75a2661..f9e38d3 100644
--- a/pages/index/menu.json
+++ b/pages/index/menu.json
@@ -133,16 +133,23 @@
{
"icon":"iconxiugaijiage",
"name":"公司账户管理",
- "router":"/financialCenter/business/index",
- "lable":"finance:account:enterprise",
+ "router":"/financialCenter/enterprise/account/index",
+ "lable":"finance:enterprise:account",
"image":"../../static/newindex/accountEnterpriseList.png"
},
{
"icon":"iconxiugaijiage",
"name":"油站账户管理",
"router":"/financialCenter/serviceStation/index",
- "lable":"finance:account:serviceStation",
+ "lable":"finance:serviceStation:account",
"image":"../../static/newindex/accountServiceStationList.png"
+ },
+ {
+ "icon":"iconxiugaijiage",
+ "name":"企业充值",
+ "router":"/financialCenter/enterprise/recharge/index",
+ "lable":"finance:enterprise:recharge",
+ "image":"../../static/newindex/customerList.png"
}
]
},
diff --git a/pages/index/newindex.css b/pages/index/newindex.css
index 81545b5..38568b7 100644
--- a/pages/index/newindex.css
+++ b/pages/index/newindex.css
@@ -7,9 +7,9 @@
padding-top: 330rpx;
width: 100vw;
overflow: hidden;
-
-
-/* display: flex;
+
+
+ /* display: flex;
height: 100vh;
flex-direction: column; */
}
@@ -169,6 +169,7 @@
background: #2866FF;
z-index: 10;
}
+
.info-frame {
position: absolute;
left: 50%;
@@ -184,8 +185,8 @@
background: #fff;
}
-.info-frame > view:nth-of-type(1),
-.info-frame > view:nth-of-type(3) {
+.info-frame>view:nth-of-type(1),
+.info-frame>view:nth-of-type(3) {
/* font-size: 32rpx; */
overflow: hidden;
width: 320rpx;
@@ -194,12 +195,13 @@
white-space: nowrap;
color: #666;
}
-.info-frame > view:nth-of-type(2) {
+
+.info-frame>view:nth-of-type(2) {
/* font-size: 32rpx; */
color: #bbb;
}
-.info-frame > image {
+.info-frame>image {
position: absolute;
left: 40rpx;
top: -30rpx;
@@ -207,41 +209,51 @@
height: 120rpx;
/* border-radius: 50%; */
}
+
.domain {
/* flex: 1; */
-
+
padding-bottom: 320rpx;
}
-.domain > .item {
- margin-top: 30rpx;
+
+.domain>.item {
+ margin-top: 13rpx;
}
-.domain > .item:nth-of-type(1) {
+
+.domain>.item:nth-of-type(1) {
margin-top: 90rpx;
}
-.domain > .item > .title {
+.domain>.item>.title {
padding-left: 40rpx;
font-size: 32rpx;
color: #666;
}
+
.options-frame {
margin-top: 10rpx;
padding: 0 35rpx;
display: flex;
+ justify-content: space-between;
+ flex-wrap: wrap;
}
-.options-frame > .option {
+
+.options-frame>.option {
position: relative;
- margin-left: 20rpx;
+ /* margin-left: 20rpx; */
+ margin-bottom: 17rpx;
padding: 10rpx 14rpx;
width: 335rpx;
height: 140rpx;
background: #fff;
border-radius: 20rpx;
}
-.options-frame > .option:nth-of-type(1) {
+
+.options-frame>.option:nth-of-type(1) {
margin-left: 0;
}
-.options-frame > .option > .star {
+
+.options-frame>.option>.star {
position: absolute;
top: 5rpx;
right: 8rpx;
@@ -252,16 +264,18 @@
background: #ffffff;
border-radius: 20rpx;
z-index: 5;
-
+
}
-.options-frame > .option > .wall {
+
+.options-frame>.option>.wall {
position: relative;
padding-top: 9rpx;
width: 297rpx;
height: 120rpx;
border-radius: 20rpx;
}
-.options-frame > .option > .wall > .name {
+
+.options-frame>.option>.wall>.name {
position: absolute;
left: 110rpx;
bottom: 40rpx;
@@ -270,7 +284,7 @@
}
-.collection{
+.collection {
position: fixed;
left: 0;
bottom: 0;
@@ -279,7 +293,8 @@
background: #F0F2FF;
z-index: 10;
}
-.collection > .collect-frame {
+
+.collection>.collect-frame {
display: flex;
justify-content: space-between;
position: absolute;
@@ -291,33 +306,35 @@
background: #adceff;
border-radius: 30rpx 30rpx 0 0;
}
+
.collection_item {
position: relative;
top: -74rpx;
display: flex;
justify-content: center;
align-items: center;
- /* margin-left: calc((100% - 60/* 0rpx) / 2); */
+ /* margin-left: calc((100% - 60/* 0rpx) / 2); */
width: 200rpx;
height: 240rpx;
background-color: #FFF;
border-radius: 20rpx;
animation: name 0.5s;
}
+
.collection-empty {
position: relative;
top: -74rpx;
width: 200rpx;
height: 240rpx;
-
+
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
-
+
background-color: #FFF;
- border: 6rpx dashed #BBBBBB;
+ border: 6rpx dashed #BBBBBB;
border-radius: 20rpx;
}
@@ -371,22 +388,30 @@
-@keyframes name{
- from{opacity: 0;}
- to{opacity: 1;}
+@keyframes name {
+ from {
+ opacity: 0;
+ }
+
+ to {
+ opacity: 1;
+ }
}
-.collectionbg .collection_itembg:first-child{
- margin-left: 0;
+
+.collectionbg .collection_itembg:first-child {
+ margin-left: 0;
}
-.collection_item:first-child{
- margin-left: 0;
+
+.collection_item:first-child {
+ margin-left: 0;
}
-.collection_item_name{
+.collection_item_name {
text-align: center;
}
-.tip{
+
+.tip {
position: absolute;
top: -10rpx;
right: -10rpx;
@@ -398,13 +423,15 @@
justify-content: center !important;
align-items: center !important;
}
-.collection_item_text{
+
+.collection_item_text {
margin-top: 20rpx;
font-size: 32rpx;
color: #666666;
}
+
.Submenu_item .label {
- margin-top: 65rpx ;
+ margin-top: 65rpx;
height: 217rpx;
width: 90rpx;
background-color: #F0F0F0;
@@ -413,9 +440,10 @@
flex-direction: column;
justify-content: flex-end;
align-items: center;
- padding: 20rpx 0;
+ padding: 20rpx 0;
}
-.Submenu_item_name{
+
+.Submenu_item_name {
font-weight: 400;
font-size: 32rpx;
color: #666666;
@@ -423,10 +451,9 @@
text-align: center;
margin-top: 45rpx;
}
-.Submenu_item:nth-child(2){
+
+.Submenu_item:nth-child(2) {
display: flex;
flex-direction: column;
align-items: flex-end;
}
-
-
diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue
index dadbf84..77fddb6 100644
--- a/pages/index/newindex.vue
+++ b/pages/index/newindex.vue
@@ -201,9 +201,7 @@
})
return
}
-
let isHave = this.collection.find(i => i.name === item.name)
- // 是否已收藏
if(isHave) {
this.remove(item)
return
diff --git a/static/close.png b/static/close.png
new file mode 100644
index 0000000..de8f4f0
Binary files /dev/null and b/static/close.png differ
diff --git a/utils/request.js b/utils/request.js
index 57d7b2d..5e42a5d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -3,7 +3,7 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
// const env = 'test'
const env = 'production'
-const testUrl = 'http://192.168.1.85:38080'
+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'