From 0cd090c677e7b158a9d9079a58cba38c99d6aa41 Mon Sep 17 00:00:00 2001 From: zzy <411037547@qq.com> Date: Wed, 7 Sep 2022 11:29:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E9=A6=96=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=94=B9=E6=88=90=E4=BB=8E=E6=8E=A5=E5=8F=A3=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=202=E3=80=81=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=86=85=E9=83=A8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E9=85=8D=E7=BD=AE=E6=9D=83=E9=99=90=E5=B0=B1?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/utils.js | 129 +- pages.json | 1101 +++++++++-------- .../components/listUnit.vue | 92 ++ .../serverpartshoptotalsummary/detail.vue | 203 +++ .../serverpartshoptotalsummary/index.vue | 391 ++++++ .../shopmobilesummary/components/listUnit.vue | 119 ++ pages/autoTest/shopmobilesummary/detail.vue | 191 +++ pages/autoTest/shopmobilesummary/index.vue | 451 +++++++ pages/index/components/menus.js | 8 + pages/index/index.vue | 47 +- util/api.js | 64 +- util/apiPath.js | 4 +- util/index.js | 7 +- 13 files changed, 2200 insertions(+), 607 deletions(-) create mode 100644 pages/autoTest/serverpartshoptotalsummary/components/listUnit.vue create mode 100644 pages/autoTest/serverpartshoptotalsummary/detail.vue create mode 100644 pages/autoTest/serverpartshoptotalsummary/index.vue create mode 100644 pages/autoTest/shopmobilesummary/components/listUnit.vue create mode 100644 pages/autoTest/shopmobilesummary/detail.vue create mode 100644 pages/autoTest/shopmobilesummary/index.vue diff --git a/common/utils.js b/common/utils.js index ad3b438..25c7a0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -14,7 +14,7 @@ import request from '@/util/index.js' // * @returns // */ // function calculateDistance (fromp, to) { - + // return new Promise((resolve, reject) => { // qqmapsdk.calculateDistance({ // mode: 'straight', @@ -65,25 +65,23 @@ import request from '@/util/index.js' // } const netChange = () => { - - uni.onNetworkStatusChange(function(res){ + uni.onNetworkStatusChange(function(res) { // console.log(res.isConnected) - store.mutations.isConnect( res.isConnected) - if(!res.isConnected) { + store.mutations.isConnect(res.isConnected) + if (!res.isConnected) { uni.showToast({ - title:'网络未连接', - icon:'none' + title: '网络未连接', + icon: 'none' }) } }) } const cutDate = (dd, type, daynum) => { - dd = new Date(dd) || new Date(); type = type || 'YYYY/MM/DD' //hh:mm:ss - daynum = daynum*24*60*60*1000 || 0 + daynum = daynum * 24 * 60 * 60 * 1000 || 0 // console.log(daynum,dd,dd.getTime()+daynum) - dd = new Date(dd.getTime()+daynum )// 获取AddDayCount天后的日期 + dd = new Date(dd.getTime() + daynum) // 获取AddDayCount天后的日期 var y = dd.getFullYear() var m = (dd.getMonth() + 1) < 10 ? '0' + (dd.getMonth() + 1) : (dd.getMonth() + 1) // 获取当前月份的日期，不足10补0 var d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0 @@ -93,7 +91,7 @@ const cutDate = (dd, type, daynum) => { return type.replace('YYYY', y).replace('MM', m).replace('DD', d).replace('hh', h).replace('mm', mi).replace('ss', s) } // 金额格式化处理方法 -const fmoney = (s, n)=> { +const fmoney = (s, n) => { /* * 参数说明： * s：要格式化的数字 @@ -101,7 +99,7 @@ const fmoney = (s, n)=> { * */ n = n > 0 && n <= 20 ? n : 2; var fuhao = ''; //如果数字小于零则值为- - if(s<0){ + if (s < 0) { s = Math.abs(s); fuhao = '-' } @@ -112,58 +110,101 @@ const fmoney = (s, n)=> { for (let i = 0; i < l.length; i++) { t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : ""); } - return fuhao+[...t].reverse().join("") + "." + r; + return fuhao + [...t].reverse().join("") + "." + r; } -function toNextRoute (type,url) { - uni[type]({ - url: url, - success: (result) => { +/** + * 将数据转成日期格式 + * @param {string} s: 要格式化的日期数据 + */ +function changeStringToDate(s) { + if (s.length === 14) { + return s.substring(0, 4) + '-' + s.substring(4, 6) + '-' + s.substring(6, 8) + ' ' + + s.substring(8, 10) + ':' + s.substring(10, 12) + ':' + s.substring(12, 14); + } + else if (s.length === 8) { + return s.substring(0, 4) + '-' + s.substring(4, 6) + '-' + s.substring(6, 8); + } +} +function toNextRoute(type, url) { + uni[type]({ + url: url, + success: (result) => { - addUserBehavior({ intoRoute: url }) - } - }) + addUserBehavior({ + intoRoute: url + }) + } + }) } -function addUserBehavior (obj) { - - var pages = getCurrentPages() // 获取加载的页面 - let len = pages.length - if(len){ +function addUserBehavior(obj) { + + var pages = getCurrentPages() // 获取加载的页面 + let len = pages.length + if (len) { var currentPage = pages[len - 1] // 获取当前页面的对象 var nowRoute = '/' + currentPage.route // 当前页面url if (obj) { - obj.outtoRoute = (obj.outtoRoute === '' || obj.outtoRoute) ? obj.outtoRoute : nowRoute - obj.intoRoute = obj.intoRoute ? obj.intoRoute.split('?')[0] : '' + obj.outtoRoute = (obj.outtoRoute === '' || obj.outtoRoute) ? obj.outtoRoute : nowRoute + obj.intoRoute = obj.intoRoute ? obj.intoRoute.split('?')[0] : '' } else { - obj = {} - obj.outtoRoute = nowRoute - obj.intoRoute = len >1 ? '/' + pages[len - 2].route : '/pages/index/index' + obj = {} + obj.outtoRoute = nowRoute + obj.intoRoute = len > 1 ? '/' + pages[len - 2].route : '/pages/index/index' } - + } - - obj.visitChannels = store.state.visitChannels + + obj.visitChannels = store.state.visitChannels // request.$webGet('WeChat/AddUserBehaviorNew',obj).then(res => { - request.$webGet('WeChatPushAPI/Member/AddUserBehaviorNew',obj).then(res => { - // console.log(obj) - }) - } - - // 视频播放 -const EZUIPlayer = require('./ezuikit.js'); + request.$webGet('WeChatPushAPI/Member/AddUserBehaviorNew', obj).then(res => { + // console.log(obj) + }) +} +/* + 根据关键字获取相应的枚举选项，文档见 https://api.eshangtech.com/EShangApiMain/swagger/ui/index#!/FrameWork/FrameWork_GetFieldEnumByField + params:{FieldExplainField,FieldEnumStatus} + */ +async function getFieldEnumByField(params) { + if (!params.FieldExplainField) return null + // 缓存了上次请求的数据 如果字段一致 则直接返回缓存数据 否则请求 + // 可优化：根据有效期判断是否再次请求 + if (!this.dataMap) { + this.dataMap = {} + } + if (this.dataMap[params.FieldExplainField]) { + return this.dataMap[params.FieldExplainField] + } + const data = await request.$webGet('EShangApiMain/FrameWork/GetFieldEnumByField', params) + if (data.Result_Code == 100) { + let typeMap = {} + data.Result_Data.List.map(n => { + typeMap[n.value] = n.label + }) + this.dataMap[params.FieldExplainField] = typeMap + return typeMap + } + +} + +// 视频播放 +const EZUIPlayer = require('./ezuikit.js'); + function playVideo(opt) { - - return new EZUIPlayer(opt) - } + + return new EZUIPlayer(opt) +} export default { netChange, cutDate, fmoney, + changeStringToDate, toNextRoute, addUserBehavior, + getFieldEnumByField, // 获取枚举参数 // calculateDistance, // bMapToQQMap, playVideo -} \ No newline at end of file +} diff --git a/pages.json b/pages.json index 0a6cf48..f6af8d3 100644 --- a/pages.json +++ b/pages.json @@ -1,506 +1,599 @@ { - "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "驿行畅旅", - "enablePullDownRefresh": true - } - }, { - "path": "pages/userCenter/userCenter", - "style": { - "navigationBarTitleText": "个人中心" - } - }, { - "path": "pages/register/register", - "style": { - "navigationBarTitleText": "授权" - } - }, - { - "path": "pages/webview/webview", - "style": { - "navigationBarTitleText": "驿行畅旅" - } - } - // { - // "path": "pages/severpartVideo/severpartVideo", - // "style": { - // "navigationBarTitleText": "视频回放" - // } - // } - , { - "path": "pages/authorityApproval/index", - "style": { - "navigationBarTitleText": "权限审批", - "enablePullDownRefresh": true - - } - - }, { - "path": "pages/authorityApproval/detail", - "style": { - "navigationBarTitleText": "权限审批", - "enablePullDownRefresh": false - - } - - } - ], - "subPackages": [ - // { - // "root": "pages/additionalFeatures", - // "pages": [{ - // "path": "positionPunching", - // "style": { - // "enablePullDownRefresh": true, - // "navigationBarTitleText": "打卡" - // } - // }, { - // "path": "takePhoto", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - - // }] - // }, - { - "root": "pages/auditingPop", - "pages": [{ - "path": "jointlySign", - "style": { - "navigationBarTitleText": "会签" - } - }, { - "path": "transfer", - "style": { - "navigationBarTitleText": "移交" - } - }, { - "path": "toExamine", - "style": { - "navigationBarTitleText": "审核" - } - }, { - "path": "reject", - "style": { - "navigationBarTitleText": "驳回" - } - }] - }, - { - "root": "pages/operatingStatements", - "pages": [{ - "path": "index", - "style": { - "navigationBarTitleText": "经营报表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#647BD1", - "navigationBarTextStyle": "white" - } - - }, { - "path": "detail", - "style": { - "navigationBarTitleText": "经营报表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#647BD1", - "navigationBarTextStyle": "white" - } - - }, { - "path": "operatingTrend", - "style": { - "navigationBarTitleText": "经营趋势", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#647BD1", - "navigationBarTextStyle": "white" - } - - } - - ] - }, - { - "root": "pages/tender", - "pages": [{ - "path": "tender", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "招标投标" - } - }, { - "path": "tenderRecord", - "style": { - - "navigationBarTitleText": "招标备案详情" - } - }, { - "path": "tenderAlteration", - "style": { - - "navigationBarTitleText": "招标变更详情" - } - }, { - "path": "decisionRecord", - "style": { - - "navigationBarTitleText": "决标备案详情" - } - }, { - "path": "specialProjects", - "style": { - - "navigationBarTitleText": "专项工程详情", - "enablePullDownRefresh": false - } - } - - ] - }, - { - "root": "pages/mbwa", - "pages": [ - - { - "path": "mbwa", - "style": { - - "navigationBarTitleText": "走动式管理" - } - }, { - "path": "mbwaUnCheck", - "style": { - - "navigationBarTitleText": "未检点位" - } - }, { - "path": "mbwaDetail", - "style": { - - "navigationBarTitleText": "走动式管理" - } - }, { - "path": "mbwaUpload", - "style": { - - "navigationBarTitleText": "上传走动式管理" - } - } - ] - }, - { - "root": "pages/serviceAreaReimbursement", - "pages": [{ - "path": "serviceAreaReimbursement", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "服务区报销" - } - }, - { - "path": "detail", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "" - } - } - - ] - }, { - "root": "pages/dataSummary", - "pages": [{ - "path": "dataSummary", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "日结校验" - } - }, - { - "path": "dayDetail", - "style": { - "navigationBarBackgroundColor": "#EAEBEB", - "navigationBarTitleText": "日结校验" - } - }, - { - "path": "detail", - "style": { - - "navigationBarTitleText": "日结校验" - } - } - ] - }, - { - "root": "pages/askForLeave", - "pages": [{ - "path": "askForLeave", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "请假加班" - } - }, - { - "path": "detail", - "style": { - - "navigationBarTitleText": "请假详情" - } - }, - { - "path": "newLeave", - "style": { - - "navigationBarTitleText": "申请请假" - } - }, { - "path": "newLeave2", - "style": { - - "navigationBarTitleText": "申请请假" - } - } - ] - }, - { - "root": "pages/officialDocManagement", - "pages": [{ - "path": "officialDocManagement", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "公文阅办" - } - }, - { - "path": "detail", - "style": { - - "navigationBarTitleText": "公文阅办" - } - }, - { - "path": "readerList", - "style": { - - "navigationBarTitleText": "公文阅办" - } - }, { - "path": "circulate", - "style": { - - "navigationBarTitleText": "阅办记录" - } - } - ] - }, { - "root": "pages/businessApproval", - "pages": [{ - "path": "businessApproval", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "商品审批" - } - }, { - "path": "productDetail", - "style": { - "navigationBarTitleText": "商品审批" - } - }] - }, - { - "root": "pages/everdayRenven", - "pages": [{ - "path": "index", - "style": { - "enablePullDownRefresh": false, - // "navigationStyle":"custom", - // "navigationBarTextStyle":"white", - // "navigationBarBackgroundColor":"#3b64a3", - - "navigationBarTitleText": "每日营收汇总" - } - }, - { - "path": "detail", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "每日营收" - } - }, { - "path": "serviceIndex", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "服务区每日营收" - } - }, { - "path": "serviceDetail", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "服务区每日营收" - } - }, - { - "path": "AnhuiIndex", - "style": { - "navigationBarTitleText": "每日营收汇总", - "enablePullDownRefresh": false - } - }, { - "path": "AnhuiServerpart", - "style": { - "navigationBarTitleText": "服务区每日营收", - "enablePullDownRefresh": false - } - } - ] - }, { - "root": "pages/suggestion", - "pages": [{ - "path": "suggestion", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "投诉建议" - } - }, { - "path": "suggestionDetail", - "style": { - "navigationBarTitleText": "投诉建议" - } - }] - }, - { - "root": "pages/contract", - "pages": [{ - "path": "contract", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "合同审批" - } - }, { - "path": "detail", - "style": { - - "navigationBarTitleText": "合同审批" - } - }] - }, - { - "root": "pages/cashAudit", - "pages": [{ - "path": "list", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "收银稽核" - } - }, { - "path": "detail", - "style": { - - "navigationBarTitleText": "收银稽核详情" - } - }, { - "path": "check", - "style": { - - "navigationBarTitleText": "收银稽核反馈" - } - }] - }, - { - "root": "pages/investment", - "pages": [{ - "path": "investment", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "招商审批" - } - }, { - "path": "investmentDetail", - "style": { - "navigationBarTitleText": "招商审批" - } - }] - }, { - "root": "pages/publicity", - "pages": [{ - "path": "publicity", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "阳光公示" - } - }, { - "path": "publicityDetail", - "style": { - "navigationBarTitleText": "阳光公示" - } - } - - ] - }, - { - "root": "pages/expenseApproval", - "pages": [{ - "path": "expenseApproval", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "财务审批" - } - }, - { - "path": "expenseDetail", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "财务审批" - } - } - ] - }, - { - "root": "pages/commodity_temp", - "pages": [{ - "path": "index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "资质审批" - } - }, - { - "path": "detail", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "资质审批" - } - } - ] - } - - ], - - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#f9f9f9", - "backgroundColor": "#f9f9f9" - }, - "tabBar": { - "color": "#474647", - "selectedColor": "#3295f9", - "borderStyle": "black", - "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/index/index", - "iconPath": "static/images/tab/home.png", - "selectedIconPath": "static/images/tab/homeActive.png", - "text": "办公" - }, - { - "pagePath": "pages/userCenter/userCenter", - "iconPath": "static/images/tab/user.png", - "selectedIconPath": "static/images/tab/userActive.png", - "text": "我的" - } - ] - } + "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/index/index", + "style": + { + "navigationBarTitleText": "驿行畅旅", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/userCenter/userCenter", + "style": + { + "navigationBarTitleText": "个人中心" + } + }, + { + "path": "pages/register/register", + "style": + { + "navigationBarTitleText": "授权" + } + }, + { + "path": "pages/webview/webview", + "style": + { + "navigationBarTitleText": "驿行畅旅" + } + }, + { + "path": "pages/authorityApproval/index", + "style": + { + "navigationBarTitleText": "权限审批", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/authorityApproval/detail", + "style": + { + "navigationBarTitleText": "权限审批", + "enablePullDownRefresh": true + } + } + ], + "subPackages": [ //分包加载配置 + { + "root": "pages/auditingPop", + "pages": [ + { + "path": "jointlySign", + "style": + { + "navigationBarTitleText": "会签" + } + }, + { + "path": "transfer", + "style": + { + "navigationBarTitleText": "移交" + } + }, + { + "path": "toExamine", + "style": + { + "navigationBarTitleText": "审核" + } + }, + { + "path": "reject", + "style": + { + "navigationBarTitleText": "驳回" + } + } + ] + }, + { + "root": "pages/operatingStatements", + "pages": [ + { + "path": "index", + "style": + { + "navigationBarTitleText": "经营报表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#647BD1", + "navigationBarTextStyle": "white" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "经营报表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#647BD1", + "navigationBarTextStyle": "white" + } + }, + { + "path": "operatingTrend", + "style": + { + "navigationBarTitleText": "经营趋势", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#647BD1", + "navigationBarTextStyle": "white" + } + } + ] + }, + { + "root": "pages/tender", + "pages": [ + { + "path": "tender", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "招标投标" + } + }, + { + "path": "tenderRecord", + "style": + { + "navigationBarTitleText": "招标备案详情" + } + }, + { + "path": "tenderAlteration", + "style": + { + "navigationBarTitleText": "招标变更详情" + } + }, + { + "path": "decisionRecord", + "style": + { + "navigationBarTitleText": "决标备案详情" + } + }, + { + "path": "specialProjects", + "style": + { + "navigationBarTitleText": "专项工程详情", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/mbwa", + "pages": [ + { + "path": "mbwa", + "style": + { + "navigationBarTitleText": "走动式管理" + } + }, + { + "path": "mbwaUnCheck", + "style": + { + "navigationBarTitleText": "未检点位" + } + }, + { + "path": "mbwaDetail", + "style": + { + "navigationBarTitleText": "走动式管理" + } + }, + { + "path": "mbwaUpload", + "style": + { + "navigationBarTitleText": "上传走动式管理" + } + } + ] + }, + { + "root": "pages/serviceAreaReimbursement", + "pages": [ + { + "path": "serviceAreaReimbursement", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "服务区报销" + } + }, + { + "path": "detail", + "style": + { + "enablePullDownRefresh": false, + "navigationBarTitleText": "" + } + } + ] + }, + { + "root": "pages/dataSummary", + "pages": [ + { + "path": "dataSummary", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "日结校验" + } + }, + { + "path": "dayDetail", + "style": + { + "navigationBarBackgroundColor": "#EAEBEB", + "navigationBarTitleText": "日结校验" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "日结校验" + } + } + ] + }, + { + "root": "pages/askForLeave", + "pages": [ + { + "path": "askForLeave", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "请假加班" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "请假详情" + } + }, + { + "path": "newLeave", + "style": + { + "navigationBarTitleText": "申请请假" + } + }, + { + "path": "newLeave2", + "style": + { + "navigationBarTitleText": "申请请假" + } + } + ] + }, + { + "root": "pages/officialDocManagement", + "pages": [ + { + "path": "officialDocManagement", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "公文阅办" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "公文阅办" + } + }, + { + "path": "readerList", + "style": + { + "navigationBarTitleText": "公文阅办" + } + }, + { + "path": "circulate", + "style": + { + "navigationBarTitleText": "阅办记录" + } + } + ] + }, + { + "root": "pages/businessApproval", + "pages": [ + { + "path": "businessApproval", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "商品审批" + } + }, + { + "path": "productDetail", + "style": + { + "navigationBarTitleText": "商品审批" + } + } + ] + }, + { + "root": "pages/everdayRenven", + "pages": [ + { + "path": "index", + "style": + { + "enablePullDownRefresh": false, + "navigationBarTitleText": "每日营收汇总" + } + }, + { + "path": "detail", + "style": + { + "enablePullDownRefresh": false, + "navigationBarTitleText": "每日营收" + } + }, + { + "path": "serviceIndex", + "style": + { + "enablePullDownRefresh": false, + "navigationBarTitleText": "服务区每日营收" + } + }, + { + "path": "serviceDetail", + "style": + { + "enablePullDownRefresh": false, + "navigationBarTitleText": "服务区每日营收" + } + }, + { + "path": "AnhuiIndex", + "style": + { + "navigationBarTitleText": "每日营收汇总", + "enablePullDownRefresh": false + } + }, + { + "path": "AnhuiServerpart", + "style": + { + "navigationBarTitleText": "服务区每日营收", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/suggestion", + "pages": [ + { + "path": "suggestion", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "投诉建议" + } + }, + { + "path": "suggestionDetail", + "style": + { + "navigationBarTitleText": "投诉建议" + } + } + ] + }, + { + "root": "pages/contract", + "pages": [ + { + "path": "contract", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "合同审批" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "合同审批" + } + } + ] + }, + { + "root": "pages/cashAudit", + "pages": [ + { + "path": "list", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "收银稽核" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "收银稽核详情" + } + }, + { + "path": "check", + "style": + { + "navigationBarTitleText": "收银稽核反馈" + } + } + ] + }, + { + "root": "pages/investment", + "pages": [ + { + "path": "investment", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "招商审批" + } + }, + { + "path": "investmentDetail", + "style": + { + "navigationBarTitleText": "招商审批" + } + } + ] + }, + { + "root": "pages/publicity", + "pages": [ + { + "path": "publicity", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "阳光公示" + } + }, + { + "path": "publicityDetail", + "style": + { + "navigationBarTitleText": "阳光公示" + } + } + ] + }, + { + "root": "pages/expenseApproval", + "pages": [ + { + "path": "expenseApproval", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "财务审批" + } + }, + { + "path": "expenseDetail", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "财务审批" + } + } + ] + }, + { + "root": "pages/commodity_temp", + "pages": [ + { + "path": "index", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "资质审批" + } + }, + { + "path": "detail", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "资质审批" + } + } + ] + }, + { + "root": "pages/autoTest/serverpartshoptotalsummary", + "pages": [ + { + "path": "index", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "业主门店数量汇总" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "业主门店数量汇总详情" + } + } + ] + }, + { + "root": "pages/autoTest/shopmobilesummary", + "pages": [ + { + "path": "index", + "style": + { + "enablePullDownRefresh": true, + "navigationBarTitleText": "门店移动支付汇总" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "门店移动支付汇总详情" + } + } + ] + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#f9f9f9", + "backgroundColor": "#f9f9f9" + }, + "tabBar": { + "color": "#474647", + "selectedColor": "#3295f9", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "list": [ + { + "pagePath": "pages/index/index", + "iconPath": "static/images/tab/home.png", + "selectedIconPath": "static/images/tab/homeActive.png", + "text": "办公" + }, + { + "pagePath": "pages/userCenter/userCenter", + "iconPath": "static/images/tab/user.png", + "selectedIconPath": "static/images/tab/userActive.png", + "text": "我的" + } + ] + } } diff --git a/pages/autoTest/serverpartshoptotalsummary/components/listUnit.vue b/pages/autoTest/serverpartshoptotalsummary/components/listUnit.vue new file mode 100644 index 0000000..eb53a33 --- /dev/null +++ b/pages/autoTest/serverpartshoptotalsummary/components/listUnit.vue @@ -0,0 +1,92 @@ + + + + diff --git a/pages/autoTest/serverpartshoptotalsummary/detail.vue b/pages/autoTest/serverpartshoptotalsummary/detail.vue new file mode 100644 index 0000000..a6fc0e4 --- /dev/null +++ b/pages/autoTest/serverpartshoptotalsummary/detail.vue @@ -0,0 +1,203 @@ + + + diff --git a/pages/autoTest/serverpartshoptotalsummary/index.vue b/pages/autoTest/serverpartshoptotalsummary/index.vue new file mode 100644 index 0000000..4006dbb --- /dev/null +++ b/pages/autoTest/serverpartshoptotalsummary/index.vue @@ -0,0 +1,391 @@ + + + diff --git a/pages/autoTest/shopmobilesummary/components/listUnit.vue b/pages/autoTest/shopmobilesummary/components/listUnit.vue new file mode 100644 index 0000000..be5e906 --- /dev/null +++ b/pages/autoTest/shopmobilesummary/components/listUnit.vue @@ -0,0 +1,119 @@ + + + + diff --git a/pages/autoTest/shopmobilesummary/detail.vue b/pages/autoTest/shopmobilesummary/detail.vue new file mode 100644 index 0000000..38b9ec1 --- /dev/null +++ b/pages/autoTest/shopmobilesummary/detail.vue @@ -0,0 +1,191 @@ + + + diff --git a/pages/autoTest/shopmobilesummary/index.vue b/pages/autoTest/shopmobilesummary/index.vue new file mode 100644 index 0000000..d3beeb2 --- /dev/null +++ b/pages/autoTest/shopmobilesummary/index.vue @@ -0,0 +1,451 @@ + + + diff --git a/pages/index/components/menus.js b/pages/index/components/menus.js index d913e7e..1cae0b2 100644 --- a/pages/index/components/menus.js +++ b/pages/index/components/menus.js @@ -96,6 +96,14 @@ const scene = [{ "imagePath": "/static/images/index/syjh.png", "noImagePath": "/static/images/index/syjh-no.png", "homeUrl": "/pages/cashAudit/list" + }, + { + "name": "稽核异常", + "id": "b548740f-a942-4de3-8d55-c0a2370171ba", + "modelName": "abnormalaudit", + "imagePath": "/static/images/index/syjh.png", + "noImagePath": "/static/images/index/syjh-no.png", + "homeUrl": "/pages/abnormalaudit/index" }, { "name": "设备巡检", "id": "", diff --git a/pages/index/index.vue b/pages/index/index.vue index 188a62e..7244e5a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -7,7 +7,7 @@ :key="item.id" :item ="item" :doCout="toDoMsg ? toDoMsg[item.id] : 0" - :active="item.id==1 || menus[item.id]==1" + :active="item.id=='d5a9e3ef-3699-448f-abcc-819179df60bd' || menus[item.id]==1 || this.membershipType === 9999" @handleClick="toPage" > @@ -126,8 +126,8 @@ export default { data() { return { - modelMenu: modelMenu, - + modelMenu: null, + membershipType: null } }, components:{ @@ -135,7 +135,7 @@ menuItem }, onLoad() { - + this.loadMenuSetting() }, computed: { ...mapState({ @@ -144,7 +144,8 @@ UserId: state.userData.UserId, UserName: state.userData.UserName, Membership_Phone: state.userData.Membership_Phone, - Membership_Id: state.userData.Membership_Id + Membership_Id: state.userData.Membership_Id, + Membership_Type: state.userData.Membership_Type } }, toDoMsg: (state)=>{ @@ -175,14 +176,13 @@ _this.$util.toNextRoute('navigateTo', "/pages/mbwa/mbwaUpload?mbwaID=" + mbwaId) } else if (res.result.indexOf("http") > -1) { - _this.$util.toNextRoute('navigateTo', "/pages/webview/webview?src=" + encodeURIComponent(res.result)) - + _this.$util.toNextRoute('navigateTo', "/pages/webview/webview?src=" + + encodeURIComponent(res.result)) } else { let invoice = res.result.split(",") // console.log(invoice.length) if (invoice.length == 9) { _this.$util.toNextRoute('navigateTo', "/pages/invoice/invoice?invoice=" + invoice) - } else { uni.showModal({ title: "温馨提示", @@ -194,7 +194,6 @@ } } else if (res.scanType.indexOf("EAN_13") > -1) { this.$util.toNextRoute('navigateTo', "/pages/commodtity/commodtity?commodtity=" + res.result) - } else { uni.showModal({ title: "温馨提示", @@ -210,15 +209,14 @@ recordBrowsing(item) { // 点击业务模块事件 let _this = this if (!item.id) { - uni.showModal({ title: ' 温馨提示', content: '该模块正在开发，尽请期待', - }) - } else if (_this.menus && _this.menus[item.id] == 1) { // 记录用户访问业务事件 + } else if (_this.menus && (_this.menus[item.id] == 1 || + this.user.Membership_Type === 9999)) { // 记录用户访问业务事件 this.$util.toNextRoute('navigateTo', item.homeUrl) - } else { + } else if (this.user.Membership_Type !== 9999) { uni.showToast({ title: '您没有该模块权限', icon: 'none' @@ -236,16 +234,12 @@ success(res) { if (res.confirm) { _this.$util.toNextRoute('navigateTo', '/pages/register/register') - } - } }) - }else if(item.id==1) { // 如果是扫一扫功能 - + }else if(item.id=='d5a9e3ef-3699-448f-abcc-819179df60bd') { // 如果是扫一扫功能 this.scanCode() - } else if (this.user.UserId == '') { uni.showModal({ title: ' 温馨提示', @@ -253,33 +247,35 @@ success(res) { if (res.confirm) { _this.$util.toNextRoute('navigateTo', '/pages/bindingBack/bindingBack') - } - } }) } else { this.recordBrowsing(item) } }, - + async loadMenuSetting(){ //加载首页菜单配置 + this.membershipType = this.user.Membership_Type + let res = await this.$request.$webGet("EShangApiMain/APPManage/GetWeChatAppletMenuList",{ + ModuleStatus: this.membershipType === 9999 ? '1,2' : '1', + AppletMenuStatus: this.membershipType === 9999 ? '1,2' : '1' + }) + this.modelMenu = res.Result_Data.List + } }, onReady() { }, onShow() { - }, onPullDownRefresh() { let _this = this this.updateUser() - + this.loadMenuSetting() setTimeout(function() { uni.stopPullDownRefresh() - }, 1000) }, onTabItemTap(e) { - this.$util.addUserBehavior({ outtoRoute: '/pages/index/index', intoRoute: '/pages/userCenter/userCenter' @@ -287,7 +283,6 @@ } } -