diff --git a/package1/myCenter/myFriend.vue b/package1/myCenter/myFriend.vue
index 9006274..fd6151c 100644
--- a/package1/myCenter/myFriend.vue
+++ b/package1/myCenter/myFriend.vue
@@ -1,9 +1,645 @@
-
+
+
+ ‹
+
+ 抽奖
+ 开奖记录
+ 分享
+
+
+
+
+ 本期开奖时间 2026.03.18 20:00
+
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+ 我要抽奖
+
+
+ 保护中 23:12:06
+ 80户儿保站大奖池
+
+ 奖
+
+ 我的奖金
+ ¥30
+
+
+
+
+ 投入 3 张券参与中
+ 我的抽奖券 12
+
+
+
+
+
+
+
+
+
+
+
+ 优秀商品
+
+
+
+ {{ item.icon }}
+
+ {{ item.name }}
+
+
+
+
+ 奖池金额
+ ¥ 737489
+
+
-
\ No newline at end of file
diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index 9e0eddb..58d7bac 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -169,6 +169,27 @@
-->
+
+
+
+ 已下单
+
+
+
+
+ {{orderDetail.deliveryType == 1 ? '已接单' : '待消费'}}
+
+
+
+
+ {{orderDetail.deliveryType == 1 ? '配送中' : '核销中'}}
+
+
+
+
+ 已完成
+
+
+ >
我的评价
@@ -1067,10 +1088,10 @@
this.$refs.returnPopupBuy.open('bottom');
},
returnOrder() {
- if(sellTime == 5 && remark == ""){
+ /* if(this.sellTime == 5 && this.remark == ""){
that.tui.toast("请填写备注");
return
- }
+ } */
this.$refs.returnPopup.close();
let item = this.payData
let that = this
@@ -1366,27 +1387,35 @@
width: 100%;
height: 100%;
font-size: 24rpx;
- background: #F5F8F5;
+ background: linear-gradient(180deg, #ecfff7 0%, #f7fbf6 38%, #f9faf7 100%);
color: #00231C;
}
.page1 {
width: 100%;
- height: 100%;
+ min-height: 100%;
font-size: 24rpx;
position: relative;
+ background:
+ radial-gradient(circle at 12% 8%, rgba(166, 255, 234, 0.48) 0, rgba(166, 255, 234, 0) 260rpx),
+ radial-gradient(circle at 92% 18%, rgba(255, 221, 176, 0.26) 0, rgba(255, 221, 176, 0) 300rpx);
}
.title {
- background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
+ background:
+ linear-gradient(135deg, rgba(166, 255, 234, 0.86) 0%, rgba(245, 255, 249, 0.94) 52%, rgba(255, 246, 225, 0.9) 100%);
width: 100%;
- height: 54%;
+ height: 360rpx;
+ border-bottom-left-radius: 46rpx;
+ border-bottom-right-radius: 46rpx;
+ box-shadow: 0 18rpx 44rpx rgba(0, 35, 28, 0.06);
}
.content {
position: absolute;
- top: 220rpx;
+ top: 150rpx;
width: 100%;
+ padding-bottom: 60rpx;
}
.title-sreach {
@@ -1400,25 +1429,48 @@
position: absolute;
bottom: 0;
left: 0;
+ width: 64rpx;
+ height: 64rpx;
+ margin-left: 14rpx;
+ border-radius: 50%;
+ background: rgba(255, 255, 255, 0.64);
+ box-shadow: 0 10rpx 24rpx rgba(0, 35, 28, 0.08);
+ text-align: center;
+ line-height: 64rpx;
}
.box1 {
width: 95%;
- margin: 0 auto 20rpx;
- background: #fff;
- border-radius: 20rpx;
- padding: 20rpx;
+ margin: 0 auto 22rpx;
+ background: rgba(255, 255, 255, 0.94);
+ border: 1px solid rgba(255, 255, 255, 0.86);
+ border-radius: 32rpx;
+ padding: 24rpx;
+ box-shadow: 0 18rpx 42rpx rgba(0, 35, 28, 0.07);
+ box-sizing: border-box;
+ overflow: hidden;
+ }
+
+ .content > .box1:first-child {
+ background:
+ radial-gradient(circle at 94% 4%, rgba(255, 221, 176, 0.2) 0, rgba(255, 221, 176, 0) 170rpx),
+ linear-gradient(135deg, rgba(255, 255, 255, 0.98) 0%, rgba(244, 255, 251, 0.96) 100%);
+ border-radius: 36rpx;
}
.goods-img {
width: 160rpx;
height: 160rpx;
position: relative;
+ border-radius: 24rpx;
+ overflow: hidden;
+ box-shadow: 0 12rpx 24rpx rgba(0, 35, 28, 0.08);
img {
width: 100%;
background-size: 100%;
height: 100%;
+ border-radius: 24rpx;
}
}
@@ -1430,34 +1482,41 @@
.goods-name {
font-size: 32rpx;
font-weight: 900;
+ color: #243f38;
}
.goods-content-center {
display: flex;
margin: 16rpx 0;
- color: #777;
+ color: #7b8883;
}
.goods-content-bottom {
display: flex;
line-height: 56rpx;
- color: #777;
+ color: #6b7773;
}
.pintuan-left-price {
width: 50%;
text-align: right;
font-weight: 700;
- color: #000;
+ color: #00231C;
}
.status-img {
- width: 84rpx;
- height: 84rpx;
+ width: 96rpx;
+ height: 96rpx;
+ border-radius: 50%;
+ background: linear-gradient(135deg, rgba(166, 255, 234, 0.72), rgba(255, 247, 215, 0.78));
+ box-shadow: 0 12rpx 26rpx rgba(0, 35, 28, 0.08);
+ display: flex;
+ align-items: center;
+ justify-content: center;
img {
- width: 84rpx;
- height: 84rpx;
+ width: 72rpx;
+ height: 72rpx;
background-size: 100%;
}
}
@@ -1469,50 +1528,167 @@
}
.status-zhu {
- font-size: 32rpx;
- font-weight: 700;
+ font-size: 36rpx;
+ font-weight: 900;
+ color: #243f38;
}
.status-fu {
height: 50rpx;
line-height: 50rpx;
+ color: #52625d;
}
.status-address {
font-weight: 700;
+ color: #243f38;
}
.status-btn {
position: absolute;
top: 20rpx;
right: 0;
- background: rgba(247, 248, 248, 0.6);
- width: 130rpx;
- height: 50rpx;
+ background: rgba(255, 255, 255, 0.72);
+ width: 136rpx;
+ height: 54rpx;
text-align: center;
- line-height: 50rpx;
- border-radius: 16rpx;
- color: #777;
- border: 1px solid rgba(0, 35, 28, 0.16);
+ line-height: 54rpx;
+ border-radius: 999rpx;
+ color: #60706c;
+ border: 1px solid rgba(0, 35, 28, 0.1);
font-size: 20rpx;
+ font-weight: 800;
+ box-shadow: 0 8rpx 18rpx rgba(0, 35, 28, 0.05);
+ }
+
+ .order-flow {
+ width: 95%;
+ margin: -4rpx auto 22rpx;
+ padding: 22rpx 20rpx;
+ border-radius: 30rpx;
+ background: rgba(255, 255, 255, 0.78);
+ box-shadow: 0 14rpx 34rpx rgba(0, 35, 28, 0.05);
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ }
+
+ .flow-item {
+ width: 92rpx;
+ text-align: center;
+ color: #9aa6a2;
+ font-size: 20rpx;
+ font-weight: 800;
+ }
+
+ .flow-dot {
+ width: 24rpx;
+ height: 24rpx;
+ margin: 0 auto 8rpx;
+ border-radius: 50%;
+ background: #dfe7e3;
+ box-shadow: inset 0 0 0 4rpx #fff;
+ }
+
+ .flow-item.active {
+ color: #125e50;
+ }
+
+ .flow-item.active .flow-dot {
+ background: linear-gradient(135deg, #a6ffea, #ffdf75);
+ box-shadow: 0 6rpx 14rpx rgba(0, 191, 160, 0.18);
+ }
+
+ .flow-line {
+ flex: 1;
+ height: 6rpx;
+ border-radius: 999rpx;
+ background: #e5ece9;
+ margin: 0 4rpx 34rpx;
+ }
+
+ .flow-line.active {
+ background: linear-gradient(90deg, #a6ffea, #ffdf75);
}
.btn-box {
height: auto;
display: flex;
- margin-bottom: 10px;
+ width: 95%;
+ margin: 0 auto 20rpx;
+ gap: 18rpx;
+ flex-wrap: wrap;
}
.btn {
- width: 90%;
- height: 100rpx;
- line-height: 100rpx;
- background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
- font-size: 32rpx;
- border-radius: 120rpx;
+ flex: 1;
+ min-width: 260rpx;
+ height: 92rpx;
+ line-height: 92rpx;
+ background: linear-gradient(135deg, #fff7d7 0%, #a6ffea 100%);
+ font-size: 30rpx;
+ border-radius: 999rpx;
text-align: center;
- margin: 0 10px;
- font-weight: 700;
+ margin: 0;
+ font-weight: 900;
+ box-shadow: 0 14rpx 28rpx rgba(0, 191, 160, 0.12);
+ }
+
+ .box1 > view[style*="rgba(247, 248, 248"] {
+ background: linear-gradient(180deg, rgba(250, 255, 252, 0.96) 0%, rgba(255, 255, 255, 0.9) 100%) !important;
+ border: 1px solid rgba(166, 255, 234, 0.34);
+ box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.72);
+ }
+
+ .box1 > view[style*="line-height: 70rpx"] {
+ color: #243f38;
+ }
+
+ .box1 > view[style*="height: 80rpx"] {
+ border-bottom: 1px solid rgba(0, 35, 28, 0.045);
+ }
+
+ .box1 > view[style*="height: 80rpx"]:last-child {
+ border-bottom: 0;
+ }
+
+ .box1 view[style*="color: #777"] {
+ color: #87938f !important;
+ }
+
+ .box1 view[style*="color: #000"] {
+ color: #243f38 !important;
+ }
+
+ .box1 view[style*="border-top: 1px solid #eee"] {
+ border-top: 1px solid rgba(0, 35, 28, 0.08) !important;
+ }
+
+ .box1 view[style*="font-size: 32rpx"][style*="font-weight: 700"] {
+ color: #0d4d42;
+ }
+
+ .box1 image,
+ .box1 img {
+ object-fit: cover;
+ }
+
+ .evaluate-content,
+ .car-content,
+ .guize-list,
+ .pay-popup {
+ border-radius: 36rpx 36rpx 0 0 !important;
+ box-shadow: 0 -18rpx 44rpx rgba(0, 35, 28, 0.12);
+ }
+
+ .evaluate-content {
+ background: linear-gradient(180deg, #ffffff 0%, #f7fffb 100%);
+ }
+
+ .evaluate-list {
+ padding: 20rpx;
+ border-radius: 28rpx;
+ background: rgba(247, 255, 251, 0.8);
}
.img-popup-content {