From 529bed78e6c31f40fdc72737282dab6a37d22a2d Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Fri, 25 Mar 2022 13:27:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=9F=E8=AE=A1=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/cmd-progress/cmd-progress.vue | 16 +++++++++------- pages/tabbar/my/my.vue | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/cmd-progress/cmd-progress.vue b/components/cmd-progress/cmd-progress.vue index 5cc9813..8ddba98 100644 --- a/components/cmd-progress/cmd-progress.vue +++ b/components/cmd-progress/cmd-progress.vue @@ -18,20 +18,22 @@ - + {{setFormat}} - + --> + {{setFormat}} - + + {{setFormat}} @@ -64,7 +66,8 @@ - + + {{setFormat}} @@ -311,8 +314,7 @@ // 完成进度 if (this.status == 'success' || this.setProgress >= 100) { currentColor = this.strokeColor || '#52c41a' - svgToBase = - `data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='64 64 896 896' data-icon='check' width='1em' height='1em' fill='${escape(currentColor)}' aria-hidden='true'%3E %3Cpath d='M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z'%3E%3C/path%3E %3C/svg%3E`; + // svgToBase = `data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='64 64 896 896' data-icon='check' width='1em' height='1em' fill='${escape(currentColor)}' aria-hidden='true'%3E %3Cpath d='M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z'%3E%3C/path%3E %3C/svg%3E`; } return `background-image: url("${svgToBase}"); background-size: cover; diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue index d03f410..bac7a82 100644 --- a/pages/tabbar/my/my.vue +++ b/pages/tabbar/my/my.vue @@ -34,7 +34,7 @@ - + {{item.title}} @@ -73,7 +73,7 @@ {imgsrc:'/static/public/icon-my-notEvaluated.png',title:'未评价',num:0}, ], percentageList:[ - {title:'预约及时率',num:89}, + {title:'预约及时率',num:100}, {title:'上门准时率',num:60}, {title:'项目报修率',num:40}, ], From 56aed02bbd60dee7ce6ddb7a5a6831cb17f8be4f Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Fri, 25 Mar 2022 16:58:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=8A=E4=B8=AD=E6=96=87=E5=90=8D?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=94=B9=E4=B8=BA=E8=8B=B1=E6=96=87=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- manifest.json | 27 +++++++++--------- pages/appreciationServe/appreciationServe.vue | 4 +-- pages/dataQuery/projectDetails.vue | 6 ++-- pages/dataQuery/projectQuery.vue | 6 ++-- pages/mountingsList/mountingsList.vue | 2 +- pages/project/details.vue | 6 ++-- pages/project/projectList.vue | 2 +- pages/workOrder/details.vue | 14 ++++----- pages/workOrder/workOrder.vue | 4 +-- pages/workOrder/workOrderLlsit.vue | 6 ++-- pages/workOrder/workorderTwo.vue | 8 +++--- pagesB/new-product/new-product.vue | 2 +- ...{QQ截图20220210213041.png => img001.png} | Bin .../del/{接收卡-图片.png => img002.png} | Bin ...图片_20220113152400.png => img003.png} | Bin static/del/{项目图片.png => img004.png} | Bin 17 files changed, 44 insertions(+), 45 deletions(-) rename static/del/{QQ截图20220210213041.png => img001.png} (100%) rename static/del/{接收卡-图片.png => img002.png} (100%) rename static/del/{微信图片_20220113152400.png => img003.png} (100%) rename static/del/{项目图片.png => img004.png} (100%) diff --git a/App.vue b/App.vue index 933c09e..723d7d5 100644 --- a/App.vue +++ b/App.vue @@ -20,7 +20,7 @@ }, onShow: function() { if(uni.getStorageSync('phone_active')){ - // 刷新token + // 刷新token this.$toolAll.tools.refreshToken(); } }, diff --git a/manifest.json b/manifest.json index 8e3e06c..d5d3dd3 100644 --- a/manifest.json +++ b/manifest.json @@ -85,20 +85,19 @@ "sdkConfigs" : { "maps" : {} }, - "devServer" : { - "https" : false, - "proxy": { - "/web": { - "target": "http://maintain.7and5.cn", - "changeOrigin": true, - "secure": false, - "pathRewrite": { - "^/web": "" - } - } - } - } - + "devServer" : { + "https" : false, + "proxy" : { + "/web" : { + "target" : "http://maintain.7and5.cn", + "changeOrigin" : true, + "secure" : false, + "pathRewrite" : { + "^/web" : "" + } + } + } + } }, "mp-baidu" : { "appid" : "24346353" diff --git a/pages/appreciationServe/appreciationServe.vue b/pages/appreciationServe/appreciationServe.vue index a0c97ef..159c907 100644 --- a/pages/appreciationServe/appreciationServe.vue +++ b/pages/appreciationServe/appreciationServe.vue @@ -67,8 +67,8 @@ 现场图片 - - + + diff --git a/pages/dataQuery/projectDetails.vue b/pages/dataQuery/projectDetails.vue index bab24f6..35d5797 100644 --- a/pages/dataQuery/projectDetails.vue +++ b/pages/dataQuery/projectDetails.vue @@ -9,17 +9,17 @@ > - + - + - + diff --git a/pages/dataQuery/projectQuery.vue b/pages/dataQuery/projectQuery.vue index 85c0d39..4578b29 100644 --- a/pages/dataQuery/projectQuery.vue +++ b/pages/dataQuery/projectQuery.vue @@ -5,7 +5,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/pages/mountingsList/mountingsList.vue b/pages/mountingsList/mountingsList.vue index 61f4943..8c85160 100644 --- a/pages/mountingsList/mountingsList.vue +++ b/pages/mountingsList/mountingsList.vue @@ -13,7 +13,7 @@ - + diff --git a/pages/project/details.vue b/pages/project/details.vue index 586286e..b4f248f 100644 --- a/pages/project/details.vue +++ b/pages/project/details.vue @@ -9,17 +9,17 @@ :duration="duration"> - + - + - + diff --git a/pages/project/projectList.vue b/pages/project/projectList.vue index c25adc4..19c5038 100644 --- a/pages/project/projectList.vue +++ b/pages/project/projectList.vue @@ -29,7 +29,7 @@ - + 湖南工业大学化工学院会议室P2.5全彩LED显示屏 diff --git a/pages/workOrder/details.vue b/pages/workOrder/details.vue index 49a45c1..e769831 100644 --- a/pages/workOrder/details.vue +++ b/pages/workOrder/details.vue @@ -83,9 +83,9 @@ - + - + @@ -228,9 +228,9 @@ - - @@ -268,7 +268,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -316,7 +316,7 @@ - + diff --git a/pages/workOrder/workOrder.vue b/pages/workOrder/workOrder.vue index 59c8408..d7caef7 100644 --- a/pages/workOrder/workOrder.vue +++ b/pages/workOrder/workOrder.vue @@ -96,8 +96,8 @@ - - + + diff --git a/pages/workOrder/workOrderLlsit.vue b/pages/workOrder/workOrderLlsit.vue index 384160a..b7df2a2 100644 --- a/pages/workOrder/workOrderLlsit.vue +++ b/pages/workOrder/workOrderLlsit.vue @@ -45,7 +45,7 @@ 工单编号：222226666558 - + @@ -98,7 +98,7 @@ 工单编号：222226666558 - + @@ -151,7 +151,7 @@ 工单编号：222226666558 - + diff --git a/pages/workOrder/workorderTwo.vue b/pages/workOrder/workorderTwo.vue index c56234b..233fcc6 100644 --- a/pages/workOrder/workorderTwo.vue +++ b/pages/workOrder/workorderTwo.vue @@ -97,8 +97,8 @@ - - + + @@ -201,8 +201,8 @@ - - + + diff --git a/pagesB/new-product/new-product.vue b/pagesB/new-product/new-product.vue index da5b0ce..a9efde2 100644 --- a/pagesB/new-product/new-product.vue +++ b/pagesB/new-product/new-product.vue @@ -4,7 +4,7 @@ - + 智能会议平板交互电子白板会议一体机视 频会议多媒体教学培训 diff --git a/static/del/QQ截图20220210213041.png b/static/del/img001.png similarity index 100% rename from static/del/QQ截图20220210213041.png rename to static/del/img001.png diff --git a/static/del/接收卡-图片.png b/static/del/img002.png similarity index 100% rename from static/del/接收卡-图片.png rename to static/del/img002.png diff --git a/static/del/微信图片_20220113152400.png b/static/del/img003.png similarity index 100% rename from static/del/微信图片_20220113152400.png rename to static/del/img003.png diff --git a/static/del/项目图片.png b/static/del/img004.png similarity index 100% rename from static/del/项目图片.png rename to static/del/img004.png