caoliancun/wx_oms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xiaozhiyong
2023-11-07 16:14:20 +08:00
parent cb566136ed
commit d4d20013f0
16 changed files with 1584 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
pages/index/index.vue
View File

@@ -16,7 +16,8 @@
<view class="index_topbody">
<view :style="{marginTop:'calc(267rpx - ' + shikHeig + ')'}" class="index_top_car">
<view class="index_top_car_header_photo">
<image style="width: 140rpx; height:140rpx;border-radius: 50%;" :src=" user.headPhoto || '/static/tx.png' "></image>
<image style="width: 140rpx; height:140rpx;border-radius: 50%;"
:src=" user.headPhoto || '/static/tx.png' "></image>
</view>
<view style="padding-top: 70rpx;">
<view class="bgtext" style="">{{user.name?user.name:'暂未设置'}}</view>
@@ -28,8 +29,8 @@
</view>
</view>
</view>
</view>
</view>
</view>
</topBar>
<view class="index_list">
<view class="index_list_item">
@@ -43,7 +44,7 @@
</image>
<view class="listtext">司机列表</view>
</view>
<view v-if="jurisdiction('driver:info:add')" @tap="jump(2)" class="index_list_item_right_item">
<view v-if="jurisdiction('driver:info:add')" @tap="jump(2)" class="index_list_item_right_item">
<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/dirverIndex.png">
</image>
<view class="listtext">新增司机</view>
@@ -57,12 +58,14 @@
<view class="left_text">油品分发</view>
</view>
<view class="index_list_item_right">
<view v-if="jurisdiction('distributeReverse:info:list')" @tap="jump(1)" class="index_list_item_right_item">
<view v-if="jurisdiction('distributeReverse:info:list')" @tap="jump(1)"
class="index_list_item_right_item">
<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/oliList.png">
</image>
<view class="listtext">分发列表</view>
</view>
<view v-if="jurisdiction('distributeReverse:info:add')" @tap="jump(3)" class="index_list_item_right_item">
<view v-if="jurisdiction('distributeReverse:info:add')" @tap="jump(3)"
class="index_list_item_right_item">
<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/addoli.png">
</image>
<view class="listtext">新增分发</view>
@@ -70,32 +73,35 @@
</view>
</view>
<view class="index_list_item">
<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"class="index_list_item_left">
<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png"></image>
<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
class="index_list_item_left">
<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png">
</image>
<view class="left_text">订单管理</view>
</view>
<view class="index_list_item_right">
<view v-if="jurisdiction('oilOrder:info:list')" @tap="jump(4)" class="index_list_item_right_item">
<view v-if="jurisdiction('oilOrder:info:list')" @tap="jump(4)" class="index_list_item_right_item">
<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
</image>
<view class="listtext">订单列表</view>
</view>
</view>
</view>
<view class="index_list_item">
<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
class="index_list_item_left">
<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png"></image>
<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png">
</image>
<view class="left_text">动销排名</view>
</view>
<view class="index_list_item_right">
<view v-if="jurisdiction('ranking:info:list')" @tap="jump(6)" class="index_list_item_right_item">
<view v-if="jurisdiction('ranking:info:list')" @tap="jump(6)" class="index_list_item_right_item">
<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
</image>
<view class="listtext"> 油站动销</view>
</view>
<view v-if="jurisdiction('ranking:info:list')" @tap="jump(8)" class="index_list_item_right_item">
<view v-if="jurisdiction('ranking:info:list')" @tap="jump(8)" class="index_list_item_right_item">
<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
</image>
<view class="listtext"> 企业动销 </view>
@@ -103,23 +109,25 @@
</view>
</view>
<view class="index_list_item">
<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
class="index_list_item_left">
<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png"></image>
<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png">
</image>
<view class="left_text">调价管理</view>
</view>
<view class="index_list_item_right">
<view v-if="jurisdiction('priceAdjust:info:list')" @tap="jump(5)" class="index_list_item_right_item">
<view v-if="jurisdiction('priceAdjust:info:list')" @tap="jump(5)"
class="index_list_item_right_item">
<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
</image>
<view class="listtext">调价申请</view>
</view>
<view v-if="jurisdiction('priceTask:info:list')" @tap="jump(7)" class="index_list_item_right_item">
<view v-if="jurisdiction('priceTask:info:list')" @tap="jump(7)" class="index_list_item_right_item">
<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
</image>
<view class="listtext">调价任务</view>
</view>
</view>
</view>
</view>
@@ -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
}

13
pages/index/menu.json
View File

@@ -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"
}
]
},

109
pages/index/newindex.css
View File

@@ -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;
}

2
pages/index/newindex.vue
View File

@@ -201,9 +201,7 @@
})
return
}
let isHave = this.collection.find(i => i.name === item.name)
// 是否已收藏
if(isHave) {
this.remove(item)
return