6.21

commont/messages.js

@@ -242,7 +242,7 @@ export default {
 			successful: '下单成功',
 			pickpackage: "待快递员上门取件",
 			Ordertime: '下单时间',
-			switch: '更换',
+			// switch: '更换',
 			Popularshipment: '热门寄件',
 
 			manage: '管理',
@@ -503,7 +503,7 @@ export default {
 			successful: 'Successful',
 			pickpackage: 'Waiting for Courier Pickup',
 			Ordertime: 'Order Time',
-			switch: 'Switch',
+			// switch: 'Switch',
 			Popularshipment: 'Popular Shipment',
 
 			manage: 'Management',
@@ -766,7 +766,7 @@ export default {
 			successful: 'exitoso',
 			pickpackage: 'esperando recogida del mensajero',
 			Ordertime: 'hora del pedido',
-			switch: 'cambio',
+			// switch: 'cambio',
 			Popularshipment: 'envío popular',
 
 			manage: 'gestionar',

pageC/myPackage/component/packageCard.vue

@@ -0,0 +1,226 @@
+<template>
+	<view class="card" @click="$emit('toInformation',itemInfo.orderStatus)">
+		<view class="top-detail">
+			<view class="top-left">
+				<view class="_label-1" v-if="itemInfo.labelStatus == 0">
+					平台自购
+				</view>
+				<view class="_label-2" v-if="itemInfo.labelStatus == 1">
+					自寄
+				</view>
+				<view class="order-num">
+					<text>订单编号：</text>
+					<text>4873221093105892</text>
+				</view>
+			</view>
+			<view class="top-right">
+				{{orderDetail}}
+			</view>
+		</view>
+		<view class="content-center">
+			<view class="center-left-right">
+				<view class="address">
+					上海市
+				</view>
+				<view class="name">
+					陈盼盼
+				</view>
+			</view>
+			<image class="arrow" src="../../../static/mine/337.png" mode=""></image>
+			<view class="center-left-right">
+				<view class="address">
+					洛杉矶
+				</view>
+				<view class="name">
+					Curtis Morris
+				</view>
+			</view>
+		</view>
+		<view class="price" v-if="itemInfo.orderStatus == 1">
+			<text style="font-size: 24rpx;color: #333;">合计</text>
+			<view style="color: #f83224;font-weight: 600;">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+		<view class="card-bottom">
+			<view class="package-weight">
+				<text>包裹重量：</text>
+				<text>45kg</text>
+			</view>
+			<view class="btn-list">
+				<button class="btn-2" v-show="itemInfo.orderStatus!=4&&itemInfo.orderStatus!=3" @click.stop="freeze">冻结</button>
+				<button class="btn-2" v-show="itemInfo.orderStatus != 1&&itemInfo.orderStatus!=4" @click.stop="$emit('toInformation',itemInfo.orderStatus)">查看详情</button>
+				<button class="btn-1" v-show="itemInfo.orderStatus == 1">立即付款</button>
+				<button class="btn-1" v-show="itemInfo.orderStatus == 4">去寄件</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			itemInfo: {
+				typeof: Object,
+				default: {}
+			}
+		},
+		computed: {
+			orderDetail() {
+				if (this.itemInfo.orderStatus == 0) {
+					return "待平台收货"
+				} else if (this.itemInfo.orderStatus == 1) {
+					return "待付款"
+				} else if (this.itemInfo.orderStatus == 2) {
+					return "待发货"
+				} else if (this.itemInfo.orderStatus == 3) {
+					return "拼包中"
+				} else if (this.itemInfo.orderStatus == 4) {
+					return "待寄件"
+				}
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods:{
+			freeze(){}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		padding: 28rpx 20rpx 0;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 20rpx;
+
+		.top-detail {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.top-left {
+				display: flex;
+				align-items: center;
+
+				._label-1 {
+					padding: 4rpx 8rpx;
+					background-color: #FF1515;
+					border-radius: 4rpx;
+					color: #fff;
+					font-size: 20rpx;
+					margin-right: 10rpx;
+				}
+
+				._label-2 {
+					padding: 4rpx 8rpx;
+					background-color: #FF6700;
+					border-radius: 4rpx;
+					color: #fff;
+					font-size: 20rpx;
+					margin-right: 10rpx;
+				}
+
+				.order-num {
+					font-size: 26rpx;
+					color: #333333;
+				}
+			}
+
+			.top-right {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
+
+		.content-center {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+			margin-top: 44rpx;
+			margin-bottom: 40rpx;
+
+			.arrow {
+				width: 130rpx;
+				height: 10rpx;
+			}
+
+			.center-left-right {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+
+				.address {
+					font-weight: 600;
+				}
+
+				.name {
+					font-size: 24rpx;
+					color: rgba(34, 34, 34, .7);
+					margin-top: 10rpx;
+				}
+			}
+		}
+
+		.price {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			margin-bottom: 28rpx;
+		}
+
+		.card-bottom {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 30rpx 0 28rpx;
+			border-top: 2rpx solid rgba(151, 151, 151, .2);
+
+			.package-weight {
+				font-size: 26rpx;
+				color: #444444;
+			}
+
+			.btn-list {
+				display: flex;
+
+				.btn-1 {
+					font-size: 28rpx;
+					color: #fff;
+					// border: 2rpx solid #f83224;
+					background-color: #f83224;
+					margin: 0;
+					border-radius: 34rpx;
+					min-width: 132rpx;
+					margin-left: 20rpx;
+					height: 68rpx;
+					line-height: 68rpx;
+				}
+
+				.btn-2 {
+					font-size: 28rpx;
+					color: #222;
+					border: 2rpx solid rgba(151, 151, 151, .7);
+					background-color: #fff;
+					margin: 0;
+					border-radius: 34rpx;
+					padding: 0;
+					min-width: 132rpx;
+					margin-left: 20rpx;
+					padding: 0 20rpx;
+					height: 68rpx;
+					line-height: 68rpx;
+
+				}
+			}
+
+		}
+	}
+</style>

pageC/myPackage/myPackage.vue

@@ -3,15 +3,64 @@
 		<view class="top-search">
 			<u--input placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle"
 				prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;"></u--input>
+			<view class="top-tab">
+				<view :class="{commodity:follow==1}" class="tab" @click="tabSwitch(1)">
+					发往中转点
+				</view>
+				<view :class="{commodity:follow==2}" class="tab" @click="tabSwitch(2)">
+					中转已签收
+				</view>
+				<view :class="{commodity:follow==3}" class="tab" @click="tabSwitch(3)">
+					正发往海外
+				</view>
+			</view>
+
+		</view>
+
+		<view class="content">
+			<view class="prompt" v-if="weights >=300">
+				<image class="prompt-icon" src="../../static/mine/336.png" mode=""></image>
+				当前页面加载的订单总重量300kg
+			</view>
+			<view v-for="item in orderList" :key="item.orderStatus">
+				<PackageCard :itemInfo="item" @toInformation="toInformation"/>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import PackageCard from './component/packageCard.vue';
 	export default {
+		components:{
+			PackageCard
+		},
 		data() {
 			return {
-
+				follow: 1,
+				weights: 300,
+				orderList:[
+					{
+						labelStatus:0,
+						orderStatus:0,
+					},
+					{
+						labelStatus:1,
+						orderStatus:1,
+					},
+					{
+						labelStatus:1,
+						orderStatus:2,
+					},
+					{
+						labelStatus:0,
+						orderStatus:3,
+					},
+					{
+						labelStatus:0,
+						orderStatus:4,
+					},
+				]
 			};
 		},
 		computed: {
@@ -19,20 +68,89 @@
 				return this.$t('index')
 			}
 		},
+		methods: {
+			tabSwitch(num) {
+				this.follow = num
+			},
+			toInformation(id){
+				uni.navigateTo({
+					url:`/pageD/orderInformation/orderInformation?orderStatus=${id}`,
+					
+				})
+			}
+		},
 		created() {
 			uni.setNavigationBarTitle({
 				title: this.i18n.myPackage
 			})
-		}
+		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	.top-search{
+	.top-search {
 		background-color: #fff;
 		padding: 20rpx 24rpx;
 	}
-	/deep/.u-input{
+
+	/deep/.u-input {
 		background-color: #f4f4f4;
 	}
+
+	.top-tab {
+		margin-top: 10rpx;
+		display: flex;
+		justify-content: space-between;
+		overflow-y: auto;
+		// flex-shrink: 1;
+		width: 100vw;
+
+		.tab {
+			margin-right: 40rpx;
+			font-size: 26rpx;
+			color: #555;
+			flex-shrink: 0;
+			height: 44rpx;
+			display: flex;
+			align-items: flex-end;
+			font-size: 32rpx;
+		}
+
+		.commodity {
+			position: relative;
+			font-weight: 600;
+			color: #222;
+		}
+
+		.commodity::before {
+			content: '';
+			display: block;
+			height: 8rpx;
+			width: 100%;
+			background: linear-gradient(to right, #f83224, #fff);
+			position: absolute;
+			bottom: 5rpx;
+			opacity: 0.8;
+		}
+	}
+
+	.content {
+		padding: 20rpx 24rpx;
+
+		.prompt {
+			background-color: #FBE8E6;
+			border-radius: 10rpx;
+			padding: 16rpx 22rpx;
+			font-size: 24rpx;
+			display: flex;
+			align-items: center;
+			color: #f83224;
+
+			.prompt-icon {
+				width: 36rpx;
+				height: 36rpx;
+				margin-right: 20rpx;
+			}
+		}
+	}
 </style>

pageC/refundDetail/refundDetail.vue

@@ -28,7 +28,7 @@
 		data() {
 			return {
 				show: false,
-				status:3
+				status:1
 			};
 		},
 		methods: {

pageD/components/goodsInformation.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="detail" @click="$emit('toDetail')">
+	<view class="detail" @click="$emit('toDetail')" :style="isPadding">
 		<view class="content">
 			<image
 				src="https://img14.360buyimg.com/jdcms/s460x460_jfs/t1/229465/15/14432/86913/6631bc7cF31d5200b/63dd6b0e1dc4e73c.jpg.webp"
@@ -80,6 +80,13 @@
 					price: "75.00"
 				}
 			}
+		},
+		computed:{
+			isPadding(){
+				if(this.productAndCommodity == 'product'){
+					return "padding: 28rpx 20rpx 20rpx;"
+				}
+			}
 		}
 	}
 </script>
@@ -90,7 +97,7 @@
 		border-radius: 16rpx;
 		margin: 10rpx 0;
 		width: 96%;
-
+		
 		.content {
 			display: flex;
 			position: relative;

pageD/index.vue

@@ -1,6 +1,5 @@
 <template>
 	<view>
-		
 	</view>
 </template>
 

pageD/logisticsProgress/logisticsProgress.vue

@@ -0,0 +1,224 @@
+<template>
+	<view class="page">
+		<view class="top-detail">
+			<view class="title">
+				发往仓库
+			</view>
+			<image class="arrow" src="../../static/mine/339.png" mode=""></image>
+			<view class="title">
+				仓库打包
+			</view>
+			<image class="arrow" src="../../static/mine/340.png" mode=""></image>
+			<view class="title">
+				洛杉矶
+			</view>
+		</view>
+		<view class="logistics">
+			<view class="logistics-detail">
+				<view class="">
+					{{"顺丰快递"+"&nbsp;"+"|"+"&nbsp"+"订单号："}}
+					<text>JDV21093105892</text>
+				</view>
+				<view class="phone">
+					<text @click="cope('JDV21093105892')">复制</text>
+					{{"&nbsp;"+"|"+"&nbsp"}}
+					<text @click="makeCall">打电话</text>
+				</view>
+			</view>
+			<view class="logistics-information">
+				<view v-for="(item,index) in logisticsList" :key="index" class="information">
+					<view class="basis">
+						<view class="dot" v-if="item.title" :style="item.status?'background-color:#f83224':''">
+						</view>
+						<view class="dot-1" v-else :style="item.status?'background-color:#f83224':''">
+						</view>
+
+						<view class="name" :style="item.status?'color:#f83224':''">
+							{{item.title}}
+						</view>
+						<view class="time" :style="item.status?'color:#f83224':''">
+							{{item.time}}
+						</view>
+					</view>
+					<view class="shu" v-show="index < logisticsList.length-1"> </view>
+					<view class="does" :id="'does'+index" :style="item.status?'color:#333':''">
+						{{ item.does }}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				logisticsList: [{
+						title: "已签收",
+						time: "10:11",
+						status: true,
+						does: "您的快件已暂存至浦口东方万汇城北区2号楼超市店菜鸟驿站，请凭取件码及时领取。"
+					}, {
+						title: "派送中",
+						time: "10:11",
+						status: false,
+						does: "临沂市配送员【叶景瑞】 187626516732 正为您派送，感谢您的耐心等待"
+					}, {
+						title: "",
+						time: "10:11",
+						status: false,
+						does: "临沂市配送员【叶景瑞】 187626516732 正为您派送，感谢您的耐心等待"
+					},
+					{
+
+						title: "运输中",
+						time: "10:11",
+						status: false,
+						does: "快递离开******"
+					}
+				]
+			}
+		},
+		computed: {},
+		methods: {
+
+			cope(str) {
+				uni.setClipboardData({
+					data: str,
+					success() {
+						uni.showToast({
+							title: "复制成功",
+							icon: "none"
+						})
+					}
+				})
+			},
+			makeCall() {
+				uni.authorize({
+					scope: 'scope.makePhoneCall',
+					success: () => {
+						uni.makePhoneCall({
+							phoneNumber: '手机号码',
+							success: () => {
+								console.log('拨打电话成功！');
+							},
+							fail: () => {
+								console.error('拨打电话失败！');
+							}
+						});
+					},
+					fail: () => {
+						console.error('授权失败，请允许拨打电话权限！');
+					}
+				});
+			}
+		},
+		created() {
+			uni.setNavigationBarTitle({
+				title: "物流进度"
+			})
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		padding: 20rpx 24rpx;
+
+		.top-detail {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+			height: 144rpx;
+			background: linear-gradient(180deg, #F6E1DE 0%, #EFEFEF 100%);
+			border-radius: 16rpx 16rpx 0 0;
+
+			.title {
+				color: rgba(34, 34, 34, .6);
+				font-size: 32rpx;
+			}
+
+			.arrow {
+				width: 98rpx;
+				height: 8rpx;
+			}
+		}
+
+		.logistics {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 20rpx;
+			position: relative;
+			top: -20rpx;
+
+			.logistics-detail {
+				display: flex;
+				justify-content: space-between;
+				font-size: 26rpx;
+				color: #333;
+				height: 104rpx;
+				align-items: center;
+				border-bottom: 2rpx solid rgba(151, 151, 151, .2);
+
+			}
+
+			.logistics-information {
+				padding: 20rpx 0;
+
+				.information {
+
+					position: relative;
+				}
+			}
+
+			.basis {
+				display: flex;
+				align-items: center;
+
+				.dot {
+					border-radius: 50%;
+					background-color: rgba(227, 227, 227, 1);
+					width: 18rpx;
+					height: 18rpx;
+					margin-right: 20rpx;
+					z-index: 100;
+				}
+
+				.dot-1 {
+					border-radius: 50%;
+					background-color: rgba(227, 227, 227, 1);
+					width: 10rpx;
+					height: 10rpx;
+					margin-right: 20rpx;
+					margin-left: 4rpx;
+					z-index: 100;
+				}
+
+				.name {
+					font-size: 28rpx;
+					margin-right: 20rpx;
+				}
+
+				.time {
+					font-size: 24rpx;
+				}
+			}
+
+			.shu {
+				position: absolute;
+				height: 126rpx;
+				width: 2rpx;
+				background-color: rgba(151, 151, 151, .6);
+				left: 8rpx;
+				top: 22rpx;
+			}
+
+			.does {
+				font-size: 24rpx;
+				color: rgba(119, 119, 119, .8);
+				margin: 8rpx 0 28rpx 36rpx;
+			}
+		}
+	}
+</style>

pageD/orderFormManage/component/detailCard.vue

@@ -0,0 +1,234 @@
+<template>
+	<view class="card">
+		<view class="user-name">
+			<view class="name">
+				<image class="header-img"
+					src="https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2"
+					mode=""></image>
+				<text>Trinity 自由比格</text>
+			</view>
+			<text class="order-status">{{deliveryStatus}}</text>
+		</view>
+		<view class="order-detail" :style="model">
+			<view class="detail">
+				<image class="order-img"
+					src="https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif"
+					mode=""></image>
+				<view class="detail-right">
+					<view class="title-price">
+						<view class="title">
+							OATLY噢麦力 咖啡大师…
+						</view>
+						<view class="price">
+							<text style="font-size: 20rpx;">￥</text>
+							<text>133</text>.
+							<text style="font-size: 20rpx;">22</text>
+						</view>
+					</view>
+					<view class="specifications">
+						<view class="title">
+							咖啡大师燕麦奶250ml*6瓶
+						</view>
+						<text>x1</text>
+					</view>
+				</view>
+			</view>
+			<view class="price-detail">
+				<text style="color: #222;font-size: 24rpx;">{{"共1件商品"+"&nbsp;"}}</text>
+				<text style="font-size: 28rpx;">买家实付</text>
+				<view class="price">
+					<text style="font-size: 20rpx;">￥</text>
+					<text>133</text>.
+					<text style="font-size: 20rpx;">22</text>
+				</view>
+			</view>
+			<view class="model" v-if="itemInfo.status == 0">
+			</view>
+		</view>
+		<view class="remarks" v-if="itemInfo.status == 2">
+			<view style="margin-right: 30rpx; color: #222;">
+				商家备注
+			</view>
+			<view style="color: rgba(34, 34,34, .6);">
+				买家急用，仓库尽早发货
+			</view>
+		</view>
+		<view class="btn-list" v-if="itemInfo.status !==0&&itemInfo.status !=3 ">
+			<button class="btn-1" v-if="itemInfo.status == 1">缴纳保证金</button>
+			<button class="btn-2" v-if="itemInfo.status == 2">备注</button>
+			<button class="btn-1" v-if="itemInfo.status == 2">发货</button>
+			<button class="btn-2" v-if="itemInfo.status == 4">查看物流</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			itemInfo: {
+				typeof: Object,
+				default: {}
+			}
+		},
+		computed: {
+			model() {
+				if (this.itemInfo.status == 0) {
+					return 'filter: blur(5px);'
+				}
+			},
+			deliveryStatus() {
+				if (this.itemInfo.status == 0) {
+					return '待审核'
+				} else if (this.itemInfo.status == 1) {
+					return '待缴纳保证金'
+				}else if (this.itemInfo.status == 2) {
+					return '待团长发货'
+				}else if (this.itemInfo.status == 3) {
+					return '待总部发货'
+				}else if (this.itemInfo.status == 4) {
+					return '已发货'
+				}
+			}
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.card {
+		background-color: #fff;
+		border-radius: 16rpx;
+		padding: 0 20rpx;
+		padding-bottom: 20rpx;
+		margin-bottom: 20rpx;
+
+		.user-name {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 84rpx;
+			border-bottom: 2rpx solid rgba(151, 151, 151, .2);
+
+			.name {
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				color: #333;
+
+				.header-img {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 50%;
+					margin-right: 12rpx
+				}
+			}
+
+			.order-status {
+				font-size: 24rpx;
+				color: #f83224;
+			}
+		}
+
+		.order-detail {
+			margin-top: 22rpx;
+			position: relative;
+
+
+
+			.detail {
+				display: flex;
+
+				.order-img {
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 10rpx;
+					margin-right: 20rpx;
+				}
+
+				.detail-right {
+					width: 70%;
+
+					.title-price {
+						display: flex;
+						font-size: 28rpx;
+						justify-content: space-between;
+						align-items: center;
+
+						.title {
+							width: 330rpx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+
+					.specifications {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						font-size: 28rpx;
+						color: #777;
+						margin-top: 10rpx;
+
+						.title {
+							width: 330rpx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+				}
+			}
+		}
+
+		.price-detail {
+			display: flex;
+			justify-content: flex-end;
+			align-items: flex-end;
+			margin-top: 20rpx;
+
+			.price {
+				font-weight: 600;
+			}
+		}
+
+		.remarks {
+			display: flex;
+			font-size: 28rpx;
+			background-color: #f4f4f4;
+			border-radius: 10rpx;
+			padding: 14rpx 20rpx;
+			margin-top: 20rpx;
+		}
+
+		.btn-list {
+			display: flex;
+			justify-content: flex-end;
+			margin-top: 30rpx;
+
+			.btn-1 {
+				font-size: 28rpx;
+				color: #f83224;
+				border: 2rpx solid #f83224;
+				background-color: #fff;
+				margin: 0;
+				border-radius: 34rpx;
+				min-width: 162rpx;
+				margin-left: 20rpx;
+			}
+
+			.btn-2 {
+				font-size: 28rpx;
+				color: #222;
+				border: 2rpx solid #979797;
+				background-color: #fff;
+				margin: 0;
+				border-radius: 34rpx;
+				min-width: 162rpx;
+
+			}
+		}
+	}
+</style>

pageD/orderFormManage/orderFormManage.vue

@@ -0,0 +1,178 @@
+<template>
+	<view class="page">
+		<view class="tab-1" slot="center">
+			<u--input style="background-color: #f4f4f4;" placeholder="搜索订单号/手机号/商品/姓名" shape="circle"
+				prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399"></u--input>
+			<view class="top-tab">
+				<view :class="{commodity:follow==1}" class="tab" @click="tabSwitch(1)">
+					全部
+				</view>
+				<view :class="{commodity:follow==2}" class="tab" @click="tabSwitch(2)">
+					待审核
+				</view>
+				<view :class="{commodity:follow==3}" class="tab" @click="tabSwitch(3)">
+					待缴纳保证金
+				</view>
+				<view :class="{commodity:follow==4}" class="tab" @click="tabSwitch(4)">
+					待团长发货
+				</view>
+				<view :class="{commodity:follow==5}" class="tab" @click="tabSwitch(5)">
+					待总部发货
+				</view>
+				<view :class="{commodity:follow==6}" class="tab" @click="tabSwitch(6)">
+					已发货
+				</view>
+			</view>
+		</view>
+		<view class="center">
+			<view v-for="item in orderList" :key="item.status">
+				<DetailCard  :itemInfo="item" />
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import DetailCard from './component/detailCard.vue'
+	export default {
+		components: {
+			DetailCard
+		},
+		data() {
+			return {
+				follow: 1,
+				orderList: [{
+						name: 'Trinity 自由比格',
+						status: 0,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用，仓库尽早发货'
+					},
+					{
+						name: 'Trinity 自由比格',
+						status: 1,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用，仓库尽早发货'
+					},
+					{
+						name: 'Trinity 自由比格',
+						status: 2,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用，仓库尽早发货'
+					},
+					{
+						name: 'Trinity 自由比格',
+						status: 3,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用，仓库尽早发货'
+					},
+					{
+						name: 'Trinity 自由比格',
+						status: 4,
+						headerImg: "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
+						orderImg: "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
+						orderDetail: 'OATLY噢麦力 咖啡大师…',
+						orderPrice: '29.90',
+						specifications: "咖啡大师燕麦奶250ml*6瓶",
+						num: 1,
+						payPrice: '141.00',
+						remark: '买家急用，仓库尽早发货'
+					},
+				]
+			}
+		},
+		methods: {
+			tabSwitch(num) {
+				this.follow = num
+			},
+		},
+		computed: {
+			i18n() {
+				return this.$t("index")
+			}
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: "订单管理"
+			})
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		.tab-1 {
+			padding: 0 24rpx;
+			background-color: #fff;
+
+			::v-deep .u-input {
+				background-color: #f4f4f4;
+			}
+
+			.top-tab {
+				margin-top: 20rpx;
+				display: flex;
+				justify-content: space-between;
+				overflow-y: auto;
+				padding-bottom: 10rpx;
+				// flex-shrink: 1;
+				// width: 100vw;
+
+				.tab {
+					margin-right: 40rpx;
+					font-size: 26rpx;
+					color: rgba(34, 34, 34, .8);
+					flex-shrink: 0;
+					height: 44rpx;
+					display: flex;
+					align-items: flex-end;
+				}
+
+				.commodity {
+					position: relative;
+					font-weight: 600;
+					font-size: 32rpx;
+				}
+
+				.commodity::before {
+					content: '';
+					display: block;
+					height: 8rpx;
+					width: 100%;
+					background: linear-gradient(to right, #f83224, #fff);
+					position: absolute;
+					bottom: 5rpx;
+					opacity: 0.8;
+				}
+			}
+		}
+
+		.center {
+			padding: 20rpx 24rpx;
+		}
+	}
+</style>

pageD/orderInformation/orderInformation.vue

@@ -0,0 +1,334 @@
+<template>
+	<view class="page">
+		<view class="top">
+			<view class="title">
+				待平台收货
+			</view>
+			<view class="prompt">
+				商品已寄往平台，正在运输中
+			</view>
+		</view>
+
+		<view class="photo" v-if="orderStauts == 1">
+			<view class="_weight"> <text>称重重量</text> <text>168kg</text> </view>
+			<view class="_weight"> <text>称重图片</text>
+				<view class="_image">
+
+				</view>
+			</view>
+			<view class="photo-bottom">
+				<text class="_text-1">需付款</text>
+				<view class="price">
+					<text style="font-size: 20rpx;">￥</text>
+					<text>133</text>.
+					<text style="font-size: 20rpx;">22</text>
+				</view>
+			</view>
+		</view>
+		<view class="address">
+			<view class="name-phone">
+				<view class="send">
+					寄
+				</view>
+				<view class="name">
+					张三
+				</view>
+				<view class="phone">
+					181****1111
+				</view>
+			</view>
+			<view class="address-detail">
+				上海市上海市浦东新区商城路1177弄5号楼201
+			</view>
+			<view class="name-phone">
+				<view class="send">
+					收
+				</view>
+				<view class="name">
+					Curtis Morris
+				</view>
+				<view class="phone">
+					181****1111
+				</view>
+			</view>
+			<view class="address-detail _bottom">
+				2A Mugga Way, Red Hill ACT 2603
+			</view>
+			<image style="height: 4rpx;margin-bottom: 40rpx;" src="../../static/mine/338.png" mode=""></image>
+
+			<view class="_label-list">
+				<view class="information">
+					<text class="_label">物品信息：</text>
+					<text class="_value">日用品</text>
+				</view>
+				<view class="information">
+					<text class="_label">件数：</text>
+					<text class="_value">20</text>
+				</view>
+				<view class="information">
+					<text class="_label">重量：</text>
+					<text class="_value">200kg</text>
+				</view>
+				<view class="information">
+					<text class="_label">类型：</text>
+					<text class="_value">特殊商品</text>
+				</view>
+				<view>
+					<text class="_label">跨境物流：</text>
+					<text class="_value">海运散货 | 1号海运柜</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="num-information">
+			<view class="order" style="margin-bottom: 28rpx;">
+				<text class="_label-1">订单编号</text>
+				<view class="num">
+					<text>ZT83829300113344</text>{{ "&nbsp;"+"|"+"&nbsp;" }}<text
+						@click="cope('ZT83829300113344')">复制</text>
+				</view>
+			</view>
+			<view class="order">
+				<text class="_label-1">下单时间</text>
+				<view class="num">
+					2023-11-24 22:31
+				</view>
+			</view>
+		</view>
+		<view class="footer">
+			<button class="btn-1" @click="toLogistics">查看物流</button>
+			<button class="btn-2" @click="toPay">立即付款</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orderStauts: 1
+			};
+		},
+		onLoad(options) {
+			console.log(options)
+			this.setStatus(options.orderStauts)
+		},
+		created() {
+			//设置顶部标题栏颜色
+			uni.setNavigationBarColor({
+				frontColor: '#000000',
+				backgroundColor: '#f4f4f4'
+			})
+		},
+		methods: {
+			cope(str) {
+				uni.setClipboardData({
+					data: str,
+					success() {
+						uni.showToast({
+							title: "复制成功",
+							icon: "none"
+						})
+					}
+				})
+			},
+			setStatus(num){
+				this.orderStauts = num
+				return 11
+			},
+			toLogistics() {
+				uni.navigateTo({
+					url: "/pageD/logisticsProgress/logisticsProgress"
+				})
+			},
+			toPay(){
+				uni.navigateTo({
+					url:"/pageD/paymentOrder/paymentOrder"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		padding: 20rpx 24rpx;
+		position: relative;
+
+		.title {
+			font-size: 44rpx;
+			color: #222;
+			font-weight: 600;
+		}
+
+		.prompt {
+			font-size: 24rpx;
+			color: rgba(34, 34, 34, .5);
+			margin-top: 12rpx;
+		}
+		
+		.photo{
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 20rpx 20rpx;
+			margin-top: 20rpx;
+			._weight{
+				display: flex;
+				justify-content: space-between;
+				font-size: 26rpx;
+				color: rgba(34, 34, 34, .8);
+				margin-bottom: 32rpx;
+				._image{
+					width: 160rpx;
+					height: 90rpx;
+					background-color: #D8D8D8;
+					border-radius: 4rpx;
+				}
+			}
+			.photo-bottom{
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+				border-top: 2rpx solid rgba(151, 151, 151, .1);
+				padding-top: 24rpx;
+				.price{
+					color: #f83224;
+					font-weight: 600;
+				}
+				._text-1{
+					font-size: 26rpx;
+				}
+			}
+		}
+		
+		.address {
+			padding: 36rpx 34rpx;
+			background-color: #fff;
+			border-radius: 10rpx;
+			margin-top: 32rpx;
+
+			.name-phone {
+				display: flex;
+				align-items: flex-end;
+
+				.send {
+					width: 40rpx;
+					height: 40rpx;
+					background-color: #000;
+					color: #fff;
+					border-radius: 50%;
+					font-size: 22rpx;
+					text-align: center;
+					line-height: 40rpx;
+				}
+
+				.name {
+					font-weight: 600;
+					font-size: 30rpx;
+					color: #222;
+					margin-right: 28rpx;
+					margin-left: 28rpx;
+				}
+
+				.phone {
+					font-size: 24rpx;
+					color: #777;
+				}
+			}
+
+			.address-detail {
+				font-size: 26rpx;
+				color: #555;
+				margin-top: 16rpx;
+				margin-left: 60rpx;
+				padding-bottom: 36rpx;
+				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+				margin-bottom: 34rpx;
+			}
+
+			._bottom {
+				border: none;
+				margin-bottom: 0;
+			}
+
+			._label-list {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				.information {
+					width: 49%;
+					margin-bottom: 28rpx;
+					font-size: 28rpx;
+				}
+
+				._label {
+					color: #666;
+					font-size: 28rpx;
+				}
+
+				._value {
+					font-size: 28rpx;
+					color: #333;
+				}
+			}
+		}
+
+		.num-information {
+			background-color: #fff;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+			padding: 28rpx 20rpx 28rpx 28rpx;
+
+			.order {
+				display: flex;
+				justify-content: space-between;
+				font-size: 28rpx;
+
+				._label-1 {
+					color: #666;
+				}
+
+				.num {
+					color: #333;
+				}
+			}
+		}
+
+		.footer {
+			display: flex;
+			justify-content: flex-end;
+			background-color: #fff;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 146rpx;
+			padding-top: 20rpx;
+
+			.btn-1 {
+				height: 76rpx;
+				padding: 0;
+				margin: 0;
+				font-size: 28rpx;
+				color: #222;
+				min-width: 188rpx;
+				background-color: #fff;
+				border-radius: 38rpx;
+				border: 2rpx solid #979797;
+				margin-right: 20rpx;
+			}
+			.btn-2 {
+				height: 76rpx;
+				padding: 0;
+				margin: 0;
+				font-size: 28rpx;
+				color: #fff;
+				min-width: 188rpx;
+				background-color: #f83224;
+				border-radius: 38rpx;
+				margin-right: 20rpx;
+			}
+		}
+	}
+</style>

pageD/paymentOrder/paymentOrder.vue

@@ -0,0 +1,182 @@
+<template>
+	<view class="page">
+		<view class="_top">
+			<view class="title">
+				待支付订单
+			</view>
+			<view class="price">
+				<text class="_text-1">￥</text>
+				1235.2
+			</view>
+			<view class="_weight">
+				<text>实际重量</text>
+				<text>168kg</text>
+			</view>
+			<view class="type-num">
+				<text>包裹类型</text>
+				<text>日用品</text>
+			</view>
+			<view class="type-num">
+				<text>包裹数量</text>
+				<text>5</text>
+			</view>
+		</view>
+		<view class="pay" @click="switchType('balance')">
+			<view style="display: flex;">
+				<image class="balance-icon" src="../../static/mine/341.png" mode=""></image>
+				<view class="">
+					<view style="font-size: 26rpx; color: #333333;">余额支付</view>
+					<view style="color: #f83224;font-size: 24rpx;margin-top: 10rpx;">当前余额：2546.2</view>
+				</view>
+			</view>
+			<image v-if="payType == 'balance'" class="select" src="../../static/mine/342.png" mode=""></image>
+			<image v-else class="select" src="../../static/mine/345.png" mode=""></image>
+		</view>
+		<view class="pay" @click="switchType('wx')">
+			<view style="display: flex;">
+				<image class="balance-icon" src="../../static/mine/343.png" mode=""></image>
+				<view class="">
+					<view style="font-size: 26rpx; color: #333333;">微信支付</view>
+					<view style="color: #797979;font-size: 24rpx;margin-top: 10rpx;">适用微信支付</view>
+				</view>
+			</view>
+			<image v-if="payType == 'wx'" class="select" src="../../static/mine/342.png" mode=""></image>
+			<image v-else class="select" src="../../static/mine/345.png" mode=""></image>
+		</view>
+		<view class="pay" @click="switchType('service')">
+			<view style="display: flex;">
+				<image class="balance-icon" src="../../static/mine/344.png" mode=""></image>
+				<view class="">
+					<view style="font-size: 26rpx; color: #333333;">客服支付</view>
+					<view style="color: #797979;font-size: 24rpx;margin-top: 10rpx;">联系微信支付</view>
+				</view>
+			</view>
+			<image v-if="payType == 'service'" class="select" src="../../static/mine/342.png" mode=""></image>
+			<image v-else class="select" src="../../static/mine/345.png" mode=""></image>
+		</view>
+
+		<view class="footer">
+			<text>共一件</text>
+			<text>合计</text>
+			<view class="price">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+			<button class="btn-2" @click="toPay">立即支付</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				payType: "balance"
+			};
+		},
+		methods: {
+			switchType(str) {
+				this.payType = str
+			}
+		},
+		created() {
+			uni.setNavigationBarTitle({
+				title: "支付订单"
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		padding: 20rpx 24rpx;
+		position: relative;
+
+		._top {
+			padding: 48rpx 24rpx 36rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+
+			.title {
+				text-align: center;
+				color: rgba(34, 34, 34, .7);
+				font-size: 28rpx;
+			}
+
+			.price {
+				font-size: 64rpx;
+				font-weight: 500;
+				text-align: center;
+				margin-top: 20rpx;
+
+				._text-1 {
+					font-size: 28rpx;
+				}
+			}
+
+			._weight {
+				display: flex;
+				justify-content: space-between;
+				margin-top: 46rpx;
+				font-size: 28rpx;
+				color: rgba(34, 34, 34, 1);
+			}
+
+			.type-num {
+				display: flex;
+				justify-content: space-between;
+				font-size: 28rpx;
+				color: rgba(34, 34, 34, .7);
+				margin-top: 32rpx;
+			}
+		}
+
+		.pay {
+			display: flex;
+			align-items: center;
+			background-color: #fff;
+			margin-top: 20rpx;
+			height: 140rpx;
+			border-radius: 16rpx;
+			padding: 0 24rpx;
+			justify-content: space-between;
+
+			.balance-icon {
+				width: 40rpx;
+				height: 40rpx;
+				margin-right: 20rpx;
+			}
+
+			.select {
+				width: 36rpx;
+				height: 36rpx;
+			}
+		}
+
+		.footer {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			background-color: #fff;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 146rpx;
+			padding-top: 20rpx;
+
+			.btn-2 {
+				height: 76rpx;
+				padding: 0;
+				margin: 0;
+				font-size: 28rpx;
+				color: #fff;
+				min-width: 188rpx;
+				background-color: #f83224;
+				border-radius: 38rpx;
+				margin-right: 20rpx;
+			}
+		}
+	}
+</style>

pages.json

@@ -536,6 +536,34 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "orderFormManage/orderFormManage",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "orderInformation/orderInformation",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "logisticsProgress/logisticsProgress",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "paymentOrder/paymentOrder",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]

pages/mine/component/teamFunction.vue

@@ -11,7 +11,7 @@
 				<image class="form-icon" src='../../../static/mine/318.png' mode=""></image>
 				<view class="characters">{{i18n.productManagement}}</view>
 			</view>
-			<view class="icon-center">
+			<view class="icon-center" @click="toNextPage('/pageD/orderFormManage/orderFormManage')">
 				<image class="form-icon" src="../../../static/mine/315.png" mode=""></image>
 				<view class="characters">{{i18n.orderManagement}}</view>
 			</view>

unpackage/dist/dev/mp-weixin/app.json

@@ -85,7 +85,11 @@
         "productDetails/productDetails",
         "commodityManage/commodityManage",
         "platformProducts/platformProducts",
-        "settleIn/settleIn"
+        "settleIn/settleIn",
+        "orderFormManage/orderFormManage",
+        "orderInformation/orderInformation",
+        "logisticsProgress/logisticsProgress",
+        "paymentOrder/paymentOrder"
       ]
     }
   ],

unpackage/dist/dev/mp-weixin/pageD/index.js

@@ -144,7 +144,6 @@ exports.default = void 0;
 //
 //
 //
-//
 var _default = {
   data: function data() {
     return {};

unpackage/dist/dev/mp-weixin/pages/cart/cart.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 675))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 707))
     },
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 783))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 815))
     },
     uSwipeAction: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 791))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 823))
     },
     uSwipeActionItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 797))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 829))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 809))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 841))
     },
     uNumberBox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 817))
