diff --git a/server/index.js b/server/index.js index f82f156..f828ad5 100644 --- a/server/index.js +++ b/server/index.js @@ -107,19 +107,60 @@ app.post('/api/search', (req,res) => { })) }); +// 查询业务列表 +app.post('/api/businessList', (req,res) => { + res.json(Mock.mock({ + code: 0, + data: { + list:[ + {bizId:1,bizName:'企业日常',children:[ + {bizId:11,bizName:'任务计划',icon:'static/images/business/icon-rwjh.png',status:1,isDaily:true}, + {bizId:12,bizName:'日报',icon:'static/images/business/icon-rb.png',status:1,isDaily:true}, + {bizId:13,bizName:'设备管理',icon:'static/images/business/icon-sbgl.png',status:1}, + {bizId:14,bizName:'绩效管理',icon:'static/images/business/icon-jxgl.png',status:1}, + {bizId:15,bizName:'公章申请',icon:'static/images/business/icon-gzsq.png',status:1,isDaily:true}, + {bizId:16,bizName:'会议室预约',icon:'static/images/business/icon-hysyy.png',status:1,isDaily:true}, + {bizId:17,bizName:'报修',icon:'static/images/business/icon-bx.png',status:1} + ]}, + {bizId:2,bizName:'CRM系统',children:[ + {bizId:21,bizName:'走访报告',icon:'static/images/business/demo.png',bizUrl:'/pages/business/CRM/visitorReport',status:true}, + {bizId:101,bizName:'走访报告',icon:'static/images/business/icon-zfbg.png',status:1}, + {bizId:102,bizName:'走访查看',icon:'static/images/business/icon-zfck.png',status:1,isDaily:true}, + {bizId:103,bizName:'走访审批',icon:'static/images/business/icon-zfsp.png',status:1}, + {bizId:104,bizName:'计划查看',icon:'static/images/business/icon-jhck.png',status:1}, + {bizId:105,bizName:'签到打卡',icon:'static/images/business/icon-qddk.png',status:1}, + {bizId:106,bizName:'打卡信息',icon:'static/images/business/icon-dkxx.png',status:1}, + {bizId:107,bizName:'打卡统计',icon:'static/images/business/icon-dktj.png',status:1}, + {bizId:108,bizName:'人员新增',icon:'static/images/business/icon-ryxz.png',status:1}, + {bizId:109,bizName:'信息查看',icon:'static/images/business/icon-xxck.png',status:1,isDaily:true}, + {bizId:1010,bizName:'信息审核',icon:'static/images/business/xxsh.png',badgeCount:5,status:1,isDaily:true}, + {bizId:1011,bizName:'信息统计',icon:'static/images/business/icon-xxtj.png',status:1}, + {bizId:1012,bizName:'回款查看',icon:'static/images/business/icon-hkck.png',status:1}, + {bizId:1013,bizName:'客户人员审核',icon:'static/images/business/icon-khrysh.png',badgeCount:3,status:true}, + {bizId:1014,bizName:'客户人员所属',icon:'static/images/business/icon-khryss.png',status:1}, + {bizId:1015,bizName:'客户人员归属人变更',icon:'static/images/business/icon-khrybg.png',status:1}, + {bizId:1016,bizName:'市场活动',icon:'static/images/business/icon-schd.png',status:1} + ]}, + {bizId:3,bizName:'供应链采纳',children:[]}, + {bizId:4,bizName:'PLM系统',children:[]} + ] + } + })) +}); + // 查询企业日常 Daily business app.post('/api/businessDaily', (req,res) => { res.json(Mock.mock({ code: 0, data: { list:[ - {id:1,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'}, - {id:2,name:'日报',imgSrc:'static/images/business/icon-rb.png'}, - {id:3,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'}, - {id:4,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'}, - {id:5,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'}, - {id:6,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'}, - {id:7,name:'报修',imgSrc:'static/images/business/icon-bx.png'} + {id:11,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'}, + {id:12,name:'日报',imgSrc:'static/images/business/icon-rb.png'}, + {id:13,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'}, + {id:14,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'}, + {id:15,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'}, + {id:16,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'}, + {id:17,name:'报修',imgSrc:'static/images/business/icon-bx.png'} ] } })) @@ -131,15 +172,15 @@ app.post('/api/businessCRMList', (req,res) => { code: 0, data: { list:[ - {id:1,name:'走访报告',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReport'}, - {id:2,name:'走访报告添加',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportAdd'}, - {id:3,name:'走访报告详情',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportDetail'}, - {id:4,name:'走访报告内容录入',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportEnter'}, - {id:5,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation'}, - {id:6,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'}, - {id:7,name:'签到打卡',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/vistorCheckin'}, - {id:8,name:'打卡统计',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/checkinStatistics'}, - {id:9,name:'回款查看',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/paymentCollection'}, + {id:21,name:'走访报告',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReport'}, + {id:22,name:'走访报告添加',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportAdd'}, + {id:23,name:'走访报告详情',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportDetail'}, + {id:24,name:'走访报告内容录入',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportEnter'}, + {id:25,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation'}, + {id:26,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'}, + {id:27,name:'签到打卡',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/vistorCheckin'}, + {id:28,name:'打卡统计',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/checkinStatistics'}, + {id:29,name:'回款查看',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/paymentCollection'}, {id:101,name:'走访报告',imgSrc:'static/images/business/icon-zfbg.png'}, {id:102,name:'走访查看',imgSrc:'static/images/business/icon-zfck.png'}, {id:103,name:'走访审批',imgSrc:'static/images/business/icon-zfsp.png'}, @@ -488,6 +529,23 @@ app.post('/api/getBindStatus', (req,res) => { })) }) +// 查询版本号 +app.post('/api/versionCheck', (req,res) => { + res.json(Mock.mock({ + "code": 0, + "message": "Success.", + "data": { + "status": 0,//版本状态 0-最新版本 1-有新版本,但现有版本可用 2-现有版本不可用,需要下载新版本 + "latestVersion": "1.0.1", + "downloadURL": "https://www.718ys.com/downloads/android/ys718_test_v1.0.0.apk", + "availableVersionsList": "1.0.0", + remark:'fdsfddf' + }, + "ok": true + })) +}) + + //2.创建server const server = http.createServer(app); diff --git a/src/App.vue b/src/App.vue index 6ee0efb..7835074 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,11 +7,24 @@ import { onLaunch } from '@dcloudio/uni-app'; onLaunch((opt) => { console.log("onLaunch") + + uni.preloadPage({ url: "/pages/login/login" }); + uni.preloadPage({ url: "/pages/home/home" }); + uni.preloadPage({ url: "/pages/business/business" }); + uni.preloadPage({ url: "/pages/notice/notice" }); + uni.preloadPage({ url: "/pages/userinfo/userinfo" }); }) \ No newline at end of file diff --git a/src/api/auth.js b/src/api/auth.js index d427955..ecb4728 100644 --- a/src/api/auth.js +++ b/src/api/auth.js @@ -1,9 +1,18 @@ import request from "@/utils/request" +// 获取客户端版本 +export function versionCheck(data) { + return request.post({ + url: '/api/versionCheck', + data + }) +} + // 获取设备绑定状态 -export function getBindStatus() { +export function getBindStatus(data) { return request.post({ url: '/api/getBindStatus', + data }) } diff --git a/src/api/business.js b/src/api/business.js index a42d45a..ffd690b 100644 --- a/src/api/business.js +++ b/src/api/business.js @@ -8,6 +8,14 @@ export function search(data) { }) } +// 业务列表 +export function businessList(data) { + return request.post({ + url: '/api/businessList', + data + }) +} + // 企业日常 export function businessDaily(data) { return request.post({ diff --git a/src/manifest.json b/src/manifest.json index 11ecba9..4125324 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -16,7 +16,7 @@ "compilerVersion" : 3, "splashscreen" : { "alwaysShowBeforeRender" : true, - "waiting" : true, + "waiting" : false,// 是否显示等待界面 "autoclose" : true, "delay" : 0 }, diff --git a/src/pages.json b/src/pages.json index 18ab606..a64300b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -28,13 +28,25 @@ { "path": "pages/home/home", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "renderer": "native", // 实验性选项,可能提升性能 + "hardwareAccelerated": true // 启用 GPU 加速 } }, { "path": "pages/business/business", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "renderer": "native", // 实验性选项,可能提升性能 + "hardwareAccelerated": true // 启用 GPU 加速 + } + }, + { + "path": "pages/business/editDaily", + "style": { + "navigationBarTitleText": "", + "renderer": "native", // 实验性选项,可能提升性能 + "hardwareAccelerated": true // 启用 GPU 加速 } }, { @@ -103,6 +115,14 @@ }, { "path": "pages/userinfo/userinfo", + "style": { + "navigationBarTitleText": "", + "renderer": "native", // 实验性选项,可能提升性能 + "hardwareAccelerated": true // 启用 GPU 加速 + } + }, + { + "path": "pages/userinfo/version", "style": { "navigationBarTitleText": "" } diff --git a/src/pages/business/business.vue b/src/pages/business/business.vue index 38494c8..e4a7d2a 100644 --- a/src/pages/business/business.vue +++ b/src/pages/business/business.vue @@ -27,49 +27,26 @@ 首页日常服务 - 编 辑 + 编 辑 - - - 企业日常 - {{expandFlag?'展开':'收起'}} + + + {{ item.bizName }} + {{item.expandFlag?'展开':'收起'}} - - - - {{ item.name }} + + + + + + {{ item2.bizName }} + + - - - - - - CRM系统 - {{expandFlag2?'展开':'收起'}} - - - - - - {{ item.name }} - - - - - - - 供应链采纳 - 展开 - - - - - - PLM系统 - 展开 - + @@ -81,17 +58,39 @@ + + \ No newline at end of file diff --git a/src/pages/deviceAuth/deviceAuth.vue b/src/pages/deviceAuth/deviceAuth.vue index c4136a3..036ba37 100644 --- a/src/pages/deviceAuth/deviceAuth.vue +++ b/src/pages/deviceAuth/deviceAuth.vue @@ -82,6 +82,7 @@ \ No newline at end of file diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 6375fa1..7f78e29 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -74,6 +74,7 @@ \ No newline at end of file diff --git a/src/static/font/iconfont.css b/src/static/font/iconfont.css index f242f7a..a9054ed 100644 --- a/src/static/font/iconfont.css +++ b/src/static/font/iconfont.css @@ -11,6 +11,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-phonefilled:before { + content: "\e68d"; +} + .icon-phonebaocun:before { content: "\e80b"; } diff --git a/src/static/font/iconfont.ttf b/src/static/font/iconfont.ttf index 5491a24..7c00c93 100644 Binary files a/src/static/font/iconfont.ttf and b/src/static/font/iconfont.ttf differ