部分显示问题调整，问题修复，增加购物车初始化和商品更新未找到对应商品发送删除消息

userPackage/goodsDetail/goodsDetail.vue

@@ -366,7 +366,7 @@
 			shopId: item.shopId,
 		}).then(res=>{
 			if(res){
-				uni.navigateTo({
+				uni.redirectTo({
 					url:'/userPackage/order/detail?orderId='+res
 				})
 			}else{

userPackage/order/detail.vue

@@ -91,9 +91,9 @@
 				</view>
 			</view>
 			<template v-if="item.status">
-				<view class="refund" v-if="item.status=='refunding'">已申请退款，需等待商家审核</view>
-				<view class="refund" v-if="returnTime==='00:00:00'&&!item.isMyself">当前订单已失效</view>
-				<view class="refund" v-if="item.status=='cancel'&&!item.isMyself">当前订单已失效</view>
+				<view class="refund" v-if="item.status=='refunding'&&item.isMyself">已申请退款，需等待商家审核</view>
+				<view class="refund" v-else-if="returnTime==='00:00:00'&&!item.isMyself">当前订单已失效</view>
+				<view class="refund" v-else-if="item.status!='ing'&&!item.isMyself">当前订单已失效</view>
 			</template>
 
 			<view class="shop-box">
@@ -528,7 +528,9 @@
 		console.log(opt)
 		Object.assign(query, opt)
 		console.log(query)
-
+		if(query.shopId){
+			uni.cache.set('shopId', query.shopId)
+		}
 	}
 
 	function refund(item) {
@@ -711,9 +713,10 @@
 		if (!nowStep.value) {
 			return 0
 		}
-		const index = item.packageInfo.tieredDiscount.findIndex(v => v.peopleNum)
+		const index = item.packageInfo.tieredDiscount.findIndex(v => v.peopleNum==nowStep.value.peopleNum)
 		if (index != -1) {
-			return (index + 1) / item.packageInfo.tieredDiscount.length * 100
+			const percent= (index + 1) / item.packageInfo.tieredDiscount.length * 100
+			return percent>=100?100:0;
 		}
 		return 0
 	})
@@ -959,7 +962,7 @@
 	}
 
 	.pin-btn {
-		padding: 14rpx 60rpx;
+		padding: 22rpx 60rpx;
 		border-radius: 200rpx;
 		text-align: center;
 		font-size: 32rpx;
@@ -1090,6 +1093,7 @@
 		$height: 10rpx;
 		height: $height;
 		border-radius: $height;
+		overflow: hidden;
 
 		.progress {
 			height: $height;