1

pagesHome/order/detail.vue

@@ -554,15 +554,19 @@
 				let user = that.user;
 				let info = that.info;
 				let specsInfo = that.specsInfo;
+				let act = that.info.act.map(item => {
+					return item._id
+				})
 				if (user && user._id) {
-					let obj = {
+					let obj = [{
 						customer: user._id,
 						shop: info.shop._id,
 						goods: info.goods._id,
 						goodsSpec: specsInfo._id,
 						num: that.buy_num,
-						inviter: that.inviter
-					}
+						inviter: that.inviter,
+						act: act
+					}]
 					let res = await that.$api(`/util/checkCanBuy`, 'POST', obj)
 					if (res.errcode == '0') {
 						if (res.data.result == true) {

pagesHome/order/order.vue

@@ -28,7 +28,8 @@
 								</view>
 								<view class="list_2" v-for="(tag,index) in item.goods" :key="index">
 									<view class="l">
-										<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''" mode=""></image>
+										<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''"
+											mode=""></image>
 									</view>
 									<view class="c">
 										<view class="name">
@@ -40,7 +41,7 @@
 									</view>
 									<view class="r">
 										<view class="price" v-if="type=='0'">
-											¥{{tag.money}}
+											¥{{tag.price}}
 										</view>
 										<view v-else class="price">
 											¥{{tag.group_sell_money}}
@@ -69,6 +70,29 @@
 									</view>
 								</view>
 							</view>
+							<view class="act">
+								<view class="act_1">
+									订单已满<text>{{act.money||0}}元，为你推荐优惠商品搭配</text>
+								</view>
+								<view class="act_2">
+									<checkbox-group @change="checkboxChange">
+										<label class="list" v-for="(item,index) in actList" :key="index">
+											<image class="image"
+												:src="item.file.length>0?item.file[0].url:item.file[0].url"
+												mode="aspectFill"></image>
+											<view class="name">{{item.goods_name}}</view>
+											<view class="money">
+												<text>￥{{item.sell_money}}</text>
+												<text>￥{{item.flow_money}}</text>
+											</view>
+											<view class="checkbox">
+												<checkbox :value="item.value" :checked="item.checked" />
+											</view>
+										</label>
+									</checkbox-group>
+									<view class="bottom"><text class="iconfont icon-xiajiantou-copy"></text></view>
+								</view>
+							</view>
 							<view class="other" v-if="type=='0'">
 								<view class="other_1">优惠劵</view>
 								<view class="other_2" @click="toCoupon" v-if="couponList.length">
@@ -137,6 +161,8 @@
 				group_id: '',
 				// 分享人id
 				inviter: '',
+				// 活动商品
+				actList: [],
 			};
 		},
 		onLoad: function(e) {
@@ -228,6 +254,19 @@
 				that.$set(that, 'coupon', [])
 				that.$refs.popup.open();
 			},
+			checkboxChange(e) {
+				const that = this;
+				var actList = that.actList,
+					id = e.detail._id;
+				for (var i = 0, lenI = actList.length; i < lenI; ++i) {
+					const item = actList[i]
+					if (id.includes(item._id)) {
+						this.$set(item, 'checked', true)
+					} else {
+						this.$set(item, 'checked', false)
+					}
+				}
+			},
 			// 提交订单
 			async toSubmit() {
 				const that = this;
@@ -503,6 +542,14 @@
 					}
 				}
 
+				.act {
+					background-color: var(--mainColor);
+					border-bottom: 0.1vw solid var(--fcColor);
+					margin: 0 0 2vw 0;
+					width: 96vw;
+					padding: 2vw;
+				}
+
 				.other {
 					display: flex;
 					justify-content: space-between;