From dc1c231697b7d0eeb42d7f71d311ca2f6534ab4b Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sun, 23 Apr 2023 10:27:44 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E5=BF=AB=E9=80=92=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/goods/goods_logistics/index.vue     | 596 +++++++++---------
 1 file changed, 300 insertions(+), 296 deletions(-)

diff --git a/template/uni-app/pages/goods/goods_logistics/index.vue b/template/uni-app/pages/goods/goods_logistics/index.vue
index c9f8bc871..30837206f 100644
--- a/template/uni-app/pages/goods/goods_logistics/index.vue
+++ b/template/uni-app/pages/goods/goods_logistics/index.vue
@@ -1,297 +1,301 @@
-<template>
-	<view :style="colorStyle">
-		<view class='logistics'>
-			<view class='header acea-row row-between row-top' v-for="(item,index) in product" :key="index">
-				<view class='pictrue'>
-					<image :src='item.productInfo.image'></image>
-				</view>
-				<view class='text acea-row row-between'>
-					<view class='name line2'>{{item.productInfo.store_name}}</view>
-					<view class='money'>
-						<view>{{$t(`￥`)}}{{(parseFloat(item.truePrice)+parseFloat(item.postage_price/item.cart_num)).toFixed(2)}}</view>
-						<view>x{{item.cart_num}}</view>
-					</view>
-				</view>
-			</view>
-			<view class='logisticsCon'>
-				<view class='company acea-row row-between-wrapper'>
-					<view class='picTxt acea-row row-between-wrapper'>
-						<view class='iconfont icon-wuliu'></view>
-						<view class='text'>
-							<view><text class='name line1'>{{$t(`快递公司`)}}：</text> {{orderInfo.delivery_name}}</view>
-							<view class='express line1'><text class='name'>{{$t(`快递单号`)}}：</text> {{orderInfo.delivery_id}}</view>
-						</view>
-					</view>
-					<!-- #ifndef H5 -->
-					<view class='copy' @tap='copyOrderId'>{{$t(`复制`)}}</view>
-					<!-- #endif -->
-					<!-- #ifdef H5 -->
-					<view class='copy copy-data' :data-clipboard-text="orderInfo.delivery_id">{{$t(`复制`)}}</view>
-					<!-- #endif -->
-				</view>
-				<view class='item' v-for="(item,index) in expressList" :key="index">
-					<view class='circular' :class='index === 0 ? "on":""'></view>
-					<view class='text' :class='index===0 ? "on-font on":""'>
-						<view>{{item.status}}</view>
-						<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
-					</view>
-				</view>
-			</view>
-			<recommend :hostProduct='hostProduct'></recommend>
-		</view>
-		<!-- #ifdef MP -->
-		<!-- <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		express
-	} from '@/api/order.js';
-	import {
-		getProductHot
-	} from '@/api/store.js';
-	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import recommend from '@/components/recommend';
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import colors from "@/mixins/color";
-	export default {
-		components: {
-			recommend,
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		mixins: [colors],
-		data() {
-			return {
-				orderId: '',
-				product: [],
-				orderInfo: {},
-				expressList: [],
-				hostProduct: []
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		watch: {
-			isLogin: {
-				handler: function(newV, oldV) {
-					if (newV) {
-						this.getExpress();
-						this.get_host_product();
-					}
-				},
-				deep: true
-			}
-		},
-		onLoad: function(options) {
-			if (!options.orderId) return this.$util.Tips({
-				title: this.$t(`缺少订单号`)
-			});
-			this.orderId = options.orderId;
-			this.type = options.type;
-			if (this.isLogin) {
-				this.getExpress();
-				this.get_host_product();
-			} else {
-				toLogin();
-			}
-		},
-		onReady: function() {
-			// #ifdef H5
-			this.$nextTick(function() {
-				const clipboard = new ClipboardJS(".copy-data");
-				clipboard.on("success", () => {
-					this.$util.Tips({
-						title: this.$t(`复制成功`)
-					});
-				});
-			});
-			// #endif
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-			uni.$emit('scroll');
-		},
-		methods: {
-			/**
-			 * 授权回调
-			 */
-			onLoadFun: function() {
-				this.getExpress();
-				this.get_host_product();
-			},
-			copyOrderId: function() {
-				uni.setClipboardData({
-					data: this.orderInfo.delivery_id
-				});
-			},
-			getExpress: function() {
-				let that = this;
-				express(that.orderId,that.type).then(function(res) {
-					let result = res.data.express.result || {};
-					that.$set(that, 'product', res.data.order.cartInfo || []);
-					that.$set(that, 'orderInfo', res.data.order);
-					that.$set(that, 'expressList', result.list || []);
-				}).catch((error) => {
-					this.$util.Tips({
-						title: error
-					});
-				});
-			},
-			/**
-			 * 获取我的推荐
-			 */
-			get_host_product: function() {
-				let that = this;
-				getProductHot().then(function(res) {
-					that.$set(that, 'hostProduct', res.data);
-				});
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.logistics .header {
-		padding: 23rpx 30rpx;
-		background-color: #fff;
-		height: 166rpx;
-		box-sizing: border-box;
-	}
-
-	.logistics .header .pictrue {
-		width: 120rpx;
-		height: 120rpx;
-	}
-
-	.logistics .header .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.logistics .header .text {
-		width: 540rpx;
-		font-size: 28rpx;
-		color: #999;
-		margin-top: 6rpx;
-	}
-
-	.logistics .header .text .name {
-		width: 365rpx;
-		color: #282828;
-	}
-
-	.logistics .header .text .money {
-		text-align: right;
-	}
-
-	.logistics .logisticsCon {
-		background-color: #fff;
-		margin: 12rpx 0;
-	}
-
-	.logistics .logisticsCon .company {
-		height: 120rpx;
-		margin: 0 0 45rpx 30rpx;
-		padding-right: 30rpx;
-		border-bottom: 1rpx solid #f5f5f5;
-	}
-
-	.logistics .logisticsCon .company .picTxt {
-		width: 520rpx;
-	}
-
-	.logistics .logisticsCon .company .picTxt .iconfont {
-		width: 50rpx;
-		height: 50rpx;
-		background-color: #666;
-		text-align: center;
-		line-height: 50rpx;
-		color: #fff;
-		font-size: 35rpx;
-	}
-
-	.logistics .logisticsCon .company .picTxt .text {
-		width: 450rpx;
-		font-size: 26rpx;
-		color: #282828;
-	}
-
-	.logistics .logisticsCon .company .picTxt .text .name {
-		color: #999;
-	}
-
-	.logistics .logisticsCon .company .picTxt .text .express {
-		margin-top: 5rpx;
-	}
-
-	.logistics .logisticsCon .company .copy {
-		font-size: 20rpx;
-		width: 106rpx;
-		text-align: center;
-		border-radius: 3rpx;
-		border: 1px solid #999;
-		padding: 3rpx 0;
-	}
-
-	.logistics .logisticsCon .item {
-		padding: 0 40rpx;
-		position: relative;
-	}
-
-	.logistics .logisticsCon .item .circular {
-		width: 20rpx;
-		height: 20rpx;
-		border-radius: 50%;
-		position: absolute;
-		top: -1rpx;
-		left: 31.5rpx;
-		background-color: #ddd;
-	}
-
-	.logistics .logisticsCon .item .circular.on {
-		background-color: var(--view-theme);
-	}
-
-	.logistics .logisticsCon .item .text.on-font {
-		color: var(--view-theme);
-	}
-
-	.logistics .logisticsCon .item .text .data.on-font {
-		color: var(--view-theme);
-	}
-
-	.logistics .logisticsCon .item .text {
-		font-size: 26rpx;
-		color: #666;
-		width: 615rpx;
-		border-left: 1rpx solid #e6e6e6;
-		padding: 0 0 60rpx 38rpx;
-	}
-
-	.logistics .logisticsCon .item .text.on {
-		border-left-color: var(--view-minorColor);
-	}
-
-	.logistics .logisticsCon .item .text .data {
-		font-size: 24rpx;
-		color: #999;
-		margin-top: 10rpx;
-	}
-
-	.logistics .logisticsCon .item .text .data .time {
-		margin-left: 15rpx;
-	}
+<template>
+	<view :style="colorStyle">
+		<view class='logistics' v-if="product.length">
+			<view class='header acea-row row-between row-top' v-for="(item,index) in product" :key="index">
+				<view class='pictrue'>
+					<image :src='item.productInfo.image'></image>
+				</view>
+				<view class='text acea-row row-between'>
+					<view class='name line2'>{{item.productInfo.store_name}}</view>
+					<view class='money'>
+						<view>
+							{{$t(`￥`)}}{{(parseFloat(item.truePrice)+parseFloat(item.postage_price/item.cart_num)).toFixed(2)}}
+						</view>
+						<view>x{{item.cart_num}}</view>
+					</view>
+				</view>
+			</view>
+			<view class='logisticsCon'>
+				<view class='company acea-row row-between-wrapper'>
+					<view class='picTxt acea-row row-between-wrapper'>
+						<view class='iconfont icon-wuliu'></view>
+						<view class='text'>
+							<view><text class='name line1'>{{$t(`快递公司`)}}：</text> {{orderInfo.delivery_name}}</view>
+							<view class='express line1'><text class='name'>{{$t(`快递单号`)}}：</text>
+								{{orderInfo.delivery_id}}
+							</view>
+						</view>
+					</view>
+					<!-- #ifndef H5 -->
+					<view class='copy' @tap='copyOrderId'>{{$t(`复制`)}}</view>
+					<!-- #endif -->
+					<!-- #ifdef H5 -->
+					<view class='copy copy-data' :data-clipboard-text="orderInfo.delivery_id">{{$t(`复制`)}}</view>
+					<!-- #endif -->
+				</view>
+				<view class='item' v-for="(item,index) in expressList" :key="index">
+					<view class='circular' :class='index === 0 ? "on":""'></view>
+					<view class='text' :class='index===0 ? "on-font on":""'>
+						<view>{{item.status}}</view>
+						<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
+					</view>
+				</view>
+			</view>
+			<recommend :hostProduct='hostProduct'></recommend>
+		</view>
+		<!-- #ifdef MP -->
+		<!-- <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		express
+	} from '@/api/order.js';
+	import {
+		getProductHot
+	} from '@/api/store.js';
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import recommend from '@/components/recommend';
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	// #endif
+	import colors from "@/mixins/color";
+	export default {
+		components: {
+			recommend,
+			// #ifdef MP
+			authorize
+			// #endif
+		},
+		mixins: [colors],
+		data() {
+			return {
+				orderId: '',
+				product: [],
+				orderInfo: {},
+				expressList: [],
+				hostProduct: []
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getExpress();
+						this.get_host_product();
+					}
+				},
+				deep: true
+			}
+		},
+		onLoad: function(options) {
+			if (!options.orderId) return this.$util.Tips({
+				title: this.$t(`缺少订单号`)
+			});
+			this.orderId = options.orderId;
+			this.type = options.type;
+			if (this.isLogin) {
+				this.getExpress();
+				this.get_host_product();
+			} else {
+				toLogin();
+			}
+		},
+		onReady: function() {
+			// #ifdef H5
+			this.$nextTick(function() {
+				const clipboard = new ClipboardJS(".copy-data");
+				clipboard.on("success", () => {
+					this.$util.Tips({
+						title: this.$t(`复制成功`)
+					});
+				});
+			});
+			// #endif
+		},
+		// 滚动监听
+		onPageScroll(e) {
+			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+			uni.$emit('scroll');
+		},
+		methods: {
+			/**
+			 * 授权回调
+			 */
+			onLoadFun: function() {
+				this.getExpress();
+				this.get_host_product();
+			},
+			copyOrderId: function() {
+				uni.setClipboardData({
+					data: this.orderInfo.delivery_id
+				});
+			},
+			getExpress: function() {
+				let that = this;
+				express(that.orderId, that.type).then(function(res) {
+					let result = res.data.express.result || {};
+					that.$set(that, 'product', res.data.order.cartInfo || []);
+					that.$set(that, 'orderInfo', res.data.order);
+					that.$set(that, 'expressList', result.list || []);
+				}).catch((error) => {
+					this.$util.Tips({
+						title: error
+					});
+				});
+			},
+			/**
+			 * 获取我的推荐
+			 */
+			get_host_product: function() {
+				let that = this;
+				getProductHot().then(function(res) {
+					that.$set(that, 'hostProduct', res.data);
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.logistics .header {
+		padding: 23rpx 30rpx;
+		background-color: #fff;
+		height: 166rpx;
+		box-sizing: border-box;
+	}
+
+	.logistics .header .pictrue {
+		width: 120rpx;
+		height: 120rpx;
+	}
+
+	.logistics .header .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
+
+	.logistics .header .text {
+		width: 540rpx;
+		font-size: 28rpx;
+		color: #999;
+		margin-top: 6rpx;
+	}
+
+	.logistics .header .text .name {
+		width: 365rpx;
+		color: #282828;
+	}
+
+	.logistics .header .text .money {
+		text-align: right;
+	}
+
+	.logistics .logisticsCon {
+		background-color: #fff;
+		margin: 12rpx 0;
+	}
+
+	.logistics .logisticsCon .company {
+		height: 120rpx;
+		margin: 0 0 45rpx 30rpx;
+		padding-right: 30rpx;
+		border-bottom: 1rpx solid #f5f5f5;
+	}
+
+	.logistics .logisticsCon .company .picTxt {
+		width: 520rpx;
+	}
+
+	.logistics .logisticsCon .company .picTxt .iconfont {
+		width: 50rpx;
+		height: 50rpx;
+		background-color: #666;
+		text-align: center;
+		line-height: 50rpx;
+		color: #fff;
+		font-size: 35rpx;
+	}
+
+	.logistics .logisticsCon .company .picTxt .text {
+		width: 450rpx;
+		font-size: 26rpx;
+		color: #282828;
+	}
+
+	.logistics .logisticsCon .company .picTxt .text .name {
+		color: #999;
+	}
+
+	.logistics .logisticsCon .company .picTxt .text .express {
+		margin-top: 5rpx;
+	}
+
+	.logistics .logisticsCon .company .copy {
+		font-size: 20rpx;
+		width: 106rpx;
+		text-align: center;
+		border-radius: 3rpx;
+		border: 1px solid #999;
+		padding: 3rpx 0;
+	}
+
+	.logistics .logisticsCon .item {
+		padding: 0 40rpx;
+		position: relative;
+	}
+
+	.logistics .logisticsCon .item .circular {
+		width: 20rpx;
+		height: 20rpx;
+		border-radius: 50%;
+		position: absolute;
+		top: -1rpx;
+		left: 31.5rpx;
+		background-color: #ddd;
+	}
+
+	.logistics .logisticsCon .item .circular.on {
+		background-color: var(--view-theme);
+	}
+
+	.logistics .logisticsCon .item .text.on-font {
+		color: var(--view-theme);
+	}
+
+	.logistics .logisticsCon .item .text .data.on-font {
+		color: var(--view-theme);
+	}
+
+	.logistics .logisticsCon .item .text {
+		font-size: 26rpx;
+		color: #666;
+		width: 615rpx;
+		border-left: 1rpx solid #e6e6e6;
+		padding: 0 0 60rpx 38rpx;
+	}
+
+	.logistics .logisticsCon .item .text.on {
+		border-left-color: var(--view-minorColor);
+	}
+
+	.logistics .logisticsCon .item .text .data {
+		font-size: 24rpx;
+		color: #999;
+		margin-top: 10rpx;
+	}
+
+	.logistics .logisticsCon .item .text .data .time {
+		margin-left: 15rpx;
+	}
 </style>