1

components/goods/order-good-list.vue

@@ -31,7 +31,7 @@
 			<view style="font-size: 12px;color: #909399;padding: 3px 5px;background: #f4f4f5;display: inline-block;" 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;display: inline-block;" class="freeShippingstyle" v-if="y.freeShipping_Use==true&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
+			<view style="font-size: 12px;color: #FF4048;padding: 3px 5px;background: #fdf6ec;display: inline-block;" class="freeShippingstyle" v-if="y.freeShipping_Use==true&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
 				{{y.freeShippingDescription!=null ?y.freeShippingDescription:''}} 
 			</view>
 		  </view>

pages/cart/cart.vue

@@ -110,9 +110,10 @@
 								  text-overflow: ellipsis;
 								  margin-top: 2px;
 								"
+								v-if="item.FreeShippingName !=null && (item.FreeShippingFullMoneyPinkage>0 || item.FreeShippingFullNumPinkage>0)"
 								
 																>
-												<view style="color: #ff9900;background: #fdf6ec;padding: 0 5px;display: inline-block;">
+												<view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;">
 													<Text style="
 													  font-size: 20rpx;
 													  margin-right: 5rpx;

pages/order-submit/order-submit.vue

@@ -67,10 +67,10 @@
 					</view>
 				</template>
 				<template>
-					<view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;align-items: center;" v-if="x.pinkageList.length>0">
+					<view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;align-items: center;flex-wrap: wrap;" v-if="x.pinkageList.length>0">
 						已满足:
-						<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  style="height: 22px;line-height: 22px;font-size: 12px;color: #FF4048;background: #fdf6ec;padding: 0 5px;margin-left: 10px;margin-bottom: 5px;" v-for="(y, yi) in x.pinkageList" :key="yi">
+							<text>{{y.Name}}</text>
 						</view>
 					</view>
 				</template>