diff --git a/package-lock.json b/package-lock.json index 6ca7375..48e341a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,49 +1,3 @@ { - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "base64-arraybuffer": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz", - "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==" - }, - "css-line-break": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz", - "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==", - "requires": { - "utrie": "^1.0.2" - } - }, - "html2canvas": { - "version": "1.4.1", - "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz", - "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==", - "requires": { - "css-line-break": "^2.1.0", - "text-segmentation": "^1.0.3" - } - }, - "text-segmentation": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz", - "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==", - "requires": { - "utrie": "^1.0.2" - } - }, - "utrie": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz", - "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==", - "requires": { - "base64-arraybuffer": "^1.0.2" - } - }, - "wxml2canvas": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/wxml2canvas/-/wxml2canvas-1.0.1.tgz", - "integrity": "sha512-AdWvxgTjJtW/m6Cki1cwGO0HOERKU8O9V3RcCz8UyqJbrPF7e8Nv27/epYiIs64HlbPTKWTLl7ECjQi6UVducA==" - } - } + "lockfileVersion": 1 } diff --git a/package.json b/package.json index 7a211ff..e65964d 100644 --- a/package.json +++ b/package.json @@ -92,5 +92,6 @@ } } } - } + }, + "dependencies": {} } diff --git a/pages/index/index.vue b/pages/index/index.vue index 58de1f5..13543ce 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -89,8 +89,6 @@ - - 实时统计 @@ -213,6 +211,22 @@ + + + 今日接待 + + + {{realtimeobj.receptionCount+realtimeobj.receivingCustomer || 0}} + 接待次数 + + + {{realtimeobj.tagCustomer || 0}} + 未标顾问 + + + 我知道了 + + @@ -232,6 +246,7 @@ data() { return { + modalShow: false, id: "", isShowUpdate: false, tit: "", @@ -501,9 +516,14 @@ //获取权限 getMenu() { this.$u.get("/user/getMenu").then(data => { + console.log(data) uni.setStorageSync("weapp_session_Menu_data", data) this.Menulist = uni.getStorageSync('weapp_session_Menu_data'); - // console.log(this.Menulist, 'adasdasds123') + if (this.Menulist.findIndex(item => item.name == '今日接待弹框') != -1) { + this.modalShow = true + } else { + this.modalShow = false + } }) }, //自定义时间 @@ -574,15 +594,15 @@ return } else { this.realtimeobj = { - sumCustomer: data.data.data.sumCustomer, - receivingCustomer: data.data.data.receivingCustomer, - activeCustomer: data.data.data.activeCustomer, - prohibitedCustomer: data.data.data.prohibitedCustomer, + sumCustomer: data.data.data.sumCustomer||0, + receivingCustomer: data.data.data.receivingCustomer||0, + activeCustomer: data.data.data.activeCustomer||0, + prohibitedCustomer: data.data.data.prohibitedCustomer||0, avgDuration: Math.floor(data.data.data.avgDuration / 60) || 0, - tagCustomer: data.data.data.tagCustomer, - fraction: data.data.data.fraction, - wordFinishFraction: data.data.data.wordFinishFraction, - receptionCount: data.data.data.receptionCount + tagCustomer: data.data.data.tagCustomer||0, + fraction: data.data.data.fraction||0, + wordFinishFraction: data.data.data.wordFinishFraction||0, + receptionCount: data.data.data.receptionCount||0 } } }, @@ -845,6 +865,61 @@