From 63ce060f4bc570f6526ec7de7183c2bfa2974a09 Mon Sep 17 00:00:00 2001 From: shuxiaoquan <853623962@qq.com> Date: Mon, 26 Feb 2024 17:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E4=B8=80=E5=8D=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 +- pages/cart/index.vue | 2 +- pages/checkout/index.vue | 3 +- pages/invite/index.vue | 2 +- pages/invite/list.vue | 9 +- pages/shop/extract.vue | 4 +- pages/sureOrder/index.vue | 560 ++++++++++++++++++++++---------------- 7 files changed, 336 insertions(+), 248 deletions(-) diff --git a/manifest.json b/manifest.json index 3201889..40e8601 100644 --- a/manifest.json +++ b/manifest.json @@ -114,13 +114,13 @@ "lazyCodeLoading" : "requiredComponents", "permission" : { "scope.userLocation" : { - "desc" : "你的位置信息将用于为您提供更合适您的服务" + "desc" : "获取当前所在城市位置" } }, "optimization" : { "subPackages" : true }, - "requiredPrivateInfos" : [ "chooseAddress" ] + "requiredPrivateInfos" : [ "chooseAddress","getLocation" ] }, "mp-alipay" : { "usingComponents" : true diff --git a/pages/cart/index.vue b/pages/cart/index.vue index be5307f..fe3e7e2 100644 --- a/pages/cart/index.vue +++ b/pages/cart/index.vue @@ -575,7 +575,7 @@ .goods-price { vertical-align: bottom; color: $main-bg; - + flex: 1; .unit { font-size: 24rpx; } diff --git a/pages/checkout/index.vue b/pages/checkout/index.vue index 79c63cc..73a54db 100644 --- a/pages/checkout/index.vue +++ b/pages/checkout/index.vue @@ -359,7 +359,8 @@ // 个人信息 personal: {}, // 商城设置 - setting: {} + setting: {}, + distance_unit: "" } }, diff --git a/pages/invite/index.vue b/pages/invite/index.vue index 8078924..243ad05 100644 --- a/pages/invite/index.vue +++ b/pages/invite/index.vue @@ -88,7 +88,7 @@ backgroundBg1: { "background-color": "transparent" }, - isPopup: true, + isPopup: false, info: {}, list: ["邀请更多好友，获得更多奖金"] } diff --git a/pages/invite/list.vue b/pages/invite/list.vue index bec841b..e371c79 100644 --- a/pages/invite/list.vue +++ b/pages/invite/list.vue @@ -3,14 +3,15 @@ - + + - AUIIO - 2023-02-12 10:00 + {{a.invitee.nick_name}} + {{a.create_time}} - +18元 + +{{a.money}}元 diff --git a/pages/shop/extract.vue b/pages/shop/extract.vue index bcd7cbb..b86b3ac 100644 --- a/pages/shop/extract.vue +++ b/pages/shop/extract.vue @@ -2,7 +2,7 @@ - + {{ item.shop_name }} @@ -127,7 +127,7 @@ /** * 选择门店 */ - onSelectedShop(selectedId) { + onSelectedShop(selectedId,distance_unit) { const app = this // 设置选中的id app.selectedId = selectedId diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue index dbf340a..062239a 100644 --- a/pages/sureOrder/index.vue +++ b/pages/sureOrder/index.vue @@ -4,88 +4,83 @@ - + 送货上门 - + 到店自取 - {{buyType=='zq'?'到店自取':'送货上门'}} + {{buyType=='zq'?'到店自取':'送货上门'}} - + - 请点击添加收货地址 + 请点击添加收货地址 - - + {{ order.address.name}}{{ order.address.phone }} + + {{ region }} + {{ order.address.detail }} + - - - - 花梨服务站 - - - 切换 - - - - - - - - - - 距您16.39km - - - 查看地图 - - - - - - - 取件人 - - - - - - - - - - - - - - - - 预留电话 - - - - - - - - - - - - - - + + + + + + {{ order.extractShop.shop_name }} + + + 切换 + + + + + {{ order.extractShop.region.province }} {{ order.extractShop.region.city }}{{ order.extractShop.region.region }} {{ order.extractShop.address }} + + + + + 距您{{distance_unit}} + + + 查看地图 + + + + + 请选择门店 + + + + 取件人 + + + + + + + + + 预留电话 + + + + + + + + + - + - + 街边取 @@ -96,52 +91,52 @@ - + 预计到货时间 - - 2024-12-20 09：30 - - + + {{timer}} + 请选择 + - + 您期待的收货时间 - - 请选择 - + + {{timer}} + 请选择 + - + 大白兔家电 - + - + - + - {{goodsInfo.goods_name}} + {{ item.goods_name }} - ￥ {{goodsInfo.goods_price_min}} + ￥ {{item.goods_price_min}} - x1 + x{{ item.total_num }} 留言 - @@ -151,15 +146,18 @@ 商品总额 - ￥{{goodsInfo.goods_price_min}} + ￥{{ order.orderTotalPrice }} - + 运费 - - ￥{{goodsInfo.goods_price_min}} + + +￥{{ order.expressPrice }} + + + 不在配送范围 @@ -174,9 +172,14 @@ 优惠券 - - {{couponList.length}}张可用 - + + -￥{{ order.couponMoney }} + {{order.couponList.length}}张可用 + + + + 无优惠券可用 + @@ -188,7 +191,7 @@ 共1件，合计： - ￥{{goodsInfo.goods_price_min}} + ￥{{ order.orderPayPrice }} @@ -227,12 +230,54 @@ 应付款 ￥ - {{goodsInfo.goods_price_min}} + {{order.orderPayPrice}} - + 提交订单 - + + + + + 选择优惠券 + + + + + + {{ CouponTypeEnum[item.coupon_type].name }} + + + ￥ + {{ item.reduce_price }} + + {{ item.discount }}折 + 满{{ item.min_price }}元可用 + + + + {{ item.name }} + + + {{ item.start_time }} 当天有效 + {{ item.start_time }}~{{ item.end_time }} + + + + + + + + + + + 不使用优惠券 + + + + + @@ -298,6 +343,19 @@ export default { data() { return { + params: { + year: true, + month: true, + day: true, + hour: true, + minute: true, + second: true + }, + show1: false, + background: { + background: 'url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat', + backgroundSize: '100% auto', + }, // 枚举类 OrderTypeEnum, DeliveryTypeEnum, @@ -347,8 +405,11 @@ }, // 个人信息 personal: {}, + buyType:'sm', // 商城设置 - setting: {} + setting: {}, + timer: "", + distance_unit: "" } }, @@ -381,7 +442,12 @@ }, methods: { - + openPicker() { + this.show1 = true; + }, + confirm(e){ + this.timer = e.year+'-'+e.month+'-'+e.day+' '+e.hour+':'+e.minute+':'+e.second + }, // 获取订单数据 getOrderData() { const app = this @@ -435,9 +501,10 @@ }, // 切换配送方式 - handleSwichDelivery(key) { + handleSwichDelivery(key,val) { this.curDelivery = key this.getOrderData() + this.buyType = val; }, // 显示积分说明 @@ -636,188 +703,210 @@ .getSelf { width: 700rpx; margin: 0 auto; - .shopAddress { - display: flex; - align-items: center; - justify-content: space-between; - - .youTime { - font-size: 24rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 400; - color: #000000; - } - - .leftImg { - font-size: 24rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 400; - color: #9E9E9E; - - image { - width: 18rpx; - height: 18rpx; - margin-left: 16rpx; - } - } - } background-image: url('https://www.royaum.com.cn/static/order/map.png'); - background-size: 100%; - height: 160rpx; + background-size: 100%; + min-height: 160rpx; padding: 14rpx 46rpx 0 32rpx; box-sizing: border-box; - .addressDetail { - height: 34rpx; - font-size: 24rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 400; - color: #838383; - line-height: 34rpx; - margin-top: 6rpx; - } - - .lookMap { - display: flex; - align-items: center; - margin-top: 8rpx; - - .addressIcon { - width: 23rpx; - height: 26rpx; - margin-right: 14rpx; - } - - .range { - font-size: 20rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 400; - color: #F42B17; - line-height: 26rpx; - padding-right: 10rpx; - border-right: 2rpx solid #D9D9D9; - margin-right: 10rpx; - } - - .checkMap { - font-size: 20rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 400; - color: #2B2B2B; - line-height: 26rpx; - margin-right: 24rpx; - } - - .rightIcon { - width: 18rpx; - height: 18rpx; - } - } - - .pickUp { - display: flex; - justify-content: space-around; - margin-top: 26rpx; - - .pickPeople { - .title { - height: 28rpx; - font-size: 20rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 400; - color: #838383; - line-height: 28rpx; - } - - .name { - height: 28rpx; - font-size: 20rpx; - font-family: PingFang SC, PingFang SC; - font-weight: 600; - color: #2C2C2C; - line-height: 28rpx; - margin-top: 10rpx; - - .edit { - width: 20rpx; - height: 20rpx; - } - } - } - } + } .leftText { font-size: 24rpx; - font-family: PingFang SC, PingFang SC; font-weight: 400; color: #F21A1C; line-height: 28rpx; } - + .shopAddress { + max-height: 260rpx; + padding-bottom: 20rpx; + overflow: hidden; + .tip{ + font-size: 24rpx; + color: #F32E2E; + display: flex; + align-items: center; + justify-content: space-between; + image{ + width: 12rpx; + height: 18rpx; + } + } + .pickUp { + display: flex; + justify-content: space-around; + margin-top: 16rpx; + .pickPeople { + flex: 1; + &:first-child{ + margin-right: 20rpx; + } + .title { + font-size: 24rpx; + font-weight: 400; + color: #838383; + } + + .name { + margin-top: 10rpx; + display: flex; + align-items: center; + input{ + width: 200rpx; + line-height: 60rpx; + font-size: 24rpx; + color: #2C2C2C; + display: block; + } + .edit { + width: 30rpx; + height: 30rpx; + margin-left: 10rpx; + } + } + } + } + .a{ + display: flex; + align-items: center; + justify-content: space-between; + .youTime { + font-size: 28rpx; + font-weight: 600; + color: #1D1D1D; + } + + .leftImg { + font-size: 24rpx; + font-weight: 400; + color: #F42B17; + image { + width: 12rpx; + height: 18rpx; + margin-left: 16rpx; + } + } + } + .b{ + font-size: 24rpx; + color: #838383; + line-height: 50rpx; + } + .lookMap { + display: flex; + align-items: center; + margin-top: 8rpx; + margin-bottom: 10rpx; + .addressIcon { + width: 23rpx; + height: 26rpx; + margin-right: 14rpx; + } + + .range { + font-size: 20rpx; + font-weight: 400; + color: #F42B17; + line-height: 26rpx; + padding-right: 10rpx; + border-right: 2rpx solid #D9D9D9; + margin-right: 10rpx; + } + + .checkMap { + font-size: 20rpx; + font-weight: 400; + color: #2B2B2B; + line-height: 26rpx; + margin-right: 24rpx; + } + + .rightIcon { + width: 12rpx; + height: 18rpx; + } + } + } .address { - margin-left: 26rpx; - background-image: url('../../static/order/map.png'); - width: 694rpx; - height: 154rpx; - display: flex; + width: 100%; + display: flex; + height: 120rpx; align-items: center; justify-content: space-between; - padding: 0 52rpx 0 32rpx; - + padding: 0 22rpx 0 32rpx; + box-sizing: border-box; .addAddress { font-size: 28rpx; - font-family: PingFang SC, PingFang SC; font-weight: 500; - color: #F32E2E; + // color: #F32E2E; + color: #212121; + .info{ + flex: 1; + .name{ + font-size: 28rpx; + color: #212121; + text{ + margin-left: 20rpx; + color: #666; + } + } + .detail{ + margin-top: 10rpx; + font-size: 26rpx; + } + } + .tip{ + font-size: 30rpx; + font-weight: 500; + color: #F32E2E; + } } .leftImg { - width: 18rpx; + width: 12rpx; height: 18rpx; - image { width: 100%; - height: 100%; + height: 100%; + display: block; } } } - + .ziqu{ + overflow: hidden; + padding: 0 22rpx 0 32rpx; + } .preTime { - width: 694rpx; + width: 700rpx; height: 140rpx; background: #FFFFFF; - border-radius: 10rpx 10rpx 10rpx 10rpx; - opacity: 1; + border-radius: 10rpx; margin: 12rpx 0 0 26rpx; display: flex; justify-content: space-between; padding: 34rpx 0 0 30rpx; - + box-sizing: border-box; .left { .bagImg { - height: 30rpx; font-size: 24rpx; - font-family: PingFang SC, PingFang SC; font-weight: 400; - color: #000000; - line-height: 30rpx; - margin-bottom: 10rpx; - + color: #000000; + display: flex; + align-items: center; .bag { - width: 30rpx; - height: 30rpx; + width: 35rpx; + height: 35rpx; + margin-right: 10rpx; } } } .preText { - height: 34rpx; font-size: 24rpx; - font-family: PingFang SC, PingFang SC; font-weight: 400; color: #959595; - line-height: 34rpx; + margin-top: 15rpx; } } @@ -826,7 +915,7 @@ width: 694rpx; height: 90rpx; background: #FFFFFF; - border-radius: 10rpx 10rpx 10rpx 10rpx; + border-radius: 10rpx; opacity: 1; margin: 12rpx 0 0 26rpx; align-items: center; @@ -835,19 +924,16 @@ .youTime { font-size: 24rpx; - font-family: PingFang SC, PingFang SC; font-weight: 400; color: #000000; } .leftImg { font-size: 24rpx; - font-family: PingFang SC, PingFang SC; font-weight: 400; color: #9E9E9E; - image { - width: 18rpx; + width: 12rpx; height: 18rpx; margin-left: 16rpx; }