diff --git a/App.vue b/App.vue index 981841d..a598798 100644 --- a/App.vue +++ b/App.vue @@ -4,28 +4,6 @@ // #endif export default { onLaunch: async function() { - const audioContext = uni.createInnerAudioContext() - // 设置音频文件地址 - audioContext.src = './static/mp3/order.mp3' - let noticeArr = [] - // 播放音频 - //#ifdef APP-PLUS - jpushModule.addNotificationListener(res => { - if (!noticeArr.includes(res.messageID)) { - console.log(res.messageID) - audioContext.play() - noticeArr.push(res.messageID) - console.log("app的") - uni.vibrateLong({ - success: function() { - console.log('success'); - } - }); - } - - - }) - // #endif console.log('App Launch') try { if (!this.$store.state.app.token) uni.redirectTo({ @@ -49,20 +27,29 @@ // }) }, onShow: function() { + const audioContext = uni.createInnerAudioContext() + // 设置音频文件地址 + audioContext.src = './static/mp3/order.mp3' + let noticeArr = [] + // 播放音频 + //#ifdef APP-PLUS + jpushModule.addNotificationListener(res => { + if (!noticeArr.includes(res.messageID)) { + console.log(res.messageID) + audioContext.play() + noticeArr.push(res.messageID) + console.log("app的") + uni.vibrateLong({ + success: function() { + console.log('success'); + } + }); + } + + + }) + // #endif console.log('App Show') - // 创建内部音频对象 - // const audioContext = uni.createInnerAudioContext() - - // // 设置音频文件地址 - // audioContext.src = './static/mp3/order.mp3' - - // // 播放音频 - // //#ifdef APP-PLUS - // jpushModule.addNotificationListener(res => { - // console.log("监听成功") - // audioContext.play() - // }) - // // #endif }, onHide: function() { console.log('App Hide') diff --git a/components/property/vehicleCard.vue b/components/property/vehicleCard.vue new file mode 100644 index 0000000..374bded --- /dev/null +++ b/components/property/vehicleCard.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index d8fea38..b935288 100644 --- a/pages.json +++ b/pages.json @@ -269,14 +269,14 @@ "navigationBarTextStyle": "white" } - }, { - "path": "companySign/companySign", - "style": { - "navigationBarTitleText": "签约公司详情", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companySign/companySign", + "style": { + "navigationBarTitleText": "签约公司详情", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } }, { "path": "personnelDetails/personnelDetails", @@ -477,10 +477,28 @@ } }, { - "path": "vehicle/vehicle", + "path": "property/index", + "style": { + "navigationBarTitleText": "资产管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "property/chosseCompany", + "style": { + "navigationBarTitleText": "选择公司", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "property/vehicle", "style": { "navigationBarTitleText": "三轮车游走", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#0122C7", "navigationBarTextStyle": "white" } diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 02e2f64..8489208 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -96,7 +96,7 @@ + height="65rpx"> {{ item.text }} @@ -258,8 +258,8 @@ that.$refs.globalPopup.showPopu(); that.getOrderList(); console.log("idnex的"); + that.notArr.push(result.messageID); } - that.notArr.push(result.messageID); }); // #endif @@ -291,6 +291,7 @@ // }) // }, async getOrderList() { + console.log("列表") let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || ""; let res = await getList({ user_id: id, @@ -426,6 +427,7 @@ }, }, onPullDownRefresh() { + this.getOrderList(); // this.getIndexList() uni.stopPullDownRefresh(); }, @@ -565,7 +567,7 @@ /* 设置元素宽度，根据需要进行调整 */ .text_time { display: inline-block; - background-color: #ff8c1a; + background-color: #ff7c32; color: white; padding: 5rpx 10rpx; margin-right: 10rpx; diff --git a/static/css/style.scss b/static/css/style.scss index e7db236..18fabf8 100644 --- a/static/css/style.scss +++ b/static/css/style.scss @@ -2,7 +2,12 @@ vertical-align: middle; /* 垂直居中对齐 */ } - +.lg_status1 { + color: #40bc5e; +} +.lg_status2 { + color: #ff7c32; +} .font-bg-red, .font_bg-red { display: inline-block; diff --git a/static/img/home/ZCGL.png b/static/img/home/ZCGL.png new file mode 100644 index 0000000..ae0b14a Binary files /dev/null and b/static/img/home/ZCGL.png differ diff --git a/static/img/logistics/QS.png b/static/img/logistics/QS.png index 949bcd8..c72f4ab 100644 Binary files a/static/img/logistics/QS.png and b/static/img/logistics/QS.png differ diff --git a/static/img/logistics/SJ.png b/static/img/logistics/SJ.png index bbcd672..bc6a8c9 100644 Binary files a/static/img/logistics/SJ.png and b/static/img/logistics/SJ.png differ diff --git a/static/server/contract.js b/static/server/contract.js index 2a661d7..6197d09 100644 --- a/static/server/contract.js +++ b/static/server/contract.js @@ -1,2 +1,2 @@ -export const companyContractType = [23,24,25] -export const personnerContractType = [19,20,21,22] \ No newline at end of file +export const companyContractType = [23, 24, 25, 29] +export const personnerContractType = [19, 20, 21, 22] \ No newline at end of file diff --git a/static/server/server.js b/static/server/server.js index e41f7c6..eb6c80c 100644 --- a/static/server/server.js +++ b/static/server/server.js @@ -1,468 +1,470 @@ export const avatar = 'https://cdn.uviewui.com/uview/album/1.jpg' export const defaultAvatar = - 'https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132' + 'https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132' export const prefix = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/' export const urls = [ - 'https://cdn.uviewui.com/uview/album/1.jpg', - 'https://cdn.uviewui.com/uview/album/2.jpg', - 'https://cdn.uviewui.com/uview/album/3.jpg', - 'https://cdn.uviewui.com/uview/album/4.jpg', - 'https://cdn.uviewui.com/uview/album/7.jpg', - 'https://cdn.uviewui.com/uview/album/6.jpg', - 'https://cdn.uviewui.com/uview/album/5.jpg' + 'https://cdn.uviewui.com/uview/album/1.jpg', + 'https://cdn.uviewui.com/uview/album/2.jpg', + 'https://cdn.uviewui.com/uview/album/3.jpg', + 'https://cdn.uviewui.com/uview/album/4.jpg', + 'https://cdn.uviewui.com/uview/album/7.jpg', + 'https://cdn.uviewui.com/uview/album/6.jpg', + 'https://cdn.uviewui.com/uview/album/5.jpg' ] export const wenluData = [ - 'gxsy/fangsahn@2x.png', - 'gxsy/laojiao@2x.png', - 'gxsy/zbgy@2x.png' + 'gxsy/fangsahn@2x.png', + 'gxsy/laojiao@2x.png', + 'gxsy/zbgy@2x.png' ] -export const marketData = [ - { - title: '江阳区', - text: '醉美泸州 • 中国酒城', - src: 'gxsy/jiangyang@2x.png', - bg: 'gxsy/jiangyang@2x(1).png', - code: '510502' - }, - { - title: '龙马潭区', - text: '中国酒城 • 文明泸州', - src: 'gxsy/longmatan@2x.png', - bg: 'gxsy/longmatan@2x(1).png', - code: '510504' - }, - { - title: '纳溪区', - text: '山水神韵 • 醇香酒城', - src: 'gxsy/naxiqu@2x.png', - bg: 'gxsy/naxi@2x.png', - code: '510503' - }, - { - title: '泸县', - text: '千年古县 • 宋韵龙城', - src: 'gxsy/luxian@2x.png', - bg: 'gxsy/luxian@2x(1).png', - code: '510521' - }, - { - title: '叙永县', - text: '康养竹乡 • 画稿叙永', - src: 'gxsy/xuyongxian@2x.png', - bg: 'gxsy/xuyong@2x.png', - code: '510524' - }, - { - title: '古蔺县', - text: '梦里郎酒 • 画里古蔺', - src: 'gxsy/gulinxian@2x.png', - bg: 'gxsy/jiangyang@2x(1).png', - code: '510525' - }, { - title: '合江县', - text: '千年荔城 • 甜美合江', - src: 'gxsy/hejaingxian@2x.png', - bg: 'gxsy/hejaing@2x.png', - code: '510522' - } +export const marketData = [{ + title: '江阳区', + text: '醉美泸州 • 中国酒城', + src: 'gxsy/jiangyang@2x.png', + bg: 'gxsy/jiangyang@2x(1).png', + code: '510502' + }, + { + title: '龙马潭区', + text: '中国酒城 • 文明泸州', + src: 'gxsy/longmatan@2x.png', + bg: 'gxsy/longmatan@2x(1).png', + code: '510504' + }, + { + title: '纳溪区', + text: '山水神韵 • 醇香酒城', + src: 'gxsy/naxiqu@2x.png', + bg: 'gxsy/naxi@2x.png', + code: '510503' + }, + { + title: '泸县', + text: '千年古县 • 宋韵龙城', + src: 'gxsy/luxian@2x.png', + bg: 'gxsy/luxian@2x(1).png', + code: '510521' + }, + { + title: '叙永县', + text: '康养竹乡 • 画稿叙永', + src: 'gxsy/xuyongxian@2x.png', + bg: 'gxsy/xuyong@2x.png', + code: '510524' + }, + { + title: '古蔺县', + text: '梦里郎酒 • 画里古蔺', + src: 'gxsy/gulinxian@2x.png', + bg: 'gxsy/jiangyang@2x(1).png', + code: '510525' + }, { + title: '合江县', + text: '千年荔城 • 甜美合江', + src: 'gxsy/hejaingxian@2x.png', + bg: 'gxsy/hejaing@2x.png', + code: '510522' + } ] -export const shichangData = [ - { - url: 'img4@2x.png', - title: 'rexiao@2x.png', - text: '农业生产产品' - }, - { - url: 'img5@2x.png', - title: 'dangji@2x.png', - text: '村名生活用品' - } +export const shichangData = [{ + url: 'img4@2x.png', + title: 'rexiao@2x.png', + text: '农业生产产品' + }, + { + url: 'img5@2x.png', + title: 'dangji@2x.png', + text: '村名生活用品' + } ] -export const openList = [ - { - title: '党建在线', - text: '党建资讯文章', - src: 'djzx@2x.png', - color: '#FF614D', - pid: 295, - navCallBack: (pid, t, id) => { - uni.navigateTo({ - url: `/pages/service_hall/party_building?pid=${pid}&title=${t}&village_id=${id}` - }) - } - }, - { - title: '村务动态', - text: '村务信息公开', - src: 'cwdt@2x.png', - color: '#4DB896', - pid: 300, - navCallBack: (pid, t, id) => { - uni.navigateTo({ - url: `/pages/service_hall/party_building?pid=${pid}&title=${t}&village_id=${id}` - }) - } - }, - { - title: '村镇新闻', - text: '村镇新闻资讯', - src: 'czxw@2x.png', - color: '#FFAA33', - pid: 304, - navCallBack: (pid, t, id) => { - uni.navigateTo({ - url: `/pages/service_hall/list?id=${pid}&title=${t}&village_id=${id}` - }) - } - }, - { - title: '文明实践', - text: '文明创建实践', - src: 'wmsj@2x.png', - color: '#FF7A3D', - pid: '', - navCallBack: (pid, t, id) => { - uni.navigateTo({ - url: `/pages/service_hall/opens` - }) - } - } +export const openList = [{ + title: '党建在线', + text: '党建资讯文章', + src: 'djzx@2x.png', + color: '#FF614D', + pid: 295, + navCallBack: (pid, t, id) => { + uni.navigateTo({ + url: `/pages/service_hall/party_building?pid=${pid}&title=${t}&village_id=${id}` + }) + } + }, + { + title: '村务动态', + text: '村务信息公开', + src: 'cwdt@2x.png', + color: '#4DB896', + pid: 300, + navCallBack: (pid, t, id) => { + uni.navigateTo({ + url: `/pages/service_hall/party_building?pid=${pid}&title=${t}&village_id=${id}` + }) + } + }, + { + title: '村镇新闻', + text: '村镇新闻资讯', + src: 'czxw@2x.png', + color: '#FFAA33', + pid: 304, + navCallBack: (pid, t, id) => { + uni.navigateTo({ + url: `/pages/service_hall/list?id=${pid}&title=${t}&village_id=${id}` + }) + } + }, + { + title: '文明实践', + text: '文明创建实践', + src: 'wmsj@2x.png', + color: '#FF7A3D', + pid: '', + navCallBack: (pid, t, id) => { + uni.navigateTo({ + url: `/pages/service_hall/opens` + }) + } + } ] -export const quickLink = [ - { - icon: 'scfw', - src: 'scfw.png', - name: '商超服务', - url: '/pages/fast_track/production', - category_id: 25 - }, - { - icon: 'nfcp', - src: 'nfcp.png', - name: '农副产品', - url: '/pages/fast_track/production', - category_id: 26 - }, { - icon: 'sczl', - src: 'sczl.png', - name: '生产资料', - url: '/pages/fast_track/production', - category_id: 22 - }, { - icon: 'shfw', - src: 'shfw.png', - name: '生活服务', - // url: '/pages/fast_track/service_life', - url: '/pages/fast_track/production', - category_id: 23 - }, { - icon: 'hbxs', - src: 'hbxs.png', - name: '红白喜事', - // url: '/pages/fast_track/red_white_thing', - url: '/pages/fast_track/production', - category_id: 21 - }, { - icon: 'wyly', - src: 'wyly.png', - name: '文娱旅游', - // url: '/pages/fast_track/travel' - }, { - icon: 'fwzx', - src: 'fwzx.png', - name: '房屋装修', - // url: '/pages/fast_track/fitment' - }, { - icon: 'jypx', - src: 'jypx.png', - name: '教育资讯', - // url: '/pages/fast_track/education' - }, { - icon: 'msgy', - src: 'msgy.png', - name: '民生资讯', - // url: '/pages/fast_track/public_benefit' - }, { - icon: 'ylbj', - src: 'ylbj.png', - name: '医疗资讯' - } +export const quickLink = [{ + icon: 'scfw', + src: 'scfw.png', + name: '商超服务', + url: '/pages/fast_track/production', + category_id: 25 + }, + { + icon: 'nfcp', + src: 'nfcp.png', + name: '农副产品', + url: '/pages/fast_track/production', + category_id: 26 + }, { + icon: 'sczl', + src: 'sczl.png', + name: '生产资料', + url: '/pages/fast_track/production', + category_id: 22 + }, { + icon: 'shfw', + src: 'shfw.png', + name: '生活服务', + // url: '/pages/fast_track/service_life', + url: '/pages/fast_track/production', + category_id: 23 + }, { + icon: 'hbxs', + src: 'hbxs.png', + name: '红白喜事', + // url: '/pages/fast_track/red_white_thing', + url: '/pages/fast_track/production', + category_id: 21 + }, { + icon: 'wyly', + src: 'wyly.png', + name: '文娱旅游', + // url: '/pages/fast_track/travel' + }, { + icon: 'fwzx', + src: 'fwzx.png', + name: '房屋装修', + // url: '/pages/fast_track/fitment' + }, { + icon: 'jypx', + src: 'jypx.png', + name: '教育资讯', + // url: '/pages/fast_track/education' + }, { + icon: 'msgy', + src: 'msgy.png', + name: '民生资讯', + // url: '/pages/fast_track/public_benefit' + }, { + icon: 'ylbj', + src: 'ylbj.png', + name: '医疗资讯' + } ] // oaHOme快速入口数据 -export const oaHomeData = [ - { - text: '公司信息', - icon: prefix + 'oa/qjsq@2x.png', - url: '/subpkg/companyInfo/companyInfo', - admin: true - }, - { - text: '人员管理', - icon: prefix + 'oa/ccsq@2x.png', - url: '/subpkg/personnel/personnel', - admin: true - }, - // { - // text: '固定资产', - // icon: prefix + 'oa/wcsq@2x.png', - // url: '/subpkg/fixedAssets/fixedAssets', - // admin: true - // }, - { - text: '合同管理', - icon: prefix + 'oa/cgsq@2x.png', - url: '/subpkg/contract/contract' - }, - // { - // text: '公司管理', - // icon: prefix + 'oa/bxsq@2x.png', - // url: '/subpkg/companyAdmin/companyAdmin', - // admin: true - // }, - { - text: '任务管理', - icon: prefix + 'oa/bxsq@2x.png', - url: '/subpkg/taskAdmin/taskAdmin', - }, - { - text: '档案管理', - icon: prefix + 'oa/bxsq@2x.png', - url: '/subpkg/captain/captain', - admin: true - }, - { - text: '档案管理', - icon: prefix + 'oa/bxsq@2x.png', - url: '/subpkg/archives/archives', - captain: true - }, - // { - // text: '片区经理', - // icon: prefix + 'oa/yzsq@2x.png', - // url: '/pages/oaManager/oaManager', - // admin: true - // }, - { - text: '个人财务', - icon: prefix + 'oa/gengduo@2x.png', - url: '/subpkg/finance/finance' - }, - // { - // text: '出差申请', - // icon: prefix + 'oa/ccsq@2x.png' - // }, - // { - // text: '外出申请', - // icon: prefix + 'oa/wcsq@2x.png' - // }, - // { - // text: '采购申请', - // icon: prefix + 'oa/cgsq@2x.png' - // }, - // { - // text: '物品维修', - // icon: prefix + 'oa/bxsq@2x.png' - // }, - // { - // text: '用章申请', - // icon: prefix + 'oa/yzsq@2x.png' - // }, - // { - // text: '报销申请', - // icon: prefix + 'oa/gengduo@2x.png' - // }, - { - text: '更多', - icon: prefix + 'oa/wpwx@2x.png', - url: '/pages/views/application' - } +export const oaHomeData = [{ + text: '公司信息', + icon: prefix + 'oa/qjsq@2x.png', + // icon: "@/static/img/home/GSXX", + url: '/subpkg/companyInfo/companyInfo', + admin: true + }, + { + text: '人员管理', + icon: prefix + 'oa/ccsq@2x.png', + url: '/subpkg/personnel/personnel', + admin: true + }, + // { + // text: '固定资产', + // icon: prefix + 'oa/wcsq@2x.png', + // url: '/subpkg/fixedAssets/fixedAssets', + // admin: true + // }, + { + text: '合同管理', + // icon: prefix + 'oa/cgsq@2x.png', + icon: "../../static/img/home/GSXX.png", + url: '/subpkg/contract/contract' + }, + // { + // text: '公司管理', + // icon: prefix + 'oa/bxsq@2x.png', + // url: '/subpkg/companyAdmin/companyAdmin', + // admin: true + // }, + { + text: '任务管理', + icon: prefix + 'oa/bxsq@2x.png', + url: '/subpkg/taskAdmin/taskAdmin', + }, + { + text: '档案管理', + icon: prefix + 'oa/bxsq@2x.png', + url: '/subpkg/captain/captain', + admin: true + }, + { + text: '档案管理', + icon: prefix + 'oa/bxsq@2x.png', + url: '/subpkg/archives/archives', + captain: true + }, + // { + // text: '片区经理', + // icon: prefix + 'oa/yzsq@2x.png', + // url: '/pages/oaManager/oaManager', + // admin: true + // }, + { + text: '个人财务', + icon: prefix + 'oa/gengduo@2x.png', + url: '/subpkg/finance/finance' + }, + { + text: '资产管理', + icon: prefix + 'oa/gengduo@2x.png', + url: '/subpkg/property/index' + }, + // { + // text: '出差申请', + // icon: prefix + 'oa/ccsq@2x.png' + // }, + // { + // text: '外出申请', + // icon: prefix + 'oa/wcsq@2x.png' + // }, + // { + // text: '采购申请', + // icon: prefix + 'oa/cgsq@2x.png' + // }, + // { + // text: '物品维修', + // icon: prefix + 'oa/bxsq@2x.png' + // }, + // { + // text: '用章申请', + // icon: prefix + 'oa/yzsq@2x.png' + // }, + // { + // text: '报销申请', + // icon: prefix + 'oa/gengduo@2x.png' + // }, + { + text: '更多', + icon: prefix + 'oa/wpwx@2x.png', + url: '/pages/views/application' + } ] /** * oa-应用中心数据 */ export const appDataList = [{ - title: '假勤', - data: [{ - name: '请假申请', - src: prefix + 'oa/qjsq@2x.png', - url: '/pages/views/leave_request' - }, - { - name: '出差申请', - src: prefix + 'oa/ccsq@2x.png', - url: '' - }, - { - name: '外出申请', - src: prefix + 'oa/wcsq@2x.png', - url: '' - } - ] - }, - { - title: '行政', - data: [{ - name: '物品维修', - src: prefix + 'oa/bxsq@2x.png', - url: '' - }, - { - name: '用章审批', - src: prefix + 'oa/yzsq@2x.png', - url: '' - }, - { - name: '领用审批', - src: prefix + 'oa/lysp@2x.png', - url: '' - } - ] - }, - { - title: '财务', - data: [{ - name: '借款申请', - src: prefix + 'oa/jksq@2x.png', - url: '' - }, - { - name: '付款申请', - src: prefix + 'oa/fksq@2x.png', - url: '' - }, - { - name: '报销申请', - src: prefix + 'oa/gengduo@2x.png', - url: '' - }, - { - name: '采购申请', - src: prefix + 'oa/cgsq@2x.png', - url: '' - }, - { - name: '奖励申请', - src: prefix + 'oa/jlsq@2x.png', - url: '' - }, - { - name: '活动经费', - src: prefix + 'oa/hdjf@2x.png', - url: '' - } - ] - }, - { - title: '人事', - data: [{ - name: '招聘需求', - src: prefix + 'oa/zpxq@2x.png', - url: '' - }] - }, - { - title: '其他', - data: [{ - name: '通用审批', - src: prefix + 'oa/tysp@2x.png', - url: '/pages/views/com_approve' - }] - } + title: '假勤', + data: [{ + name: '请假申请', + src: prefix + 'oa/qjsq@2x.png', + url: '/pages/views/leave_request' + }, + { + name: '出差申请', + src: prefix + 'oa/ccsq@2x.png', + url: '' + }, + { + name: '外出申请', + src: prefix + 'oa/wcsq@2x.png', + url: '' + } + ] + }, + { + title: '行政', + data: [{ + name: '物品维修', + src: prefix + 'oa/bxsq@2x.png', + url: '' + }, + { + name: '用章审批', + src: prefix + 'oa/yzsq@2x.png', + url: '' + }, + { + name: '领用审批', + src: prefix + 'oa/lysp@2x.png', + url: '' + } + ] + }, + { + title: '财务', + data: [{ + name: '借款申请', + src: prefix + 'oa/jksq@2x.png', + url: '' + }, + { + name: '付款申请', + src: prefix + 'oa/fksq@2x.png', + url: '' + }, + { + name: '报销申请', + src: prefix + 'oa/gengduo@2x.png', + url: '' + }, + { + name: '采购申请', + src: prefix + 'oa/cgsq@2x.png', + url: '' + }, + { + name: '奖励申请', + src: prefix + 'oa/jlsq@2x.png', + url: '' + }, + { + name: '活动经费', + src: prefix + 'oa/hdjf@2x.png', + url: '' + } + ] + }, + { + title: '人事', + data: [{ + name: '招聘需求', + src: prefix + 'oa/zpxq@2x.png', + url: '' + }] + }, + { + title: '其他', + data: [{ + name: '通用审批', + src: prefix + 'oa/tysp@2x.png', + url: '/pages/views/com_approve' + }] + } ] /** * oa-个人中心 */ export const myOaData = [ - // { - // name: '流水详情', - // icon: '../../static/icons/runningWater.png', - // url: '/subpkg/orderDetail/orderDetail' - // }, - // { - // name: '管理后台', - // icon: '../../static/icons/backstage.png', - // // url: '/pages/views/personal_center_two' - // }, - { - name: '片区经理', - icon: '../../static/icons/manager.png', - url: '/pages/oaManager/oaManager' - }, - { - name: '安全设置', - icon: '../../static/icons/setting.png', - url: '/pages/updatePasswprd/updatePasswprd' - }, - // { - // name: '管理后台', - // icon: 'custom-icongongzi', - // // url: '/pages/views/personal_center_two' - // }, - // { - // name: '片区经理', - // icon: 'custom-icongongzi', - // url: '/pages/oaManager/oaManager' - // }, - // { - // name: '工资详情', - // icon: 'custom-icongongzi', - // url: '/pages/views/personal_center_two' - // }, - // { - // name: '公示文档', - // icon: 'custom-iconwendang', - // url: '/pages/views/public_document' - // }, - // { - // name: '绑定公众号', - // icon: 'custom-iconweixin' - // }, - // { - // name: '意见反馈', - // icon: 'custom-iconyijian' - // } + // { + // name: '流水详情', + // icon: '../../static/icons/runningWater.png', + // url: '/subpkg/orderDetail/orderDetail' + // }, + // { + // name: '管理后台', + // icon: '../../static/icons/backstage.png', + // // url: '/pages/views/personal_center_two' + // }, + { + name: '片区经理', + icon: '../../static/icons/manager.png', + url: '/pages/oaManager/oaManager' + }, + { + name: '安全设置', + icon: '../../static/icons/setting.png', + url: '/pages/updatePasswprd/updatePasswprd' + }, + // { + // name: '管理后台', + // icon: 'custom-icongongzi', + // // url: '/pages/views/personal_center_two' + // }, + // { + // name: '片区经理', + // icon: 'custom-icongongzi', + // url: '/pages/oaManager/oaManager' + // }, + // { + // name: '工资详情', + // icon: 'custom-icongongzi', + // url: '/pages/views/personal_center_two' + // }, + // { + // name: '公示文档', + // icon: 'custom-iconwendang', + // url: '/pages/views/public_document' + // }, + // { + // name: '绑定公众号', + // icon: 'custom-iconweixin' + // }, + // { + // name: '意见反馈', + // icon: 'custom-iconyijian' + // } ] /* oa-请假类型 */ export const oaLeaveData = [{ - name: '事假', - id: 1 - }, - { - name: '年假', - id: 2 - }, - { - name: '调休假', - id: 3 - }, - { - name: '病假', - id: 4 - }, - { - name: '婚假', - id: 5 - }, - { - name: '丧假', - id: 6 - }, - { - name: '产假', - id: 7 - }, - { - name: '陪产假', - id: 8 - }, - { - name: '其他', - id: 9 - } -] + name: '事假', + id: 1 + }, + { + name: '年假', + id: 2 + }, + { + name: '调休假', + id: 3 + }, + { + name: '病假', + id: 4 + }, + { + name: '婚假', + id: 5 + }, + { + name: '丧假', + id: 6 + }, + { + name: '产假', + id: 7 + }, + { + name: '陪产假', + id: 8 + }, + { + name: '其他', + id: 9 + } +] \ No newline at end of file diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index 45baea1..d8aa81c 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -80,6 +80,9 @@ + + + diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue index 1c24799..7d500f2 100644 --- a/subpkg/finance/finance.vue +++ b/subpkg/finance/finance.vue @@ -299,8 +299,12 @@ // background-color: red; display: flex; justify-content: space-between; - width: 24vw; + width: auto; line-height: 44px; + + .name { + margin-left: 20rpx; + } } @@ -313,9 +317,9 @@ color: #FFFFFF; - .name { - margin: 0 17.5rpx; - } + // .name { + // margin: 0 17.5rpx; + // } image { width: 40rpx; diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue new file mode 100644 index 0000000..30fb397 --- /dev/null +++ b/subpkg/property/chosseCompany.vue @@ -0,0 +1,126 @@ + + + + + \ No newline at end of file diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue new file mode 100644 index 0000000..e6acc7e --- /dev/null +++ b/subpkg/property/index.vue @@ -0,0 +1,223 @@ + + + + + \ No newline at end of file diff --git a/subpkg/vehicle/vehicle.vue b/subpkg/property/vehicle.vue similarity index 60% rename from subpkg/vehicle/vehicle.vue rename to subpkg/property/vehicle.vue index 5ef6b54..d661588 100644 --- a/subpkg/vehicle/vehicle.vue +++ b/subpkg/property/vehicle.vue @@ -1,94 +1,47 @@ @@ -316,13 +260,13 @@ .content { padding: 2vh 3vw; - background-color: #F6F7FC; + background-color: #F5F5F5; height: 100vh; box-sizing: border-box; } .map { - height: 40vh; + height: 60vh; border-radius: 2vw; overflow: hidden; @@ -332,10 +276,14 @@ background-color: white; padding: 20rpx 10rpx; + .li { + margin: 20rpx 0; + } + .cir { display: inline-block; width: 2vw; - height: 4vw; + height: 2vw; border-radius: 2vw; margin: 0 20rpx; } @@ -350,55 +298,6 @@ z-index: 9999999; } - - .order_info { - border: none; - background-color: #FF7C32; - border-radius: 2vw; - overflow: hidden; - margin-top: 50rpx; - margin-bottom: 30rpx; - color: white; - - .top { - padding: 1vw 3vw; - - view { - margin: 10rpx 0; - } - - } - - .mark { - background-color: white; - color: #A8A8A8; - padding: 10rpx 20rpx; - - } - - .pro_list { - display: flex; - - text { - - flex: 2 - } - - .goods { - flex: 8; - margin: 0; - - .goods_tit { - margin: 0; - display: flex; - - } - - } - } - - } - .btn { position: fixed;