|
|
@@ -1,15 +1,5 @@
|
|
|
<template>
|
|
|
<view class="delivery-container">
|
|
|
- <!-- 页面头部 -->
|
|
|
- <!-- <view class="delivery-header">
|
|
|
- <view class="header-top">
|
|
|
- <view class="order-sn">{{ orderSn }}</view>
|
|
|
- <view class="predict-time">{{ predictTime }}</view>
|
|
|
- </view>
|
|
|
- <view class="header-bottom">
|
|
|
- <view class="speed-tips">最快01-20 14:24送达</view>
|
|
|
- </view>
|
|
|
- </view> -->
|
|
|
|
|
|
<!-- 地址选择区 -->
|
|
|
<view class="address-section">
|
|
|
@@ -122,44 +112,6 @@
|
|
|
</view>
|
|
|
|
|
|
<!-- 跑腿列表 -->
|
|
|
-
|
|
|
- <!-- <view class="delivery-item" :class="{ active: selectedDelivery === 3 }" @click="selectDelivery(3)">
|
|
|
- <view class="item-left">
|
|
|
- <view class="delivery-name">
|
|
|
- <text class="name">顺丰直营</text>
|
|
|
- </view>
|
|
|
- <view class="delivery-detail">团送>></view>
|
|
|
- </view>
|
|
|
- <view class="item-right">
|
|
|
- <view class="price">预估 ¥{{ deliveryList[3].price }}</view>
|
|
|
- <radio :checked="selectedDelivery === 3" color="#3385FF" style="transform: scale(0.7)"></radio>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="delivery-item" :class="{ active: selectedDelivery === 4 }" @click="selectDelivery(4)">
|
|
|
- <view class="item-left">
|
|
|
- <view class="delivery-name">
|
|
|
- <text class="name">UU跑腿</text>
|
|
|
- </view>
|
|
|
- <view class="delivery-detail">专人直送</view>
|
|
|
- </view>
|
|
|
- <view class="item-right">
|
|
|
- <view class="price">预估 ¥{{ deliveryList[4].price }}</view>
|
|
|
- <radio :checked="selectedDelivery === 4" color="#3385FF" style="transform: scale(0.7)"></radio>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="delivery-item" :class="{ active: selectedDelivery === 5 }" @click="selectDelivery(5)">
|
|
|
- <view class="item-left">
|
|
|
- <view class="delivery-name">
|
|
|
- <text class="name">蜂鸟</text>
|
|
|
- </view>
|
|
|
- <view class="delivery-detail">配送></view>
|
|
|
- </view>
|
|
|
- <view class="item-right">
|
|
|
- <view class="price">预估 ¥{{ deliveryList[5].price }}</view>
|
|
|
- <radio :checked="selectedDelivery === 5" color="#3385FF" style="transform: scale(0.7)"></radio>
|
|
|
- </view>
|
|
|
- </view> -->
|
|
|
-
|
|
|
<!-- 遍历deliveryList -->
|
|
|
<view class="delivery-item" v-for="(item, index) in deliveryList" :key="index" :class="{ active: selectedDelivery === item.name, disabled: !item.isAble }" @click="selectDelivery(item)">
|
|
|
<view class="item-left">
|
|
|
@@ -197,12 +149,6 @@
|
|
|
import { address, getDeliveryQuotes, createDeliveryOrder } from '@/api/express/delivery'
|
|
|
import TimePicker from './components/TimePicker.vue';
|
|
|
import dayjs from 'dayjs';
|
|
|
-import utc from 'dayjs/plugin/utc';
|
|
|
-import timezone from 'dayjs/plugin/timezone';
|
|
|
-
|
|
|
-dayjs.extend(utc);
|
|
|
-dayjs.extend(timezone);
|
|
|
-dayjs.tz.setDefault("Asia/Shanghai");
|
|
|
|
|
|
export default {
|
|
|
name: 'allDelivery',
|
|
|
@@ -226,14 +172,10 @@ export default {
|
|
|
deliveryList: [],
|
|
|
// { name: '闪送', price: '19.00', type: '两轮' },
|
|
|
// { name: '达达秒送', price: '11.30', type: '团送' },
|
|
|
- // { name: '美团配送', price: '暂无报价', type: '暂无报价' },
|
|
|
- // { name: '顺丰同城', price: '11.30', type: '团送' },
|
|
|
- // { name: 'UU跑腿', price: '8.90', type: '专人直送' },
|
|
|
- // { name: '蜂鸟', price: '17.30', type: '配送' }
|
|
|
// ],
|
|
|
pickupTime: {
|
|
|
label: '立即取件',
|
|
|
- value: dayjs.tz().format('YYYY-MM-DD HH:mm'),
|
|
|
+ value: dayjs().format('YYYY-MM-DD HH:mm'),
|
|
|
},
|
|
|
remark: '',
|
|
|
};
|
|
|
@@ -367,36 +309,6 @@ export default {
|
|
|
padding-bottom: 150upx;
|
|
|
}
|
|
|
|
|
|
-/* 头部 */
|
|
|
-/*.delivery-header {
|
|
|
- background-color: #3385FF;
|
|
|
- color: white;
|
|
|
- padding: 30upx 20upx;
|
|
|
- border-radius: 0 0 20upx 20upx;
|
|
|
-
|
|
|
- .header-top {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
- margin-bottom: 15upx;
|
|
|
-
|
|
|
- .order-sn {
|
|
|
- font-size: 32upx;
|
|
|
- font-weight: bold;
|
|
|
- }
|
|
|
-
|
|
|
- .predict-time {
|
|
|
- font-size: 24upx;
|
|
|
- opacity: 0.9;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- .header-bottom {
|
|
|
- font-size: 24upx;
|
|
|
- opacity: 0.85;
|
|
|
- }
|
|
|
-}*/
|
|
|
-
|
|
|
/* 地址选择 */
|
|
|
.address-section {
|
|
|
background-color: white;
|