修改

components/coupons/coupons.vue

+<template>
+	<div class="coupons-page">
+		<u-popup v-model="showDialog" mode="center" :mask-close-able="false" custom-style="padding:0;background:none;">
+			<view class="Xbox">
+				<img src="../../static/images/couponsbg.png" mode="widthFix" />
+				<view class="coupons-box">
+					<text style="font-size: 18px;color: #FFFFFF;">恭喜获得优惠券</text>
+				</view>
+			</view>
+		</u-popup>
+	</div>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			pageinfo: {},
+			
+			showDialog: true
+		};
+	},
+	created() {
+		
+	
+		
+	},
+	methods: {
+		
+	
+	}
+};
+</script>
+
+<style>
+.coupons-page img {
+	width: 540rpx;
+	height: 680rpx;
+}
+.coupons-page .Xbox{
+	width: 540rpx;
+	height: 680rpx;
+	position: relative
+}
+.coupons-page .hotsopt {
+	position: absolute;
+	background: transparent;
+	border: none;
+	outline: none;
+}
+.coupons-page .hotsopt::after {
+	border: none;
+}
+.coupons-page .coupons-box{
+	width: 480rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	
+}
+</style>

components/goods/order-good-list.vue

@@ -26,10 +26,14 @@
         <image :src="y.cover_pic" mode="aspectFill" class="image" />
         <view class="goodinfo">
           <view class="name">{{ y.name }}</view>
-		  <view class="attr" style="margin-bottom: 5px;height: 20px;">
-			<span >{{ y.freeShippingDescription!=null ?y.freeShippingDescription:''}}</span>
-			<u-tag style='margin-left: 5px;' size="mini" text="满足" type="warning" v-if='y.freeShipping_Use==true'/>
-			<u-tag style='margin-left: 5px;' size="mini" text="不满足包邮" type="info" v-if='y.freeShipping_Use==false'/>
+		  <view  style="margin-bottom: 5px;height: 20px;" v-if="y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
+			
+			<view style="font-size: 12px;color: #909399;padding: 3px 5px;background: #f4f4f5;" class="freeShippingstyle" v-if="y.freeShipping_Use==false&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
+				{{y.freeShippingDescription!=null ?y.freeShippingDescription:''}} 
+			</view>
+			<view style="font-size: 12px;color: #ff9900;padding: 3px 5px;background: #fdf6ec;" class="freeShippingstyle" v-if="y.freeShipping_Use==true&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
+				{{y.freeShippingDescription!=null ?y.freeShippingDescription:''}} 
+			</view>
 		  </view>
           <view class="attr">已选择 
 		  <span v-for="(item,index) in y.attr_list" :key="index">{{ item.attr_group_name}}:{{ item.attr_name}}</span>
@@ -115,4 +119,13 @@ export default {
 .ordergoodlist .goodbox.update-goodbox:last-child {
   border: none;
 }
+.ordergoodlist .freeShippingstyle{
+	text-overflow: -o-ellipsis-lastline;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	line-clamp: 1;
+	-webkit-box-orient: vertical;
+}
 </style>

pages/order-submit/order-submit.vue

@@ -66,6 +66,14 @@
 						</view>
 					</view>
 				</template>
+				<template>
+					<view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;align-items: center;">
+						已满足:
+						<view  style="height: 22px;line-height: 22px;font-size: 12px;color: #ff9900;background: #fdf6ec;padding: 0 5px;" v-for="(y, yi) in x.pinkageList" :key="yi">
+							<text  >{{y.Name}}</text>
+						</view>
+					</view>
+				</template>
 				<view class="peisong">
 					<view>配送</view>
 					<view style="text-align: right; padding-right: 5px;">{{ x.delivery.send_type_name }}</view>