From 9fd647f1f5aece26e8f49dc4ccdefc1044d016c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=9F=E5=B7=9D=E4=B8=9C?= Date: Fri, 9 May 2025 15:06:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/me-icon/me-icon.css | 39 +++--- components/me-icon/me-icon.ttf | Bin 5108 -> 4804 bytes pages/workbench/workbench.vue | 181 +++++++++++++++++++++------- svg_icons/money-cny-circle-line.svg | 1 + 4 files changed, 162 insertions(+), 59 deletions(-) create mode 100644 svg_icons/money-cny-circle-line.svg diff --git a/components/me-icon/me-icon.css b/components/me-icon/me-icon.css index 3253af6..d3230f8 100644 --- a/components/me-icon/me-icon.css +++ b/components/me-icon/me-icon.css @@ -1,54 +1,57 @@ -.icon-arrow-right-circle:before { +.icon-progress-2-line:before { content: "\e900"; } -.icon-arrow-right:before { +.icon-money-cny-circle-line:before { content: "\e901"; } -.icon-arrow-up-line:before { +.icon-user:before { content: "\e902"; } -.icon-call:before { +.icon-upload-cloud-fill:before { content: "\e903"; } -.icon-checkbox-blank-circle:before { +.icon-time:before { content: "\e904"; } -.icon-checkbox-circle:before { +.icon-reset-left-line:before { content: "\e905"; } -.icon-close-circle-fill:before { +.icon-reset-left-fill:before { content: "\e906"; } -.icon-flashlight:before { +.icon-navigation:before { content: "\e907"; } -.icon-info:before { +.icon-logout:before { content: "\e908"; } -.icon-logout:before { +.icon-info:before { content: "\e909"; } -.icon-navigation:before { +.icon-flashlight:before { content: "\e90a"; } -.icon-progress-2-line:before { +.icon-edit-line:before { content: "\e90b"; } -.icon-reset-left-fill:before { +.icon-close-circle-fill:before { content: "\e90c"; } -.icon-reset-left-line:before { +.icon-checkbox-circle:before { content: "\e90d"; } -.icon-time:before { +.icon-checkbox-blank-circle:before { content: "\e90e"; } -.icon-upload-cloud-fill:before { +.icon-call:before { content: "\e90f"; } -.icon-user:before { +.icon-arrow-up-line:before { content: "\e910"; } -.icon-edit-line:before { +.icon-arrow-right:before { content: "\e911"; } +.icon-arrow-right-circle:before { + content: "\e912"; +} diff --git a/components/me-icon/me-icon.ttf b/components/me-icon/me-icon.ttf index 2a36596946ff6298223752beaa2a452b46e4521c..8bdf38cbdcff436cfa518ce4df5a93a4f50615ba 100644 GIT binary patch delta 894 zcmXw2ZAep57(VCRFLm0y`|yIBka#(@}M&<|7arKs3gpsW`Hu z_kec+S5HM_Ba0oye-V=50C+Awok+q#Axujwk2r4Yel~zj5AZo`qMbNF$BJJYLGdrk zt#DcJI*!iM66rAZ&~0p+FuSb|tHa~)xLJ4l6rUn7ilDHrCp1;n61pDl?b4H~rm0E2 ztGC_nAFx3T`2Fo|0e?SR_xl4^)9GM3ou2AD8R=_{Or@<%t%vh2nx-Xaw8&CjX|q+b zy1Yjvb_F5ogP@PJ_66$^qCZRLX>aL0x@gGKFC|%eq~tl3ibHh1C`sQ+>-3g%s$%~# z58*NqbRR7sWLBGeP4sJ-eb%9Bl4zAJN`)IZuSafnHaqJI%~9vjBoGvul}VulWbWEy z82Bn|QJ}cc+!ZG<*!Zv)2Cv8KIk0QM;0a!$q+qKXJ6EuaBOD=gu3Rb0ZB|(zs>m|T z)F|5n@?J=mi8I&E6M`XNWNIkM2m;UJ7l0WL8B8*qz=G#ZxuFz(lH%%^M;RFIh4ziH zi{2==pUG{4>9Tw@*T(aL@F;%(4h#;qV73s9&Zl6Vf&B^Ly}7|_U<_Y-SG-MI#1C{q zc)B{l)ezdkHPRW9rEBA7^{i!b~S+A6Dp+9Hv>Br@OMj za})i+emsY_NE>-fHaL;H!rkFV`DLM0xFjaUyW+N_=iirt*3rHtq2JBs)o#->{2y8E B!yNzs delta 1267 zcmaJ=O-vI(6rP{XE^Q6%!nRG!sz9Ml#31f=yULHk%^#G5hLHG2g9sQZO@N3O+l$5s z2XTzb%>%?lJZK2U7>SJ`#si`;60aUKF~*aTL?f-fDYj5BowwV!@0;&^@6BswuIfiH zjxa*Vi4usS+Sa2xbyta02FNpbJ36D0n6K^K9fYt3@v-j6Kn%PaV&RLr`!1fHte@2vGu1_TLbviNxTuL=mS1s29^^C92|k18Ig=jqL+mMV z4)6ur1-?YD^Ikd{X9)dC(tesmE$ANliZ|nv&_c)zTRAhrhVIjS-mH1NTd*oi)wseR z2h@*G%KzfEUzKak012qU0Cv{ zJ}8ni9l8lyxN7}0*4KpN6sig1qzzasLP$NK1Ri1V03vWz)kZQg5C9VpkOf_k2py3b zON}S^9=jG#C<#!XYbq=)fvXGYrWaS*0G*6rzA8~A0f>$=B9uwY7Ej;$ z4~oyFzD*UXG*ze&Muk$7aFo@?>NZY~F*%uDUZregC=@Bmq8OjHxH6a&0#B~yCkaAb zexuK2d;VWV2}?K0_IwthHk|bES-U3QD!5PLE+e#k$kBV+)v$z|woLq~xn{5U5T5UL zTiDBE?sh)!cA5$F5&a|%(m`HOi3aF3I!C|T+HDV+o5k1@mX^OjqR{o?QwT0GEW#g^ KlumC`Ch=dwyTM`r diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue index f034cd1..fbec36b 100644 --- a/pages/workbench/workbench.vue +++ b/pages/workbench/workbench.vue @@ -17,26 +17,22 @@ - - - {{item.order_info.item_title}} - 上门报价 - 平台已收款 - - - - - {{item.order_info.address}} - - - {{helpers.removeCommas(item.order_info.area.merge_name)}} - - - - {{helpers.formatDate(item.plan_time)}} - + + + + + {{helpers.formatDate(item.plan_time)}} + 未预约时间 - + {{getOrderStatusText(item.status)}} + + {{item.order_info.item_title}} + + + {{item.order_info.address}} + {{helpers.removeCommas(item.order_info.area.merge_name)}} + + @@ -44,30 +40,22 @@ {{formatDistance(item.order_info.lat, item.order_info.lng)}} - - - - - {{ item.order_info.customer }} - - {{ item.order_info.tel }} - - - - - + + + + {{ item.order_info.customer }} + {{ item.order_info.tel }} - - - {{getOrderStatusText(item.status)}} + + + 上门报价 + 平台已收款 - - - - 上报异常 - + + + 联系客户 @@ -158,7 +146,7 @@ const countWorkbenchOrder = () => { } const countOrderByType = (type) => { - if (Object.keys(countOrder.value).length === 0) { + if (Object.keys(countOrder.value).length === 0 || countOrder.value[type] === 0) { return '' } @@ -267,9 +255,120 @@ const filterNeedVisit = (type) => { box-sizing: border-box; .list { transition: transform 0.3s ease; - .order-item:first-child { + .item:first-child { margin-top: 0!important; } + .item { + width: 686rpx; + background: var(--containerBgColor); + border-radius: 16rpx; + padding: 20rpx; + box-sizing: border-box; + margin-top: 20rpx; + .top { + width: 100%; + height: 80rpx; + .time { + width: 456rpx; + height: 80rpx; + .time-text { + font-weight: 500; + font-size: 34rpx; + color: var(--themeColor); + margin-left: 8rpx; + } + } + .status { + width: 190rpx; + height: 80rpx; + font-weight: 500; + font-size: 34rpx; + color: #E18F00; + } + } + .title { + width: 100%; + min-height: 60rpx; + line-height: 48rpx; + font-weight: 500; + font-size: 30rpx; + color: var(--titleColor); + } + .address-ctr { + width: 100%; + .left { + width: 466rpx; + .detail, .area { + width: 100%; + min-height: 60rpx; + line-height: 44rpx; + font-size: 28rpx; + } + .detail { + color: var(--titleColor); + } + .area { + color: var(--summaryColor); + } + } + .right { + width: 180rpx; + .icon-ctr { + height: 60rpx; + width: 100% + } + .distance { + width: 100%; + min-height: 44rpx; + line-height: 44rpx; + font-size: 28rpx; + color: var(--titleColor); + margin-top: 16rpx; + } + } + } + .user-ctr { + width: 646rpx; + height: 90rpx; + background: var(--auxiliaryBgColor); + border-radius: 16rpx; + padding: 20rpx; + box-sizing: border-box; + margin-top: 10rpx; + .user-name { + width: 50%; + .name, { + font-size: 28rpx; + color: var(--titleColor); + margin-left: 8rpx; + } + } + .phone { + width: 50%; + font-size: 28rpx; + color: var(--titleColor); + } + } + .operate-ctr { + width: 100%; + height: 80rpx; + margin-top: 20rpx; + .left, .right { + width: 50%; + font-weight: 500; + font-size: 30rpx; + .name { + margin-left: 8rpx; + } + } + .left { + color: var(--summaryColor); + } + .right { + color: var(--themeColor); + } + } + } } .fixed-top { position: fixed; diff --git a/svg_icons/money-cny-circle-line.svg b/svg_icons/money-cny-circle-line.svg new file mode 100644 index 0000000..4493d42 --- /dev/null +++ b/svg_icons/money-cny-circle-line.svg @@ -0,0 +1 @@ + \ No newline at end of file