接入发布拼团接口

pages/groupbuying/publish_good_list/index.vue

@@ -140,14 +140,14 @@ export default {
 	},
 	methods: {
 		choice (item) {
-			console.log(this.productList2);
-			item.selected = !item.selected
-			this.productList2.splice(0, 0)
 
-			let data = this.productList2.filter(e => {
+			item.selected = !item.selected
+			this.goodsList.splice(0, 0)
+			console.log("item ", item.selected)
+			let data = this.goodsList.filter(e => {
 				return e.selected
 			})
-
+			// console.log("data ", data)
 			this.$emit('getSelectData', data);
 		},
 		getCategoryOne () {

pages/groupbuying/publish_group/index.vue

@@ -21,20 +21,22 @@
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>团购时间</view>
 						<view @click="show1 = true">
-							<input placeholder='请选择团购时间' name="phone" disabled :value='userAddress.date'
-								placeholder-class='placeholder' maxlength="11"></input>
+							<uni-datetime-picker @change="confirmDate1" v-model="datetimerange1" type="datetimerange" rangeSeparator="至">
+								<input placeholder='请选择团购时间' disabled :value='grouponDateTime'
+									placeholder-class='placeholder'></input>
+							</uni-datetime-picker>
 						</view>
-						<u-datetime-picker @confirm="dateConfirm" :show="show1" v-model="value1" mode="datetimerange"></u-datetime-picker>
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>提货时间</view>
 						<view @click="show2 = true">
-							<input placeholder='请选择提货时间' name="phone" disabled :value='userAddress.date2'
-								placeholder-class='placeholder' maxlength="11"></input>
+								<uni-datetime-picker @change="confirmDate2" v-model="datetimerange2" type="datetimerange" rangeSeparator="至">
+									<input placeholder='请选择提货时间' disabled :value='takeDateTime'
+										placeholder-class='placeholder'></input>
+								</uni-datetime-picker>
 						</view>
-
-						<u-datetime-picker @confirm="dateConfirmDate2()" :show="show2" v-model="value1"
-							mode="datetimerange"></u-datetime-picker>
+<!-- 						<u-datetime-picker @confirm="dateConfirmDate2()" :show="show2" v-model="value1"
+							mode="datetimerange"></u-datetime-picker> -->
 					</view>
 
 
@@ -42,10 +44,10 @@
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>自提点</view>
 						<view @click="openSelfTakeTable()">
-							<input type='number' placeholder='请选择提自提点' name="phone" disabled :value='userAddress.ZTD'
+							<input placeholder='请选择提自提点' name="phone" disabled :value='ztd'
 								placeholder-class='placeholder' maxlength="11"></input>
 						</view>
-						<u-picker @confirm="dateConfirmZTD()" :show="showZTD" :columns="columns"></u-picker>
+						<u-picker @confirm="confirmZTD()" :show="showZTD" :columns="selfTakeList" keyName="name"></u-picker>
 					</view>
 
 
@@ -59,13 +61,13 @@
 						<block v-for="(itemn, indexn) in selectGoodList" :key="indexn">
 							<view hover-class='none' class='item acea-row-item row-column row-middle'>
 								<view class='picture'>
-									<image :src='itemn.logo' v-if="itemn.logo"></image>
+									<image :src='itemn.goodsCover' v-if="itemn.goodsCover"></image>
 									<image src="/static/images/sort-img.png" v-else></image>
 								</view>
 								<view class="p-r">
-									<view class='name line1'>{{ $t(itemn.title) }}</view>
+									<view class='name line1'>{{ $t(itemn.goodsName) }}</view>
 									<view class="acea-row-item-bArea">
-										<view class='jiage line1'>￥48.00</view>
+										<view class='jiage line1'>￥{{itemn.discountPrice}}</view>
 										<view @click="delItem(indexn)" :class="[itemn.selected ? 'selde' : 'noselde']">删除<text
 												:class="[itemn.selected ? 'selde-q' : 'noselde-q']"></text></view>
 									</view>
@@ -145,15 +147,19 @@ export default {
 	mixins: [colors],
 	data () {
 		return {
+			grouponDateTime: '',
+			takeDateTime: '',
+			datetimerange1: '',
+			datetimerange2: '',
 			grouponReqData: {
 				mainTitle: '',
 				subTitle: '',
-				grouponStartTime:'2023-06-09 00:00:00',
-				grouponEndTime:'2023-06-11 00:00:00',
-				takeStartTime:'2023-06-13 00:00:00',
-				takeEndTime:'2023-06-16 00:00:00',
-				selfTakeIds: ['1664554394738343938'],
-				goodsIds: ['1666726817158090753']
+				grouponStartTime:'',
+				grouponEndTime:'',
+				takeStartTime:'',
+				takeEndTime:'',
+				selfTakeIds: [],
+				goodsIds: []
 			},
 			grouponTimeRange: [],
 			takeTimeRange: [],
@@ -190,7 +196,8 @@ export default {
 			news: '',
 			noCoupon: 0,
 			selectGoodList: [],
-			selfTakeList: []
+			selfTakeList: [],
+			ztd: ''
 		};
 	},
 	computed: mapGetters(['isLogin']),
@@ -222,19 +229,43 @@ export default {
 		}
 	},
 	methods: {
+		confirmDate1(value) {
+			let start = value[0];
+			let end = value[1];
+			this.grouponReqData.grouponStartTime = start;
+			this.grouponReqData.grouponEndTime = end;
+			this.grouponDateTime = start.substr(5,2) + "/" + start.substr(8,2) + " " +  start.substr(11,5) + " 至 " 
+			+ end.substr(5,2) + "/" + end.substr(8,2) + " " + end.substr(11,5);
+		},
+		confirmDate2(value) {
+			let start = value[0];
+			let end = value[1];
+			this.grouponReqData.takeStartTime = start;
+			this.grouponReqData.takeEndTime = end;
+			this.takeDateTime = start.substr(5,2) + "/" + start.substr(8,2) + " " +  start.substr(11,5) + " 至 " 
+			+ end.substr(5,2) + "/" + end.substr(8,2) + " " + end.substr(11,5);
+		},
+		selectDatetime() {
+			console.log("select datetime");
+			this.$refs.mySon.show();
+		},
 		openSelfTakeTable() {
-			this.showZTD = true;
+			console.log("openSelfTakeTable -> ", this.selfTakeList);
 			getAllSelfTake({
 				current: 1,
-				size: 20
+				size: 50
 			}).then(res => {
-				this.selfTakeList = res.data.recoreds;
+				console.log(res.data);
+				this.selfTakeList.push(res.data.records);
+				console.log(this.selfTakeList);
+				this.showZTD = true;
 			})
 		},
 		delItem (index) {
 			this.selectGoodList.splice(index, 1)
 		},
 		getSelectData (data) {
+			console.log("getSelectData  ", data)
 			this.selectGoodList = data
 			console.log(this.selectGoodList);
 		},
@@ -260,8 +291,10 @@ export default {
 			this.userAddress.date2 = value.value
 			this.show2 = false
 		},
-		dateConfirmZTD (value) {
-			this.userAddress.ZTD = value.value
+		confirmZTD (value) {
+			console.log(value)
+			this.ztd = value.value[0].name;
+			this.grouponReqData.selfTakeIds.push(value.value[0].id)
 			this.showZTD = false
 		},
 		// #ifdef APP-PLUS
@@ -556,15 +589,49 @@ export default {
 		formSubmit: function (e) {
 			let that = this,
 			value = e.detail.value;
-			console.log(value);
-			console.log(that.grouponReqData);
+			
+			
+
+			if (!value.mainTitle.trim()) {
+				return that.$util.Tips({
+					title: that.$t(`请填写主标题`)
+				});
+			}
+				
+			if (!value.subTitle.trim()) {
+				return that.$util.Tips({
+					title: that.$t(`请填写副标题`)
+				});
+			}
+			
+			if (!that.grouponReqData.grouponStartTime.trim() || !that.grouponReqData.grouponEndTime.trim()) {
+				return that.$util.Tips({
+					title: that.$t(`请选择团购时间`)
+				});
+			}
+			
+			if (!that.grouponReqData.takeStartTime.trim() || !that.grouponReqData.takeEndTime.trim()) {
+				return that.$util.Tips({
+					title: that.$t(`请选择取货时间`)
+				});
+			}
+			
+			if (that.grouponReqData.selfTakeIds.length < 1) {
+				return that.$util.Tips({
+					title: that.$t(`请选择自提点`)
+				});
+			}
+			if (this.selectGoodList.length < 1) {
+				return that.$util.Tips({
+					title: that.$t(`请添加商品`)
+				});
+			}
+			let goodsIds = [];
+			this.selectGoodList.forEach(e => {
+				goodsIds.push(e.id);
+				that.grouponReqData.goodsIds = goodsIds;
+			})
 
-			if (!value.mainTitle.trim()) return that.$util.Tips({
-				title: that.$t(`请填写主标题`)
-			});
-			if (!value.subTitle.trim()) return that.$util.Tips({
-				title: that.$t(`请填写副标题`)
-			});
 
 			uni.showLoading({
 				title: that.$t(`发布中`),