mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.excellentkk.cn/mkm/OfficeApp

Browse Source
This commit is contained in:
weipengfei 2023-08-23 10:14:26 +08:00
commit a259db6cdb
5 changed files with 149 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pages.json
View File

@ -118,6 +118,15 @@
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
} }
}, {
"path": "pages/logistics/post",
"style": {
"navigationBarTitleText": "驿站",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#0122C7",
"navigationBarTextStyle": "white"
}
}, { }, {
"path": "pages/updatePasswprd/updatePasswprd", "path": "pages/updatePasswprd/updatePasswprd",
"style": { "style": {

1
pages/logistics/deliveryDetil.vue
View File

@ -7,7 +7,6 @@
<view class="content"> <view class="content">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<view class="map"> <view class="map">
<map :class="mapClass" id="map" @markertap='mapFun' :enable-zoom="true" :polyline="polyline" <map :class="mapClass" id="map" @markertap='mapFun' :enable-zoom="true" :polyline="polyline"
:markers='markers' :scale="scale" style="width:100%;height: 70%;" :markers='markers' :scale="scale" style="width:100%;height: 70%;"
:latitude="markers[0].latitude" :enable-scroll="true" :longitude="markers[0].longitude"> :latitude="markers[0].latitude" :enable-scroll="true" :longitude="markers[0].longitude">

48
pages/logistics/post.vue Normal file
View File

@ -0,0 +1,48 @@
<template>
<view class="content">
<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action="false" bg-color="white"
v-model="keywords"></u-search>
<view class="cards">
</view>
</view>
</template>
<script>
import {
getList
} from "@/api/logistics.js"
export default {
data() {
return {}
}
}
methods: {
// getOrderList() {
// console.log("列表更新")
// let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
// getList({
// status: 1,
// user_id: id,
// keywords: this.keywords,
// user_type: this.is_captain
// }).then(res => {
// this.orderlist = []
// this.orderlist = res.data.data
// })
// }
}
</script>
<style lang="scss" scoped>
.content {
padding: 30rpx;
}
</style>

BIN
static/img/home/GDZZ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 778 B

179
static/server/server.js
View File

@ -187,93 +187,98 @@ export const quickLink = [{
] ]
// oaHOme快速入口数据 // oaHOme快速入口数据
export const oaHomeData = [ export const oaHomeData = [{
{ text: '公司信息',
text: '公司信息', icon: '../../static/img/home/GSXX.png',
icon: '../../static/img/home/GSXX.png', url: '/subpkg/companyInfo/companyInfo',
url: '/subpkg/companyInfo/companyInfo', admin: true
admin: true },
}, {
{ text: '人员管理',
text: '人员管理', icon: '../../static/img/home/RYGL.png',
icon: '../../static/img/home/RYGL.png', url: '/subpkg/personnel/personnel',
url: '/subpkg/personnel/personnel', admin: true
admin: true },
}, {
{ text: '固定资产',
text: '固定资产', icon: '../../static/img/home/GDZZ.png',
icon: '../../static/img/home/GDZC.png', url: '/subpkg/property/index',
url: '/subpkg/fixedAssets/fixedAssets', admin: true
admin: true },
}, {
{ text: '合同管理',
text: '合同管理', icon: '../../static/img/home/HTGL.png',
icon: '../../static/img/home/HTGL.png', url: '/subpkg/contract/contract'
url: '/subpkg/contract/contract' },
}, // {
// { // text: '公司管理',
// text: '公司管理', // icon: '../../static/img/home/GSXX.png',
// icon: '../../static/img/home/GSXX.png', // url: '/subpkg/companyAdmin/companyAdmin',
// url: '/subpkg/companyAdmin/companyAdmin', // admin: true
// admin: true // },
// }, {
{ text: '任务管理',
text: '任务管理', icon: '../../static/img/home/RWGL.png',
icon: '../../static/img/home/RWGL.png', url: '/subpkg/taskAdmin/taskAdmin',
url: '/subpkg/taskAdmin/taskAdmin', },
}, {
{ text: '档案管理',
text: '档案管理', icon: '../../static/img/home/DAGL.png',
icon: '../../static/img/home/DAGL.png', url: '/subpkg/captain/captain',
url: '/subpkg/captain/captain', admin: true
admin: true },
}, {
{ text: '档案管理',
text: '档案管理', icon: '../../static/img/home/DAGL.png',
icon: '../../static/img/home/DAGL.png', url: '/subpkg/archives/archives',
url: '/subpkg/archives/archives', captain: true
captain: true },
}, // {
// { // text: '片区经理',
// text: '片区经理', // icon: '../../static/img/home/GRCW.png',
// icon: '../../static/img/home/GRCW.png', // url: '/pages/oaManager/oaManager',
// url: '/pages/oaManager/oaManager', // admin: true
// admin: true // },
// }, {
{ text: '个人财务',
text: '个人财务', icon: '../../static/img/home/GRCW.png',
icon: '../../static/img/home/GRCW.png', url: '/subpkg/finance/finance'
url: '/subpkg/finance/finance' },
}, {
// { text: '驿站',
// text: '出差申请', icon: '../../static/img/home/GRCW.png',
// icon: prefix + 'oa/ccsq@2x.png' url: '/subpkg/finance/finance',
// }, // captain: true
// { },
// text: '外出申请', // {
// icon: prefix + 'oa/wcsq@2x.png' // text: '出差申请',
// }, // icon: prefix + 'oa/ccsq@2x.png'
// { // },
// text: '采购申请', // {
// icon: prefix + 'oa/cgsq@2x.png' // text: '外出申请',
// }, // icon: prefix + 'oa/wcsq@2x.png'
// { // },
// text: '物品维修', // {
// icon: prefix + 'oa/bxsq@2x.png' // text: '采购申请',
// }, // icon: prefix + 'oa/cgsq@2x.png'
// { // },
// text: '用章申请', // {
// icon: prefix + 'oa/yzsq@2x.png' // text: '物品维修',
// }, // icon: prefix + 'oa/bxsq@2x.png'
// { // },
// text: '报销申请', // {
// icon: prefix + 'oa/gengduo@2x.png' // text: '用章申请',
// }, // icon: prefix + 'oa/yzsq@2x.png'
{ // },
text: '更多', // {
icon: prefix + 'oa/wpwx@2x.png', // text: '报销申请',
url: '/pages/views/application' // icon: prefix + 'oa/gengduo@2x.png'
} // },
{
text: '更多',
icon: prefix + 'oa/wpwx@2x.png',
url: '/pages/views/application'
}
] ]
/** /**