revert: 所有代码与custom/common分支同

This commit is contained in:
2026-01-05 15:56:49 +08:00
parent 8ef6975ee1
commit 60a0e5133e
219 changed files with 14860 additions and 15585 deletions

View File

@@ -1,27 +1,22 @@
<template>
<view :style="themeColor">
<scroll-view class="order-nav" :scroll-x="true" :show-scrollbar="false">
<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="uni-tab-item"
@click="ontabtap(packageIndex)">
<text class="uni-tab-item-title"
:class="packageIndex == currIndex ? 'uni-tab-item-title-active color-base-border color-base-text' : ''">
<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="uni-tab-item" @click="ontabtap(packageIndex)">
<text class="uni-tab-item-title" :class="packageIndex == currIndex ? 'uni-tab-item-title-active color-base-border color-base-text' : ''">
{{ packageItem.package_name }}
</text>
</view>
</scroll-view>
<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="swiper-item"
v-show="packageIndex == currIndex">
<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="swiper-item" v-show="packageIndex == currIndex">
<view class="container">
<view class="goods-wrap">
<view class="body">
<view class="goods" v-for="(goodsItem, goodsIndex) in packageItem.goods_list" :key="goodsIndex">
<view class="goods-img" @click="toGoodsDetail(goodsItem.sku_id)">
<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
@error="imageError(packageIndex, goodsIndex)" mode="aspectFill"></image>
<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(packageIndex, goodsIndex)" mode="aspectFill"></image>
</view>
<view class="goods-info">
<view @click="toGoodsDetail(goodsItem.sku_id)" class="goods-name">{{ goodsItem.sku_name
}}</view>
<view @click="toGoodsDetail(goodsItem.sku_id)" class="goods-name">{{ goodsItem.sku_name }}</view>
<view class="goods-sub-section">
<view>
<text>
@@ -36,9 +31,7 @@
</view>
<view class="express-company-wrap" v-if="packageItem.delivery_type == 1">
<view class="company-logo">
<image :src="$util.img(packageItem.express_company_image)"></image>
</view>
<view class="company-logo"><image :src="$util.img(packageItem.express_company_image)"></image></view>
<view class="info">
<view class="company">
<text>承运公司 {{ packageItem.express_company_name }}</text>
@@ -55,14 +48,16 @@
<view class="track-wrap" v-if="packageItem.delivery_type == 1">
<block v-if="packageItem.trace.success && packageItem.trace.list.length != 0">
<view class="track-item" v-for="(traceItem, traceIndex) in packageItem.trace.list"
:class="traceIndex == 0 ? 'active' : ''" :key="traceIndex">
<view
class="track-item"
v-for="(traceItem, traceIndex) in packageItem.trace.list"
:class="traceIndex == 0 ? 'active' : ''"
:key="traceIndex"
>
<view class="dot" :class="traceIndex == 0 ? 'color-base-bg' : ''"></view>
<view class="msg">
<view class="text" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.remark
}}</view>
<view class="time" :class="traceIndex == 0 ? 'color-base-text' : ''">{{
traceItem.datetime }}</view>
<view class="text" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.remark }}</view>
<view class="time" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.datetime }}</view>
</view>
</view>
</block>
@@ -81,9 +76,6 @@
<script>
export default {
components: {
loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
},
data() {
return {
orderId: '',
@@ -135,7 +127,7 @@ export default {
title: '未获取到订单信息!'
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/base/list');
this.$util.redirectTo('/pages_order/list');
}, 1500);
}
},
@@ -151,7 +143,7 @@ export default {
this.packageList[packageIndex].goods_list[goodsIndex].sku_image = this.$util.getDefaultImage().goods;
this.$forceUpdate();
},
copyDeliveryNo(value) {
copyDeliveryNo(value){
this.$util.copy(value);
}
}
@@ -160,7 +152,6 @@ export default {
<style lang="scss">
@import './public/css/logistics.scss';
/deep/.uni-scroll-view ::-webkit-scrollbar {
/* 隐藏滚动条,但依旧具备可以滚动的功能 */
display: none;
@@ -169,7 +160,6 @@ export default {
color: transparent;
background: transparent;
}
/deep/::-webkit-scrollbar {
display: none;
width: 0;