1

pagesMy/order/after.vue

@@ -24,7 +24,7 @@
 											mode="">
 										</image>
 										<view class="other">
-											<view class="name">
+											<view class="name textOver">
 												{{item.goods.goods.name||'暂无'}}
 											</view>
 											<view class="other_1">
@@ -395,6 +395,7 @@
 						}
 
 						.other {
+							width: 65vw;
 							flex-grow: 1;
 
 							.name {

pagesMy/order/index.vue

@@ -82,6 +82,8 @@
 													<view class="specs">
 														{{tag.name}}
 													</view>
+													<text v-if="tags.gift.length>0" class="gift">赠品</text>
+													<text v-if="tags.sp_price" class="act">特价</text>
 												</view>
 												<view class="goods_3">
 													<view v-if="item.type=='0'" class="price">
@@ -717,6 +719,23 @@
 										font-size: 14px;
 										color: #858585;
 									}
+
+									.gift {
+										margin: 0 1vw 0 0;
+										font-size: 12px;
+										color: #FFA500;
+										border: 1px solid #FFA500;
+										border-radius: 5px;
+										padding: 0 1vw;
+									}
+
+									.act {
+										font-size: 12px;
+										border: 1px solid var(--fFB1Color);
+										color: var(--fFB1Color);
+										border-radius: 5px;
+										padding: 0 1vw;
+									}
 								}
 
 								.goods_3 {

pagesMy/order/info.vue

@@ -91,26 +91,51 @@
 								</view>
 								<view class="list_2">
 									<view class="goods" v-for="(item,index) in info.goods" :key="index">
-										<view class="url">
-											<image class="image"
-												:src="item.goods.file&&item.goods.file.length>0?item.goods.file[0].url:''"
-												mode=""></image>
-										</view>
-										<view class="goodsname">
-											{{item.goods.name}}
-											<view class="specs">
-												{{item.name}}
+										<view class="goods_1">
+											<view class="url">
+												<image class="image"
+													:src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
+												</image>
 											</view>
-										</view>
-										<view class="goodsother">
-											<view v-if="info.type=='0'" class="price">
-												¥{{item.price||item.sell_money}}
+											<view class="goodsname">
+												{{item.goods.name}}
+												<view class="specs">
+													{{item.name}}
+												</view>
+											</view>
+											<view class="goodsother">
+												<view v-if="info.type=='0'" class="price">
+													¥{{item.price||item.sell_money}}
+												</view>
+												<view v-else class="price">
+													¥{{item.group_config.money}}
+												</view>
+												<view class="num">
+													×{{item.buy_num}}
+												</view>
 											</view>
-											<view v-else class="price">
-												¥{{item.group_config.money}}
+										</view>
+										<view class="goods_2" v-if="item.gift.length>0">赠品</view>
+										<view class="goods_3" v-if="item.gift.length>0"
+											v-for="(tag,indexx) in item.gift" :key="indexx">
+											<view class="left">
+												<view class="name">
+													{{tag.goods_name}}
+												</view>
+												<view class="Spec">
+													规格:{{tag.spec_name}}
+												</view>
+												<view class="Spec">
+													说明:{{tag.desc}}
+												</view>
 											</view>
-											<view class="num">
-												×{{item.buy_num}}
+											<view class="right">
+												<view class="price">
+													¥{{tag.money||0}}
+												</view>
+												<view class="num">
+													×{{tag.num}}
+												</view>
 											</view>
 										</view>
 									</view>
@@ -403,37 +428,66 @@
 						flex-direction: column;
 
 						.goods {
-							display: flex;
 							border-bottom: 1px dashed #f1f1f1;
 							padding: 2vw 0;
 
-							.url {
-								width: 20vw;
+							.goods_1 {
+								display: flex;
 
-								.image {
-									width: 100%;
-									height: 20vw;
-									border-radius: 5px;
+								.url {
+									width: 20vw;
 
+									.image {
+										width: 100%;
+										height: 20vw;
+										border-radius: 5px;
+
+									}
 								}
-							}
 
-							.goodsname {
-								display: flex;
-								flex-direction: column;
-								width: 60vw;
-								padding: 0 2vw;
-								font-size: 16px;
-
-								.specs {
-									color: var(--f85Color);
-									font-size: var(--font12Size);
+								.goodsname {
+									display: flex;
+									flex-direction: column;
+									width: 60vw;
+									padding: 0 2vw;
+									font-size: 16px;
+
+									.specs {
+										color: var(--f85Color);
+										font-size: var(--font12Size);
+									}
+
+								}
+
+								.goodsother {
+									width: 15vw;
+									text-align: right;
 								}
 							}
 
-							.goodsother {
-								width: 15vw;
-								text-align: right;
+							.goods_2 {
+								padding: 0 1vw 1vw 0;
+								font-size: var(--font14Size);
+							}
+
+							.goods_3 {
+								display: flex;
+								justify-content: space-between;
+								border: 1px solid var(--fcColor);
+								border-radius: 5px;
+								margin: 0 0 1vw 0;
+								padding: 1vw;
+
+								.left {
+									.name {
+										font-size: 14px;
+									}
+
+									.Spec {
+										font-size: var(--font12Size);
+										color: var(--f85Color);
+									}
+								}
 							}
 						}
 					}