From 3cda6b41be67209cafcb1322234289fa819e962b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Thu, 8 Jul 2021 17:34:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=B0=86=E6=89=80?= =?UTF-8?q?=E6=9C=89=E9=A1=B5=E9=9D=A2=E6=8D=A2=E6=88=90=E5=92=8Cui?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E5=9B=BE=E6=A0=87=20[=E5=AE=8C?= =?UTF-8?q?=E5=96=84]=20=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=20[=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]=20=E5=A4=9A=E4=B8=AA=E9=A1=B5=E9=9D=A2UI=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20[=E6=96=B0=E5=A2=9E]=20=E9=80=80=E6=AC=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2UI=20[=E6=96=B0=E5=A2=9E]=20?= =?UTF-8?q?=E9=98=BF=E9=87=8C=E5=AD=97=E4=BD=93=E5=9B=BE=E6=A0=87=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + common/styles/iconfont.css | 42 +++ common/styles/theme.css | 12 +- components/lf-waterfall/lf-waterfall.vue | 12 +- pages.json | 27 +- pages/channel/index.vue | 45 +++- pages/collect/index.vue | 8 +- pages/goodsDetail/index.vue | 9 +- pages/index/index.vue | 46 ++-- pages/message/index.vue | 12 +- pages/order/apply_refund.vue | 16 +- pages/order/confirm_order.vue | 11 +- pages/order/order.vue | 4 +- pages/order/order_details.vue | 26 +- pages/order/refund_detail.vue | 241 ++++++++++++++++++ pages/order/unpay_details.vue | 10 - pages/payState/paystate.vue | 6 +- pages/user/user.vue | 43 +++- static/center/about.png | Bin 0 -> 1781 bytes static/center/collect-active.png | Bin 1471 -> 986 bytes static/center/collect.png | Bin 2470 -> 1622 bytes static/center/feedback.png | Bin 0 -> 1460 bytes static/center/home.png | Bin 2295 -> 0 bytes static/center/loginout.png | Bin 2304 -> 0 bytes static/center/message.png | Bin 0 -> 811 bytes static/center/order.png | Bin 1445 -> 1112 bytes static/center/pay-fail.png | Bin 0 -> 9507 bytes static/center/pay-success.png | Bin 0 -> 9958 bytes static/center/problem.png | Bin 2742 -> 0 bytes static/center/refresh.png | Bin 0 -> 1092 bytes static/center/scan.png | Bin 1025 -> 0 bytes static/center/service.png | Bin 2321 -> 1203 bytes static/center/share.png | Bin 1394 -> 1557 bytes static/center/shop-logo.png | Bin 3014 -> 0 bytes static/center/suggestion.png | Bin 1842 -> 0 bytes static/images/jieson.png | Bin 0 -> 1463 bytes static/images/other.png | Bin 0 -> 1177 bytes static/images/plane_ticket.png | Bin 0 -> 1607 bytes static/images/strategy.png | Bin 0 -> 2112 bytes static/images/travel.png | Bin 0 -> 2074 bytes static/tabbar/find-active.png | Bin 0 -> 840 bytes static/tabbar/find.png | Bin 0 -> 875 bytes static/tabbar/home-active.png | Bin 1910 -> 1057 bytes static/tabbar/home.png | Bin 1842 -> 1070 bytes static/tabbar/my-active.png | Bin 2397 -> 1384 bytes static/tabbar/my.png | Bin 2304 -> 1418 bytes static/tabbar/order-active.png | Bin 1648 -> 0 bytes static/tabbar/order.png | Bin 1530 -> 0 bytes static/tabbar/recomm-active.png | Bin 0 -> 971 bytes static/tabbar/recomm.png | Bin 0 -> 1009 bytes .../components/u-lazy-load/u-lazy-load.vue | 10 +- 51 files changed, 451 insertions(+), 130 deletions(-) create mode 100644 common/styles/iconfont.css create mode 100644 pages/order/refund_detail.vue create mode 100644 static/center/about.png create mode 100644 static/center/feedback.png delete mode 100644 static/center/home.png delete mode 100644 static/center/loginout.png create mode 100644 static/center/message.png create mode 100644 static/center/pay-fail.png create mode 100644 static/center/pay-success.png delete mode 100644 static/center/problem.png create mode 100644 static/center/refresh.png delete mode 100644 static/center/scan.png delete mode 100644 static/center/shop-logo.png delete mode 100644 static/center/suggestion.png create mode 100644 static/images/jieson.png create mode 100644 static/images/other.png create mode 100644 static/images/plane_ticket.png create mode 100644 static/images/strategy.png create mode 100644 static/images/travel.png create mode 100644 static/tabbar/find-active.png create mode 100644 static/tabbar/find.png delete mode 100644 static/tabbar/order-active.png delete mode 100644 static/tabbar/order.png create mode 100644 static/tabbar/recomm-active.png create mode 100644 static/tabbar/recomm.png diff --git a/App.vue b/App.vue index 2399c72..1cefd21 100644 --- a/App.vue +++ b/App.vue @@ -121,6 +121,7 @@ @import '@/common/styles/common.css'; @import '@/common/styles/main.css'; @import "@/common/styles/icon.css"; + @import "@/common/styles/iconfont.css"; //底部按钮 .btn-bottom { diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css new file mode 100644 index 0000000..c696efc --- /dev/null +++ b/common/styles/iconfont.css @@ -0,0 +1,42 @@ +@font-face { + font-family: "lf-iconfont"; /* Project id 2651793 */ + src: url('//at.alicdn.com/t/font_2651793_erp3vwlpk0v.woff2?t=1625725821604') format('woff2'), + url('//at.alicdn.com/t/font_2651793_erp3vwlpk0v.woff?t=1625725821604') format('woff'), + url('//at.alicdn.com/t/font_2651793_erp3vwlpk0v.ttf?t=1625725821604') format('truetype'); +} + +.lf-iconfont { + font-family: "lf-iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.lf-icon-xiangyou:before { + content: "\e6d8"; +} + +.lf-icon-dui:before { + content: "\e64d"; +} + +.lf-icon-jia:before { + content: "\e606"; +} + +.lf-icon-dui1:before { + content: "\e609"; +} + +.lf-icon-weixin:before { + content: "\e61c"; +} + +.lf-icon-cuowu:before { + content: "\e60c"; +} + +.lf-icon-tongzhi:before { + content: "\e60d"; +} diff --git a/common/styles/theme.css b/common/styles/theme.css index 6201f2b..cd95db8 100644 --- a/common/styles/theme.css +++ b/common/styles/theme.css @@ -19,8 +19,8 @@ checkbox .uni-checkbox-input { radio .uni-radio-input.uni-radio-input-checked, checkbox .uni-checkbox-input.uni-checkbox-input-checked { /* border-radius: 50%; */ - border: 1px solid #FE9903 !important; - background: #FE9903 !important; + border: 1px solid #1998FE !important; + background: #1998FE !important; color: #FFFFFF !important; } @@ -45,8 +45,8 @@ checkbox .wx-checkbox-input { radio .wx-radio-input.wx-radio-input-checked, checkbox .wx-checkbox-input.wx-checkbox-input-checked { border-radius: 50%; - border: 1px solid #FE9903 !important; - background: #FE9903 !important; + border: 1px solid #1998FE !important; + background: #1998FE !important; color: #FFFFFF !important; } @@ -61,11 +61,11 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo /* #endif */ .lf-color-primary { - color: #FE9903 !important; + color: #1998FE !important; } .lf-bg-primary { - background: #FE9903 !important; + background: #1998FE !important; } .lf-color-secondary { diff --git a/components/lf-waterfall/lf-waterfall.vue b/components/lf-waterfall/lf-waterfall.vue index dab9463..34f0077 100644 --- a/components/lf-waterfall/lf-waterfall.vue +++ b/components/lf-waterfall/lf-waterfall.vue @@ -3,7 +3,7 @@