From ea74caf99678304d08a16fb18b5d3fefc8f3b275 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 20 Jan 2024 17:58:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E8=AE=A2=E5=8D=95=20=E6=89=BE?= =?UTF-8?q?=E8=8A=B1=E5=BA=97=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/layoutHeader.vue | 2 +- pages/homeIndex/lockflorist.vue | 828 ++++++++++++++++++++++++++++ pages/homeIndex/orderdetails.vue | 212 +++++++ pages/homeIndex/placeOrder.vue | 362 +++++++++--- pages/homeIndex/receivingorders.vue | 229 +++++++- 5 files changed, 1552 insertions(+), 81 deletions(-) create mode 100644 pages/homeIndex/lockflorist.vue create mode 100644 pages/homeIndex/orderdetails.vue diff --git a/components/layoutHeader.vue b/components/layoutHeader.vue index ad5d41d..8de3bf2 100644 --- a/components/layoutHeader.vue +++ b/components/layoutHeader.vue @@ -6,7 +6,7 @@
  • 首页
  • 下订单
  • 接订单
  • -
  • 找花店
  • +
  • 找花店
  • 花店地图
  • 服务中心
  • 下载中心
  • diff --git a/pages/homeIndex/lockflorist.vue b/pages/homeIndex/lockflorist.vue new file mode 100644 index 0000000..5b126ad --- /dev/null +++ b/pages/homeIndex/lockflorist.vue @@ -0,0 +1,828 @@ + + + + + diff --git a/pages/homeIndex/orderdetails.vue b/pages/homeIndex/orderdetails.vue new file mode 100644 index 0000000..8f30a16 --- /dev/null +++ b/pages/homeIndex/orderdetails.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/pages/homeIndex/placeOrder.vue b/pages/homeIndex/placeOrder.vue index fd4b379..02e2bcc 100644 --- a/pages/homeIndex/placeOrder.vue +++ b/pages/homeIndex/placeOrder.vue @@ -180,7 +180,7 @@ -
    +
    订单设置
    @@ -197,23 +197,31 @@ -
    非必填
    +
    + +
    非必填
    +
    -
    (可用余额:
    ¥0
    立即充值
    +
    + (可用余额: +
    ¥0
    +
    立即充值
    + ) +
    价格过低可能导致店铺店铺不接单 查看参考价格
    @@ -234,7 +242,7 @@ placeholder="订单备忘,仅下单方乐见" />
    - + - +
    +
    -
    +
    订单类型:鲜花
    商品数量:1
    收货时间:1024-01-05 不限时间
    -
    订单价格:
    ¥0.00
    +
    + 订单价格: +
    ¥0.00
    +
    确认无误,立即下单
    @@ -315,7 +379,7 @@ const options = [ label: 'Option5', }, ] -import { Delete, Download, Plus, ZoomIn, InfoFilled,QuestionFilled } from '@element-plus/icons-vue' +import { Delete, Download, Plus, ZoomIn, InfoFilled, QuestionFilled,MapLocation } from '@element-plus/icons-vue' import type { UploadFile } from 'element-plus' @@ -341,7 +405,7 @@ const handleDownload = (file: UploadFile) => { .banner { width: 100%; background-color: #fff; - padding-bottom: .9792rem; + padding-bottom: 0.9792rem; .nav { height: 1.8333rem; width: 100%; @@ -447,29 +511,29 @@ const handleDownload = (file: UploadFile) => { } } } - .sales-price{ - .tail{ - display: flex; - align-items: center; - color: #999999; - i{ - margin: 0 .026rem; - } + .sales-price { + .tail { + display: flex; + align-items: center; + color: #999999; + i { + margin: 0 0.026rem; } + } } - .bid{ - .tail{ + .bid { + .tail { color: #999999; display: flex; - .money{ + .money { color: #e1a130; // margin-left: .026rem; } - .krypton{ - color: #43A7E5; + .krypton { + color: #43a7e5; text-decoration: underline; cursor: pointer; - margin-left: .026rem; + margin-left: 0.026rem; } } .tip { @@ -479,11 +543,11 @@ const handleDownload = (file: UploadFile) => { .el-icon { top: 2px; } - span{ - color: #43A7E5; + span { + color: #43a7e5; text-decoration: underline; cursor: pointer; - margin-left: .026rem; + margin-left: 0.026rem; } } } @@ -507,51 +571,50 @@ const handleDownload = (file: UploadFile) => { text-align: center; line-height: 0.1563rem; margin-top: 0.2344rem; - } } } } - .settlement{ - height: .6563rem; - padding: .0833rem .2135rem; + .settlement { + height: 0.6563rem; + padding: 0.0833rem 0.2135rem; display: flex; justify-content: space-between; align-items: center; - .left{ - display: flex; - flex-direction: column; - // align-items: center; - justify-content: space-around; - height: 100%; - color: #575D6C; - font-size: .0833rem; - span{ - color: #252B3A; + .left { + display: flex; + flex-direction: column; + // align-items: center; + justify-content: space-around; + height: 100%; + color: #575d6c; + font-size: 0.0833rem; + span { + color: #252b3a; + } + } + .content { + display: flex; + align-items: center; + color: #252b3a; + font-size: 0.0938rem; + div { + color: #ff4e8d; + font-size: 0.1354rem; + font-weight: 700; + } + } + .right { + width: 1.25rem; + height: 0.2083rem; + text-align: center; + line-height: 0.2083rem; + color: #fff; + background: linear-gradient(90deg, #ff99bd 0%, #ffddbe 100%); + border-radius: 0.0521rem; + font-size: 0.0833rem; + cursor: pointer; } - } - .content{ - display: flex; - align-items: center; - color: #252B3A; - font-size: .0938rem; - div{ - color: #FF4E8D; - font-size: .1354rem; - font-weight: 700; - } - } - .right{ - width: 1.25rem; - height: .2083rem; - text-align: center; - line-height: .2083rem; - color: #fff; - background: linear-gradient(90deg,#FF99BD 0%,#FFDDBE 100%); - border-radius:.0521rem; - font-size:.0833rem; - cursor:pointer; - } } .footer { display: flex; @@ -571,6 +634,159 @@ const handleDownload = (file: UploadFile) => { line-height: 0.2083rem; font-size: 0.0729rem; } + } + } + .goods-info { + .footer { + display: block !important; + height: auto; + .vip-name{ + margin-top: .125rem; + } + .shop-info{ + padding: .125rem .1146rem; + + + .title{ + display: flex; + justify-content: space-between; + .left{ + display: flex; + align-items: center; + .shop-name{ + color: #252B3A; + font-size: .0833rem; + font-weight: 600; + } + .gradd{ + margin-left: .0521rem; + } + .status{ + width: .2604rem; + height: .099rem; + background-color: #FCECED; + text-align: center; + line-height: .099rem; + font-size: .0625rem; + color: #FF4E8D; + margin-left: .0833rem; + } + .online-status{ + color: #ff4e8d; + font-size: .0729rem; + margin-left: .1563rem; + font-weight: 600; + } + } + .right{ + display: flex; + .record,.guarantee{ + width: .4271rem; + height: .099rem; + text-align: center; + line-height: .099rem; + } + .record{ + border: 1px solid #FF4E8D; + color: #FF4E8D; + } + .guarantee{ + border: 1px solid #1AA48D; + color: #1AA48D; + margin-left: .0521rem; + } + } + } + .shop-content{ + padding: .0781rem .1146rem 0 .0781rem; + display: flex; + justify-content: space-between; + .left{ + display: flex; + .image{ + height: .5625rem; + width: .5625rem; + background-color: #C4C4C4; + } + .vip-info{ + padding: .0521rem; + ul{ + + height: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + li{ + list-style: none; + display: flex; + .label,.phone,.qq,.contact-address{ + font-size: .0625rem; + color: #8A8E99; + } + .name,.telephone-number,.qq-number,.address{ + font-size: .0625rem; + color: #333333; + } + .icon{ + font-size: 14px; + color: #dd323c; + } + .map{ + font-size: .0625rem; + color: #8A8E99; + } + } + } + } + + } + .right{ + display: flex; + flex-direction: column; + justify-content: space-between; + ul{ + display: flex; + border: 1px solid #E1E1E3; + border-radius: .026rem; + li{ + position: relative; + list-style: none; + width:.3958rem; + height: .2604rem; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + .content{ + color: #FF4E8D; + font-size: .0833rem; + } + .txt{ + font-size: .0625rem; + color: #575D6C; + } + } + li:nth-child(n+2)::after{ + content: ' '; + display: block; + width: 1PX; + height: .1563rem; + background-color: #E1E1E3; + position: absolute; + left: 0; + // position: absolute; + // background-color: pink; + } + } + .bottom{ + // margin-top: .0521rem; + } + } + } + } + + + } } } @@ -587,17 +803,17 @@ const handleDownload = (file: UploadFile) => { margin-left: 0.026rem; } } - ::v-deep .el-radio-button__original-radio:checked + .el-radio-button__inner{ - color:#FF518F; - background:none; + ::v-deep .el-radio-button__original-radio:checked + .el-radio-button__inner { + color: #ff518f; + background: none; } - ::v-deep .el-radio-button:last-child .el-radio-button__inner{ - width:.6667rem; + ::v-deep .el-radio-button:last-child .el-radio-button__inner { + width: 0.6667rem; // height:.1771rem; } - ::v-deep .el-radio-button:first-child .el-radio-button__inner{ - width:.6667rem; - margin-right:.026rem; + ::v-deep .el-radio-button:first-child .el-radio-button__inner { + width: 0.6667rem; + margin-right: 0.026rem; } } diff --git a/pages/homeIndex/receivingorders.vue b/pages/homeIndex/receivingorders.vue index b675486..8f9eb7d 100644 --- a/pages/homeIndex/receivingorders.vue +++ b/pages/homeIndex/receivingorders.vue @@ -48,7 +48,7 @@
    按下单时间
    按订单金额 -
    +
    @@ -66,6 +66,109 @@
    +
    +
    +
    +
    河南省驻马店市上蔡县
    +
    下单时间:2024-01-01 21:31:25
    +
    +
    +
    +
    普通订单
    +
    +
    +
    +
    + 收货时间:2024-01-08 不限时段 + 离接单结束还剩:6小时 +
    +
    +
    商品类型:鲜花
    +
    +
    商品总数:1
    +
    +
    +
    审核信息:需要完成下单方审核鲜花实拍图
    +
    +
    +
    订单描述:这里是一段订单的描述~
    +
    +
    +
    +
    立即报价
    +
    +
    +
    +
    +
    +
    河南省驻马店市上蔡县
    +
    下单时间:2024-01-01 21:31:25
    +
    +
    +
    +
    普通订单
    +
    +
    +
    +
    + 收货时间:2024-01-08 不限时段 + 离接单结束还剩:6小时 +
    +
    +
    商品类型:鲜花
    +
    +
    商品总数:1
    +
    +
    +
    审核信息:需要完成下单方审核鲜花实拍图
    +
    +
    +
    订单描述:这里是一段订单的描述~
    +
    +
    +
    +
    立即报价
    +
    +
    +
    +
    +
    +
    河南省驻马店市上蔡县
    +
    下单时间:2024-01-01 21:31:25
    +
    +
    +
    +
    普通订单
    +
    +
    +
    +
    + 收货时间:2024-01-08 不限时段 + 离接单结束还剩:6小时 +
    +
    +
    商品类型:鲜花
    +
    +
    商品总数:1
    +
    +
    +
    审核信息:需要完成下单方审核鲜花实拍图
    +
    +
    +
    订单描述:这里是一段订单的描述~
    +
    +
    +
    +
    立即报价
    +
    +
    +
    +
    +
    +
    +
    为了提高查询效率,仅显示近期订单
    +
    +
    @@ -142,7 +245,7 @@ const options = [ align-items: center; color: #252b3a; font-size: 0.0729rem; - margin:.1042rem 0; + margin: 0.1042rem 0; .label { width: 0.3646rem; text-align: right; @@ -166,10 +269,10 @@ const options = [ margin-right: 0.2135rem; cursor: pointer; } - div:focus, - div:hover { - color: #ff4e8d; - } + // div:focus, + // div:hover { + // color: #ff4e8d; + // } } } } @@ -213,12 +316,124 @@ const options = [ .active-sort { color: #fff; } - .descending{ + .descending { margin-top: -5px; } } } } + .line-items { + margin-top: 0.1719rem; + .item { + padding: 0.1198rem 0.1771rem; + background-color: #fff; + margin: .0521rem 0; + .header { + display: flex; + .address { + width: 2.8125rem; + color: #252b3a; + font-size: 0.0833rem; + font-weight: 600; + } + .time { + color: #8a8e99; + font-size: 0.0625rem; + } + } + .order-info { + display: flex; + width: 100%; + padding: .0781rem 0 0 .0521rem; + .image { + width: 0.7292rem; + height: 0.7292rem; + background-color: #d9d9d9; + position: relative; + .tag{ + position: absolute; + bottom: 0; + width: 100%; + height: .125rem; + color: #fff; + text-align: center; + line-height: .125rem; + background: linear-gradient(90deg, #ff94d4 0%, #ffddbe 100%); + } + } + .iine-info { + width: 4.1667rem; + margin-left: 0.0521rem; + display: flex; + flex-direction: column; + justify-content: space-between; + .label { + color: #8a8e99; + font-size: 0.0625rem; + } + .receipt-time{ + .time{ + color: #FF4E8D; + font-size: .0729rem; + font-weight: 600; + margin-right: .1042rem; + } + } + .goods-type{ + .type{ + color: #252b3a; + } + } + .content{ + .number{ + color: #FF4E8D; + font-size: .0729rem; + font-weight: 600; + } + } + .audit-information{ + .information{ + color: #252b3a; + } + } + .order-description{ + .description{ + color: #252b3a; + } + } + } + .submit-box{ + // height: 100%; + display: flex; + flex-direction: column; + justify-content: end; + margin-left: .2604rem; + .submit{ + + width: .5833rem; + height: .1667rem; + color: #fff; + text-align: center; + line-height: .1667rem; + background: linear-gradient(90deg, #ff94d4 0%, #ffddbe 100%); + } + } + + } + } + } + .page{ + height: 1.0417rem; + display: flex; + flex-direction: column; + justify-content: center; + align-content: center; + .txt{ + text-align: center; + color: #252B3A; + margin-top: .1563rem; + } + } } }