Merge branch 'v2.2' into v1.8.1
* v2.2: feat: 延迟发货调试 feat: 多规格延迟发货 feat: 店铺订单多规格展示 feat: 延迟发货api
This commit is contained in:
@@ -1,17 +1,10 @@
|
||||
<template>
|
||||
<view class="order_con" :class="{ bg24: props.theme == 2 }">
|
||||
<view
|
||||
class="flex-center ju-between m-b-28"
|
||||
v-if="(props.type == 2 || props.type == 4) && props.data.logisticsNo"
|
||||
>
|
||||
<view class="flex-center ju-between m-b-28" v-if="(props.type == 2 || props.type == 4) && props.data.logisticsNo">
|
||||
<view>{{ props.data.logisticsName }} {{ props.data.logisticsNo }}</view>
|
||||
<view class="flex-center">
|
||||
<view @click.stop="onCopy(props.data.logisticsNo)">复制</view>
|
||||
<truckLine
|
||||
:data="props.data"
|
||||
:code="2"
|
||||
v-if="props.data.deliveryTime && props.data.logisticsNo"
|
||||
></truckLine>
|
||||
<truckLine :data="props.data" :code="2" v-if="props.data.deliveryTime && props.data.logisticsNo"></truckLine>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -31,37 +24,101 @@
|
||||
:class="{ 'p-r-10': props.type == 3, c0: props.theme == 2 }"
|
||||
>
|
||||
{{ v.spuName }}
|
||||
<text v-if="!isCompletedOrder && getSpuDelayInfo(v).delayed" class="delay-tag delay-tag--spu">
|
||||
已延迟 {{ getSpuDelayInfo(v).text }}
|
||||
</text>
|
||||
</view>
|
||||
<view class="shrink price" v-if="props.type != 4 && !showMultiSku(v)">
|
||||
<span class="size24">¥</span>
|
||||
<span class="size36" style="font-weight: 600">{{ fen2yuan(v.price) }}</span>
|
||||
</view>
|
||||
<view class="shrink price" v-if="props.type != 4"
|
||||
><span class="size24">¥</span
|
||||
><span class="size36" style="font-weight: 600">{{ fen2yuan(v.price) }}</span></view
|
||||
>
|
||||
</view>
|
||||
<view v-if="props.type == 4">
|
||||
<view class="m-b-12 size24 h_52" v-for="(item, i) in v.items" :key="i">
|
||||
<view class="flex1 flex-center ju-between h_52 bg18 radius8 p-l-8 p-r-16">
|
||||
<view class="m-b-12" v-for="(item, i) in v.items" :key="i">
|
||||
<view class="size24 flex1 flex-center ju-between h_52 bg18 radius8 p-l-8 p-r-16">
|
||||
<view class="lineOne c19">
|
||||
{{ formatSkuProperties(item?.properties) }}
|
||||
</view>
|
||||
<view class="flex-center">
|
||||
<view class="c19">x{{ item.count }}</view>
|
||||
<view class="size28 m-l-12 weight900"
|
||||
>¥<span class="">{{ fen2yuan(item.price) }}</span>
|
||||
<view class="size28 m-l-12 weight900">
|
||||
¥<span class="">{{ fen2yuan(item.price) }}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="c13 size28 weight900">
|
||||
<view
|
||||
class="delay-record-line"
|
||||
:class="`delay-record-line--status-${resolveDelayStatus(record)}`"
|
||||
v-for="(record, recordIndex) in getSkuDelayRecords(v, item)"
|
||||
:key="recordIndex"
|
||||
>
|
||||
<view class="delay-record-line__dot" />
|
||||
<view class="delay-record-line__text">
|
||||
{{ getDelayRecordSkuText(record) }}
|
||||
</view>
|
||||
<view class="delay-record-line__meta">
|
||||
<text class="delay-record-line__status">{{ getDelayStatusText(record) }}</text>
|
||||
<text class="delay-record-line__count">x{{ getDelayRecordCount(record) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="c13 size28 weight900 m-t-4">
|
||||
¥<span class="size40">{{ fen2yuan(item.payPrice) }}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else-if="showMultiSku(v)" class="multi-sku-list">
|
||||
<view class="multi-sku-item m-b-12" v-for="(item, itemIndex) in v.items" :key="item.id || itemIndex">
|
||||
<view class="multi-sku-row flex1 flex-center ju-between bg18 radius8 p-l-8 p-r-16">
|
||||
<view class="multi-sku-text lineOne c19">
|
||||
{{ formatSkuProperties(item?.properties) }}
|
||||
</view>
|
||||
<view class="flex-center">
|
||||
<view class="c19">x{{ item.count }}</view>
|
||||
<view class="size28 m-l-12 weight900">
|
||||
¥<span>{{ fen2yuan(item.payPrice || item.price) }}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
class="delay-record-line delay-record-line--nested"
|
||||
:class="`delay-record-line--status-${resolveDelayStatus(record)}`"
|
||||
v-for="(record, recordIndex) in getSkuDelayRecords(v, item)"
|
||||
:key="recordIndex"
|
||||
>
|
||||
<view class="delay-record-line__dot" />
|
||||
<view class="delay-record-line__text">
|
||||
{{ getDelayRecordSkuText(record) }}
|
||||
</view>
|
||||
<view class="delay-record-line__meta">
|
||||
<text class="delay-record-line__status">{{ getDelayStatusText(record) }}</text>
|
||||
<text class="delay-record-line__count">x{{ getDelayRecordCount(record) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row ju-between" :class="{ 'm-t-8': props.type == 3 }" v-else>
|
||||
<view class="valueName size28" :class="{ c19: props.theme == 2 }">{{
|
||||
formatSkuProperties(v.properties)
|
||||
}}</view>
|
||||
<view class="shrink size28 c_333" :class="{ c0: props.theme == 2 }">{{
|
||||
`x${v.count}`
|
||||
}}</view>
|
||||
<view class="valueName size28" :class="{ c19: props.theme == 2 }">
|
||||
{{ formatSkuProperties(v.properties) }}
|
||||
</view>
|
||||
<view class="shrink size28 c_333" :class="{ c0: props.theme == 2 }">
|
||||
{{ `x${v.count}` }}
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
v-if="!hasNestedSkuBlock(v)"
|
||||
class="delay-record-line delay-record-line--single"
|
||||
:class="`delay-record-line--status-${resolveDelayStatus(record)}`"
|
||||
v-for="(record, recordIndex) in getSkuDelayRecords(v, v)"
|
||||
:key="`single-${recordIndex}`"
|
||||
>
|
||||
<view class="delay-record-line__dot" />
|
||||
<view class="delay-record-line__text">
|
||||
{{ getDelayRecordSkuText(record) }}
|
||||
</view>
|
||||
<view class="delay-record-line__meta">
|
||||
<text class="delay-record-line__status">{{ getDelayStatusText(record) }}</text>
|
||||
<text class="delay-record-line__count">x{{ getDelayRecordCount(record) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn flex-row ju-flex-end" v-if="props.type == 2">
|
||||
<button
|
||||
@@ -87,7 +144,7 @@
|
||||
>
|
||||
取消售后
|
||||
</view>
|
||||
<view class="btnItem" v-if="v.afterSaleStatus === 20"> 售后成功 </view>
|
||||
<view class="btnItem" v-if="v.afterSaleStatus === 20">售后成功</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -95,11 +152,10 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, getCurrentInstance, defineProps } from 'vue';
|
||||
import { fen2yuan } from '@/sheep/hooks/useGoods';
|
||||
import { computed, defineProps } from 'vue';
|
||||
import { fen2yuan, formatOrderStatus } from '@/sheep/hooks/useGoods';
|
||||
import AfterSaleApi from '@/sheep/api/trade/afterSale';
|
||||
import sheep from '@/sheep';
|
||||
const { proxy } = getCurrentInstance() as any;
|
||||
let emit = defineEmits(['getOrderDetail']);
|
||||
const formatSkuProperties = (properties: any) => {
|
||||
const list = Array.isArray(properties) ? properties : [];
|
||||
@@ -108,6 +164,18 @@
|
||||
.filter(Boolean)
|
||||
.join(' ');
|
||||
};
|
||||
const showMultiSku = (item: any) => {
|
||||
return (
|
||||
['2', '3'].includes(props.type) &&
|
||||
[String(props.source), String(props.data?.__source)].includes('aishop') &&
|
||||
Array.isArray(item?.items) &&
|
||||
item.items.length > 1
|
||||
);
|
||||
};
|
||||
const hasNestedSkuBlock = (item: any) => {
|
||||
if (props.type == 4) return true;
|
||||
return showMultiSku(item);
|
||||
};
|
||||
const props = defineProps({
|
||||
data: {
|
||||
type: Object,
|
||||
@@ -117,19 +185,355 @@
|
||||
},
|
||||
type: {
|
||||
type: String,
|
||||
default: '0', //0列表2订单详情 3订单列表 4ai订单详情
|
||||
default: '0',
|
||||
},
|
||||
source: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
theme: {
|
||||
type: String,
|
||||
default: '2', //1浅色 2深色
|
||||
default: '2',
|
||||
},
|
||||
delayRecords: {
|
||||
type: Array,
|
||||
default() {
|
||||
return [];
|
||||
},
|
||||
},
|
||||
});
|
||||
const cancelAfterSale = (v) => {
|
||||
|
||||
const isAiStoreOrder = computed(() =>
|
||||
[String(props.source), String(props.data?.__source)].includes('aishop'),
|
||||
);
|
||||
|
||||
const orderStatusText = computed(() => {
|
||||
try {
|
||||
return formatOrderStatus(props.data || {});
|
||||
} catch (e) {
|
||||
const status = Number(props.data?.status);
|
||||
if (status === 30) return '已完成';
|
||||
return '';
|
||||
}
|
||||
});
|
||||
const isCompletedOrder = computed(() => orderStatusText.value === '已完成');
|
||||
|
||||
const hasDelayRecords = computed(() => {
|
||||
if (isCompletedOrder.value) return false;
|
||||
if (!isAiStoreOrder.value) return false;
|
||||
if (Array.isArray(props.delayRecords) && props.delayRecords.length > 0) {
|
||||
return true;
|
||||
}
|
||||
const records = Array.isArray(props.data?.delayRecords)
|
||||
? props.data.delayRecords
|
||||
: Array.isArray(props.data?.delayRecordList)
|
||||
? props.data.delayRecordList
|
||||
: [];
|
||||
return records.length > 0;
|
||||
});
|
||||
|
||||
const delayRecords = computed(() => {
|
||||
if (!hasDelayRecords.value) return [];
|
||||
if (Array.isArray(props.delayRecords) && props.delayRecords.length > 0) {
|
||||
return props.delayRecords;
|
||||
}
|
||||
return Array.isArray(props.data?.delayRecords)
|
||||
? props.data.delayRecords
|
||||
: Array.isArray(props.data?.delayRecordList)
|
||||
? props.data.delayRecordList
|
||||
: [];
|
||||
});
|
||||
|
||||
const DELAY_STATUS_MAP = {
|
||||
1: { text: '延迟中', color: '#FA7E31' },
|
||||
2: { text: '已激活(待发货)', color: '#1AAD19' },
|
||||
3: { text: '已发货', color: '#1677FF' },
|
||||
4: { text: '已收货', color: '#999999' },
|
||||
};
|
||||
|
||||
const resolveDelayStatus = (record: any) => {
|
||||
const status = Number(record?.status);
|
||||
if ([1, 2, 3, 4].includes(status)) return status;
|
||||
return 0;
|
||||
};
|
||||
|
||||
const getDelayStatusText = (record: any) => {
|
||||
const status = resolveDelayStatus(record);
|
||||
const fallback = getFirstValidValue(record?.statusDesc, '');
|
||||
if (DELAY_STATUS_MAP[status]) {
|
||||
return DELAY_STATUS_MAP[status].text;
|
||||
}
|
||||
return fallback || '延迟中';
|
||||
};
|
||||
|
||||
const getFirstValidValue = (...values: any[]) =>
|
||||
values.find((value) => value !== undefined && value !== null && String(value).trim() !== '') ?? '';
|
||||
|
||||
const getNumber = (value: any) => {
|
||||
const n = Number(value);
|
||||
return Number.isFinite(n) ? n : 0;
|
||||
};
|
||||
|
||||
const resolveItemId = (item: any) =>
|
||||
getFirstValidValue(item?.orderItemId, item?.itemId, item?.orderGoodsId, item?.id);
|
||||
|
||||
const resolveRecordItemId = (record: any) =>
|
||||
getFirstValidValue(record?.orderItemId, record?.itemId, record?.orderGoodsId);
|
||||
|
||||
const resolveRecordCount = (record: any) => {
|
||||
const candidates = [
|
||||
record?.count,
|
||||
record?.delayCount,
|
||||
record?.recordCount,
|
||||
record?.remainingCount,
|
||||
record?.availableCount,
|
||||
record?.canCount,
|
||||
record?.maxCount,
|
||||
];
|
||||
const matched = candidates.map((value) => getNumber(value)).find((value) => value > 0);
|
||||
return matched || 0;
|
||||
};
|
||||
|
||||
const isSameSku = (item: any, record: any) => {
|
||||
const itemProps = Array.isArray(item?.properties)
|
||||
? item.properties
|
||||
: Array.isArray(item?.skuProperties)
|
||||
? item.skuProperties
|
||||
: Array.isArray(item?.attrs)
|
||||
? item.attrs
|
||||
: [];
|
||||
const recordProps = Array.isArray(record?.properties)
|
||||
? record.properties
|
||||
: Array.isArray(record?.skuProperties)
|
||||
? record.skuProperties
|
||||
: Array.isArray(record?.attrs)
|
||||
? record.attrs
|
||||
: [];
|
||||
if (itemProps.length && recordProps.length && itemProps.length === recordProps.length) {
|
||||
const itemKey = itemProps
|
||||
.map((p) => `${getFirstValidValue(p?.valueName, p?.value)}`)
|
||||
.filter(Boolean)
|
||||
.join('|');
|
||||
const recordKey = recordProps
|
||||
.map((p) => `${getFirstValidValue(p?.valueName, p?.value)}`)
|
||||
.filter(Boolean)
|
||||
.join('|');
|
||||
if (itemKey && recordKey) {
|
||||
return itemKey === recordKey;
|
||||
}
|
||||
if (itemKey || recordKey) {
|
||||
return false;
|
||||
}
|
||||
} else if (itemProps.length || recordProps.length) {
|
||||
return false;
|
||||
}
|
||||
const itemSkuText = getFirstValidValue(
|
||||
item?.skuText,
|
||||
item?.specText,
|
||||
item?.propertiesText,
|
||||
item?.skuDesc,
|
||||
item?.specDesc,
|
||||
);
|
||||
const recordSkuText = getFirstValidValue(
|
||||
record?.skuText,
|
||||
record?.specText,
|
||||
record?.propertiesText,
|
||||
formatSkuProperties(record?.properties),
|
||||
formatSkuProperties(record?.skuProperties),
|
||||
formatSkuProperties(record?.attrs),
|
||||
record?.skuDesc,
|
||||
record?.specDesc,
|
||||
);
|
||||
if (itemSkuText && recordSkuText) {
|
||||
return itemSkuText === recordSkuText;
|
||||
}
|
||||
if (itemSkuText || recordSkuText) {
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
const resolveRecordUniqueId = (record: any) =>
|
||||
getFirstValidValue(record?.id, record?.delayRecordId, record?.recordId);
|
||||
|
||||
const uniqueByRecordId = (records: any[]) => {
|
||||
const map = new Map();
|
||||
(records || []).forEach((record) => {
|
||||
const key = resolveRecordUniqueId(record) || JSON.stringify(record);
|
||||
if (!map.has(key)) {
|
||||
map.set(key, record);
|
||||
}
|
||||
});
|
||||
return Array.from(map.values());
|
||||
};
|
||||
|
||||
const buildSpuRecordAssignment = (spuItem: any) => {
|
||||
if (!hasDelayRecords.value) {
|
||||
return { spuRecords: [], skuMap: new Map() };
|
||||
}
|
||||
const skuItems = Array.isArray(spuItem?.items) && spuItem.items.length > 0 ? spuItem.items : [spuItem];
|
||||
const targetSpuId = getFirstValidValue(spuItem?.spuId, spuItem?.productId, spuItem?.goodsId);
|
||||
const targetSpuName = getFirstValidValue(
|
||||
spuItem?.spuName,
|
||||
spuItem?.name,
|
||||
spuItem?.goodsName,
|
||||
spuItem?.productName,
|
||||
);
|
||||
const matchSpuIdentity = (record: any) => {
|
||||
const recordSpuId = getFirstValidValue(record?.spuId, record?.productId, record?.goodsId);
|
||||
if (targetSpuId && recordSpuId) {
|
||||
return String(targetSpuId) === String(recordSpuId);
|
||||
}
|
||||
const recordSpuName = getFirstValidValue(
|
||||
record?.spuName,
|
||||
record?.name,
|
||||
record?.goodsName,
|
||||
record?.productName,
|
||||
);
|
||||
if (targetSpuName && recordSpuName) {
|
||||
return String(targetSpuName).trim() === String(recordSpuName).trim();
|
||||
}
|
||||
if (targetSpuId || recordSpuId) return false;
|
||||
return false;
|
||||
};
|
||||
const spuRecordsRaw = delayRecords.value.filter((record) => {
|
||||
if (!matchSpuIdentity(record)) return false;
|
||||
const recordItemId = resolveRecordItemId(record);
|
||||
const spuItemId = resolveItemId(spuItem);
|
||||
if (recordItemId && spuItemId && String(recordItemId) === String(spuItemId)) {
|
||||
return true;
|
||||
}
|
||||
const anySkuMatched = skuItems.some((skuItem) => {
|
||||
const skuItemId = resolveItemId(skuItem);
|
||||
if (recordItemId && skuItemId && String(recordItemId) === String(skuItemId)) {
|
||||
return true;
|
||||
}
|
||||
return isSameSku(skuItem, record);
|
||||
});
|
||||
return anySkuMatched;
|
||||
});
|
||||
const spuRecords = uniqueByRecordId(spuRecordsRaw);
|
||||
const skuMap = new Map();
|
||||
skuItems.forEach((skuItem, idx) => {
|
||||
const key = resolveItemId(skuItem) || `sku-${idx}`;
|
||||
skuMap.set(key, []);
|
||||
});
|
||||
const usedRecordKeys = new Set();
|
||||
const assignRecordToSku = (record: any, skuItem: any, skuIdx: number) => {
|
||||
const key = resolveRecordUniqueId(record) || JSON.stringify(record);
|
||||
if (usedRecordKeys.has(key)) return false;
|
||||
const skuKey = resolveItemId(skuItem) || `sku-${skuIdx}`;
|
||||
if (!skuMap.has(skuKey)) {
|
||||
skuMap.set(skuKey, []);
|
||||
}
|
||||
skuMap.get(skuKey).push(record);
|
||||
usedRecordKeys.add(key);
|
||||
return true;
|
||||
};
|
||||
|
||||
spuRecords.forEach((record) => {
|
||||
const recordItemId = resolveRecordItemId(record);
|
||||
if (!recordItemId) return;
|
||||
const matchedIndex = skuItems.findIndex((skuItem) => {
|
||||
const skuItemId = resolveItemId(skuItem);
|
||||
return !!(skuItemId && String(recordItemId) === String(skuItemId));
|
||||
});
|
||||
if (matchedIndex >= 0) {
|
||||
assignRecordToSku(record, skuItems[matchedIndex], matchedIndex);
|
||||
}
|
||||
});
|
||||
|
||||
spuRecords.forEach((record) => {
|
||||
const key = resolveRecordUniqueId(record) || JSON.stringify(record);
|
||||
if (usedRecordKeys.has(key)) return;
|
||||
const matchedIndex = skuItems.findIndex((skuItem) => isSameSku(skuItem, record));
|
||||
if (matchedIndex >= 0) {
|
||||
assignRecordToSku(record, skuItems[matchedIndex], matchedIndex);
|
||||
}
|
||||
});
|
||||
|
||||
spuRecords.forEach((record) => {
|
||||
const key = resolveRecordUniqueId(record) || JSON.stringify(record);
|
||||
if (usedRecordKeys.has(key)) return;
|
||||
if (skuItems.length === 1 && matchSpuIdentity(record)) {
|
||||
assignRecordToSku(record, skuItems[0], 0);
|
||||
}
|
||||
});
|
||||
return { spuRecords, skuMap };
|
||||
};
|
||||
|
||||
const findMatchedRecords = (spuItem: any, skuItem?: any) => {
|
||||
if (!hasDelayRecords.value) return [];
|
||||
const target = skuItem || spuItem;
|
||||
const { skuMap, spuRecords } = buildSpuRecordAssignment(spuItem);
|
||||
const skuItems = Array.isArray(spuItem?.items) && spuItem.items.length > 0 ? spuItem.items : [spuItem];
|
||||
const targetIndex = skuItems.findIndex((item) => item === target);
|
||||
if (targetIndex >= 0) {
|
||||
const skuKey = resolveItemId(target) || `sku-${targetIndex}`;
|
||||
return uniqueByRecordId(skuMap.get(skuKey) || []);
|
||||
}
|
||||
return spuRecords;
|
||||
};
|
||||
|
||||
const sumDelayCount = (records: any[]) =>
|
||||
records.reduce((sum, record) => sum + resolveRecordCount(record), 0);
|
||||
|
||||
const getSpuDelayInfo = (spuItem: any) => {
|
||||
if (!isAiStoreOrder.value || !hasDelayRecords.value) {
|
||||
return { delayed: false, count: 0, text: '' };
|
||||
}
|
||||
const { spuRecords } = buildSpuRecordAssignment(spuItem);
|
||||
const count = sumDelayCount(spuRecords);
|
||||
if (!count) {
|
||||
return { delayed: false, count: 0, text: '' };
|
||||
}
|
||||
return { delayed: true, count, text: `${count}件` };
|
||||
};
|
||||
|
||||
const getSkuDelayRecords = (spuItem: any, skuItem: any) => {
|
||||
if (!isAiStoreOrder.value || !hasDelayRecords.value || !skuItem) return [];
|
||||
const skuItems = Array.isArray(spuItem?.items) && spuItem.items.length > 0 ? spuItem.items : [spuItem];
|
||||
const targetIndex = skuItems.findIndex((item) => item === skuItem);
|
||||
if (targetIndex < 0) {
|
||||
if (skuItem === spuItem && skuItems.length === 1) {
|
||||
return findMatchedRecords(spuItem, skuItem);
|
||||
}
|
||||
return [];
|
||||
}
|
||||
return findMatchedRecords(spuItem, skuItem);
|
||||
};
|
||||
|
||||
const getDelayRecordCount = (record: any) => resolveRecordCount(record) || 0;
|
||||
|
||||
const getDelayRecordSkuText = (record: any) => {
|
||||
const text = getFirstValidValue(
|
||||
formatSkuProperties(record?.properties),
|
||||
formatSkuProperties(record?.skuProperties),
|
||||
formatSkuProperties(record?.attrs),
|
||||
formatSkuProperties(record?.specs),
|
||||
formatSkuProperties(record?.specifications),
|
||||
getFirstValidValue(
|
||||
record?.skuText,
|
||||
record?.specText,
|
||||
record?.propertiesText,
|
||||
record?.propertiesValue,
|
||||
record?.skuValue,
|
||||
),
|
||||
getFirstValidValue(record?.skuDesc, record?.specDesc, record?.specification),
|
||||
getFirstValidValue(record?.sku, record?.specInfo, record?.attrText),
|
||||
);
|
||||
if (text && String(text).trim()) {
|
||||
return text;
|
||||
}
|
||||
return getFirstValidValue(record?.spuName, record?.name, record?.goodsName, record?.productName);
|
||||
};
|
||||
|
||||
const cancelAfterSale = (v: any) => {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确定要取消此申请吗?',
|
||||
confirmColor: '#FA7E31',
|
||||
success: async function (res) {
|
||||
success: async function (res: any) {
|
||||
if (!res.confirm) {
|
||||
return;
|
||||
}
|
||||
@@ -143,10 +547,11 @@
|
||||
const getOrderDetail = () => {
|
||||
emit('getOrderDetail');
|
||||
};
|
||||
const onCopy = (text) => {
|
||||
const onCopy = (text: any) => {
|
||||
sheep.$helper.copyText(text);
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.order_con {
|
||||
.con_item {
|
||||
@@ -175,6 +580,209 @@
|
||||
}
|
||||
}
|
||||
|
||||
.delay-tag {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
padding: 2rpx 12rpx;
|
||||
margin-left: 10rpx;
|
||||
border-radius: 16rpx;
|
||||
background: #FFF4EA;
|
||||
color: #FA7E31;
|
||||
font-size: 20rpx;
|
||||
line-height: 30rpx;
|
||||
white-space: nowrap;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.delay-tag--spu {
|
||||
font-size: 22rpx;
|
||||
line-height: 32rpx;
|
||||
}
|
||||
|
||||
.delay-tag--sku {
|
||||
font-size: 20rpx;
|
||||
line-height: 28rpx;
|
||||
}
|
||||
|
||||
.price {
|
||||
color: #ee0a24;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
|
||||
.multi-sku-list {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.multi-sku-item:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.multi-sku-row {
|
||||
height: 52rpx;
|
||||
}
|
||||
|
||||
.multi-sku-text {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
color: #777777;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
|
||||
.delay-record-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 10rpx 8rpx 10rpx 28rpx;
|
||||
margin-top: 8rpx;
|
||||
background: #FFF4EA;
|
||||
border-radius: 8rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.delay-record-line--status-1 {
|
||||
background: #FFF4EA;
|
||||
}
|
||||
|
||||
.delay-record-line--status-2 {
|
||||
background: #E8F9E7;
|
||||
}
|
||||
|
||||
.delay-record-line--status-3 {
|
||||
background: #E8F1FF;
|
||||
}
|
||||
|
||||
.delay-record-line--status-4 {
|
||||
background: #F5F5F5;
|
||||
}
|
||||
|
||||
.delay-record-line--status-0 {
|
||||
background: #FFF4EA;
|
||||
}
|
||||
|
||||
.delay-record-line--nested {
|
||||
margin-left: 8rpx;
|
||||
margin-right: 16rpx;
|
||||
}
|
||||
|
||||
.delay-record-line--single {
|
||||
margin-top: 12rpx;
|
||||
}
|
||||
|
||||
.delay-record-line__dot {
|
||||
position: absolute;
|
||||
left: 12rpx;
|
||||
top: 50%;
|
||||
width: 8rpx;
|
||||
height: 8rpx;
|
||||
border-radius: 50%;
|
||||
background: #FA7E31;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
|
||||
.delay-record-line--status-2 .delay-record-line__dot {
|
||||
background: #1AAD19;
|
||||
}
|
||||
|
||||
.delay-record-line--status-3 .delay-record-line__dot {
|
||||
background: #1677FF;
|
||||
}
|
||||
|
||||
.delay-record-line--status-4 .delay-record-line__dot {
|
||||
background: #999999;
|
||||
}
|
||||
|
||||
.delay-record-line--status-0 .delay-record-line__dot {
|
||||
background: #FA7E31;
|
||||
}
|
||||
|
||||
.delay-record-line__text {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
font-size: 22rpx;
|
||||
line-height: 32rpx;
|
||||
color: #FA7E31;
|
||||
overflow: hidden;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.delay-record-line--status-2 .delay-record-line__text {
|
||||
color: #1AAD19;
|
||||
}
|
||||
|
||||
.delay-record-line--status-3 .delay-record-line__text {
|
||||
color: #1677FF;
|
||||
}
|
||||
|
||||
.delay-record-line--status-4 .delay-record-line__text {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.delay-record-line--status-0 .delay-record-line__text {
|
||||
color: #FA7E31;
|
||||
}
|
||||
|
||||
.delay-record-line__meta {
|
||||
flex-shrink: 0;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
margin-left: 12rpx;
|
||||
gap: 12rpx;
|
||||
}
|
||||
|
||||
.delay-record-line__status {
|
||||
font-size: 20rpx;
|
||||
line-height: 30rpx;
|
||||
padding: 2rpx 12rpx;
|
||||
border-radius: 16rpx;
|
||||
background: rgba(250, 126, 49, 0.1);
|
||||
color: #FA7E31;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.delay-record-line--status-2 .delay-record-line__status {
|
||||
background: rgba(26, 173, 25, 0.1);
|
||||
color: #1AAD19;
|
||||
}
|
||||
|
||||
.delay-record-line--status-3 .delay-record-line__status {
|
||||
background: rgba(22, 119, 255, 0.1);
|
||||
color: #1677FF;
|
||||
}
|
||||
|
||||
.delay-record-line--status-4 .delay-record-line__status {
|
||||
background: rgba(153, 153, 153, 0.1);
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.delay-record-line--status-0 .delay-record-line__status {
|
||||
background: rgba(250, 126, 49, 0.1);
|
||||
color: #FA7E31;
|
||||
}
|
||||
|
||||
.delay-record-line__count {
|
||||
flex-shrink: 0;
|
||||
font-size: 22rpx;
|
||||
line-height: 32rpx;
|
||||
font-weight: 600;
|
||||
color: #FA7E31;
|
||||
}
|
||||
|
||||
.delay-record-line--status-2 .delay-record-line__count {
|
||||
color: #1AAD19;
|
||||
}
|
||||
|
||||
.delay-record-line--status-3 .delay-record-line__count {
|
||||
color: #1677FF;
|
||||
}
|
||||
|
||||
.delay-record-line--status-4 .delay-record-line__count {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.delay-record-line--status-0 .delay-record-line__count {
|
||||
color: #FA7E31;
|
||||
}
|
||||
|
||||
.price {
|
||||
color: #ee0a24;
|
||||
font-size: 24rpx;
|
||||
|
||||
Reference in New Issue
Block a user