diff --git a/api/packageBill/push.js b/api/packageBill/push.js
new file mode 100644
index 0000000..841a9b8
--- /dev/null
+++ b/api/packageBill/push.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+export default{
+ getByPageRecord(data) {
+ return request({
+ url: `/oil-finance/xoilSiteChannelAccountAck/getByPage`,
+ method: 'post',
+ data
+ })
+ },
+ ackBill(data) {
+ return request({
+ url: `/oil-finance/xoilSiteChannelAccountAck/ackBill`,
+ method: 'post',
+ data
+ })
+ },
+}
\ No newline at end of file
diff --git a/packageBill/push/index.vue b/packageBill/push/index.vue
new file mode 100644
index 0000000..1aeed1d
--- /dev/null
+++ b/packageBill/push/index.vue
@@ -0,0 +1,425 @@
+
+
+
+ 返回
+ 账单推送
+
+
+
+
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+ {{item.id}}
+
+ 确认金额:{{item.amount}}
+ 油站实际金额:{{item.actualAmount || '--'}}
+
+ 创建时间:{{item.createTime}}
+ 推送时间:{{item.deadlineTime}}
+
+
+
+ {{statusEnum.find(i => i.value == item.ackStatus).label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 75a4433..cd74b1b 100644
--- a/pages.json
+++ b/pages.json
@@ -219,6 +219,16 @@
}
}]
+ },
+ {
+ "root": "packageBill",
+ "pages": [{
+ "path": "push/index",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+ }]
}
],
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3bfc3ca..9147611 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -82,7 +82,7 @@
{{ cuIconList[0].name }}
+ v-if='item.name != "星油云站超级管理员"'>
{{ item.badge > 99 ? '99+' : item.badge }}
@@ -90,7 +90,7 @@
{{ item.name }}
-
+
-
+
@@ -279,7 +274,6 @@
path: '/packageQr/pages/qrsite/QrCode_xy',
name: '油站二维码'
},
-
{
cuIcon: 'punch',
path: '/packageQr/pages/partnership/partnership',
@@ -301,16 +295,18 @@
badge: 0,
name: '交易统计'
},
-
-
]
};
},
- onLoad() {
- //console.log('这里是home')
- const Menus = uni.getStorageSync('userMenu')
- this.fistCheck()
-
+ // created() {
+ // let a = uni.getStorageSync('menusChangeList')
+ // console.log('aaaaaaaaa',a)
+ // },
+ created() {
+ let a = uni.getStorageSync('menusChangeList')
+ console.log('aaaaaaaaa',a)
+ this.checkInfo()
+
},
filters: {
numberFilter(value) {
@@ -346,6 +342,7 @@
changeMenuList(data) { //这里是切换处 更新权限menus处
const Menus = data
let menusList = []
+ // console.log('data',data)
Menus.forEach((item, index, Menus) => {
if (item.roleName != 'ROOT') {
menusList.push(this.Splicing(item)) //根据menus做处理
@@ -353,6 +350,7 @@
})
uni.setStorageSync('menusChangeList', menusList)
this.menusList = uni.getStorageSync('menusChangeList')
+ this.$emit('changMenus', this.menusList)
},
Splicing(list) {
let obj = {
@@ -374,6 +372,13 @@
obj.color = 'orange',
obj.badge = 0,
obj.name = list.roleName
+ } else if (list.roleName == '促销优惠') {
+ obj.cuIcon = 'moneybag',
+ obj.path = '',
+ // /pages/station-price/station-price
+ obj.color = 'orange',
+ obj.badge = 0,
+ obj.name = list.roleName
} else if (list.roleName == '加油订单') {
obj.cuIcon = 'form',
obj.path = '/packageOrders/pages/orderList/orderList',
@@ -410,6 +415,12 @@
obj.color = 'blue',
obj.badge = 0,
obj.name = list.roleName
+ } else if (list.roleName == '账单推送') {
+ obj.cuIcon = 'punch',
+ obj.path = '/packageBill/push/index',
+ obj.color = 'blue',
+ obj.badge = 0
+ obj.name = list.roleName
}
return obj
},
@@ -426,7 +437,7 @@
oliSiteApi.getSiteDetail(channelId).then(res => {
// //console.log(res)
if (res.code === 20000) {
- console.log(res.data.oil)
+ // console.log(res.data.oil)
this.sitInfo = res.data.site
this.SiteOliInfo = res.data.oil
if (res.data.oil.length < 3) {
@@ -467,6 +478,9 @@
this.getSiteInfo(res.data.authTokenDTO.loginUser.channelId)
this.getUserInfo(id)
this.changeMenuList(res.data.authTokenDTO.loginUser.roleMenus)
+
+
+
} else if (res.code == 40000) {
uni.navigateTo({
url: '/pages/login/boforeLogin/boforeLogin'
@@ -513,8 +527,7 @@
})
},
scanQr() {
- var scanUrl
- scanUrl = '/pages/station-info/scan-camera/scan-camera'
+ let scanUrl = '/pages/station-info/scan-camera/scan-camera'
uni.navigateTo({
url: scanUrl,
fail: (err) => {
@@ -525,19 +538,7 @@
},
})
},
- // 方便开发
- // scanQr() {
- // uni.setStorageSync('qrCode', 'XM&1299257961238990848')
- // uni.navigateTo({
- // url: '/pages/stationDetail/stationDetail',
- // fail: (err) => {
- // //console.log(err)
- // },
- // success: (res) => {
- // //console.log('chengg', res)
- // }
- // })
- // },
+
checkLogin() {
const token = uni.getStorageSync('Authorization')
if (!token) {
@@ -592,13 +593,6 @@
}
}
- },
- created() {
- // 此页面onshow无法执行生命周期需要,需要走created
- //console.log('这里是created')
- //console.log(this.menusList)
- this.checkInfo()
-
}
};
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2c6c6d8..a0aca94 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,8 @@
-
+
@@ -14,7 +15,8 @@
-
+
一键扫码
@@ -31,27 +33,27 @@
-