+      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 849))
     },
     uIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 691))
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 723))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 675))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 707))
     },
     uSubsection: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 683))
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 715))
     },
     uBadge: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 760))
+      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 792))
     },
     uLineProgress: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 768))
+      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 800))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 716))
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 748))
     },
     kjFlow: function () {
-      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 776))
+      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 808))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 675))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 707))
     },
     uSubsection: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 683))
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 715))
     },
     uIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 691))
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 723))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 700))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 732))
     },
     uSwiper: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 708))
+      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 740))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 716))
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 748))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 783))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 815))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 809))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 841))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
     },
   }
 } catch (e) {
@@ -166,22 +166,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var MineMoney = function MineMoney() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mineMoney */ "pages/mine/component/mineMoney").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 732));
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 764));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var MallOrderForm = function MallOrderForm() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mallOrderForm */ "pages/mine/component/mallOrderForm").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 739));
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 771));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var TeamFunction = function TeamFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/teamFunction */ "pages/mine/component/teamFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 746));
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 778));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var PersonalFunction = function PersonalFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/personalFunction */ "pages/mine/component/personalFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 753));
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 785));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 675))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 707))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 700))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 732))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 756))
     },
   }
 } catch (e) {

uview-ui/components/u-steps-item/u-steps-item.vue

@@ -73,8 +73,8 @@
 				childLength: 0,
 				showLine: false,
 				size: {
-					height: 0,
-					width: 0
+					height: 50,
+					width: 50
 				},
 				parentData: {
 					direction: 'row',
@@ -100,8 +100,11 @@
 					style.width = this.size.width + 'px'
 					style.left = this.size.width / 2 + 'px'
 				} else {
-					style.height = this.size.height + 'px'
+					// style.height = this.size.height + 'px'
 					// style.top = this.size.height / 2 + 'px'
+					
+						style.height = 50 + 'px'
+						style.top = 50 / 2 + 'px'
 				}
 				style.backgroundColor = this.parent.children?.[this.index + 1]?.error ? uni.$u.color.error : this.index <
 					this

uview-ui/components/u-text/u-text.vue

@@ -60,6 +60,7 @@
             ]"
             >{{ value }}</text
         >
+		
         <view class="u-text__suffix-icon" v-if="suffixIcon">
             <u-icon
                 :name="suffixIcon"