1

pagesHome/order/detail.vue

@@ -30,8 +30,10 @@
 								class="money"><text>¥</text>{{info.specs&&info.specs.length>0?info.specs[0].flow_money:0}}</text>
 						</view>
 						<view class="one_3" v-if="discount">
-							<text v-if="discount.full_decrement" class="act">{{discount.full_decrement}}</text>
-							<text v-if="discount.full_fold" class="act">{{discount.full_fold}}</text>
+							<text v-if="discount.full_decrement" class="act"
+								v-for="(item,index) in discount.full_decrement" :key="index">{{item}}</text>
+							<text v-if="discount.full_fold" class="act" v-for="(item,index) in discount.full_fold"
+								:key="index">{{item}}</text>
 						</view>
 						<view class="one_4">
 							<view class="name">
@@ -437,9 +439,16 @@
 						that.$set(that, `info`, data);
 						// 优惠
 						act = data.act.find(i => i.type == '5')
-						if (act) that.$set(that.discount, `full_decrement`, act.text);
+						if (act) {
+							var text = act.text.split(';')
+							that.$set(that.discount, `full_decrement`, text);
+						}
+
 						act = data.act.find(i => i.type == '6')
-						if (act) that.$set(that.discount, `full_fold`, act.text);
+						if (act) {
+							var text = act.text.split(';')
+							that.$set(that.discount, `full_fold`, text);
+						}
 						// 查询规格
 						that.searchSpecs(data.specs);
 						// 查询评价数
@@ -828,15 +837,18 @@
 			}
 
 			.one_3 {
+				display: flex;
+				flex-wrap: wrap;
 				padding: 1vw;
 				border-bottom: 0.5vw solid var(--f9Color);
 
 				.act {
 					font-size: 12px;
 					border: 1px solid var(--fFB1Color);
-					margin: 0 0.5vw 0 0;
+					margin: 0 1vw 1vw 0;
 					color: var(--fFB1Color);
 					border-radius: 6px;
+					padding: 0 1vw;
 				}
 			}
 
@@ -1257,10 +1269,6 @@
 
 								.left {
 									width: 85vw;
-
-									.num {
-										color: var(--fFB1Color);
-									}
 								}
 							}
 						}

pagesHome/order/order.vue

@@ -386,11 +386,6 @@
 					that.$set(that, `skip`, skip)
 					that.searchAct(actInfo);
 					uni.hideLoading();
-				} else {
-					uni.showToast({
-						title: `没有更多商品了`,
-						icon: 'none'
-					})
 				}
 			},
 			// 提交订单