接入发布团购相关接口

api/groupon.js

@@ -22,10 +22,15 @@ export function goodsDetail(data) {
 
 // 发布团购
 export function publishGroupon(data) {
-    return request.post("/v1/groupon/detail",data);
+    return request.post("/v1/groupon/publish",data);
 }
 
 // 查询团购自提点
 export function getGrouponSelfTakeList(data) {
     return request.get("/v1/self-take/list",data);
 }
+
+// 分页查询所有自提点
+export function getAllSelfTake(data) {
+    return request.get("/v1/selfTake/all", data);
+}

api/home.js

@@ -15,12 +15,12 @@ export function getNoticeList(data) {
 
 // 根据一级商品分类查询二级商品分类
 export function getCategoryOne(data) {
-	return request.get("/v1/re/category/list",data);
+	return request.get("/v1/category/list",data);
 }
 
 // 根据一级商品分类查询二级商品分类
 export function getCategoryTwo(data) {
-	return request.get("v1/re/category/list",data);
+	return request.get("v1/category/list",data);
 }
 
 // 商品分页查询
@@ -38,6 +38,11 @@ export function getGoodsInfo(data) {
 	return request.get("v1/re/goodsInfo/page",data);
 }
 
+// 查询商品列表
+export function getGoodsList(data) {
+	return request.get("v1/goods/page",data);
+}
+
 /* 商品详情*/
 // 商品详情
 export function getGoodsDetail(data) {

config/app.js

@@ -3,7 +3,7 @@ module.exports = {
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式： https://您的域名
 	// HTTP_REQUEST_URL: `https://www.gzzhsckj.com`,
-	// HTTP_REQUEST_URL: `https://wine.gzzzyd.com`,
+	// HTTP_REQUEST_URL: `https://www.gzzzyd.com/g-api`,
 	// HTTP_REQUEST_URL: `http://localhost:8802`,
 	HTTP_REQUEST_URL: `https://www.gzzzyd.com/g-api`,
 	// HTTP_REQUEST_URL: `v4.crmeb.net`,

pages/groupbuying/publish_good_list/index.vue

@@ -22,16 +22,16 @@
 								<view class='line'></view>
 							</view> -->
 							<view class='list acea-row'>
-								<block v-for="(itemn, indexn) in productList2" :key="indexn">
+								<block v-for="(itemn, indexn) in goodsList" :key="indexn">
 									<view hover-class='none' @click="choice(itemn)" 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 :class="[itemn.selected ? 'selde' : 'noselde']">{{ itemn.selected ? "已选择" : "选择" }}<text
 														:class="[itemn.selected ? 'selde-q' : 'noselde-q']"></text></view>
 											</view>
@@ -68,7 +68,7 @@
 </template>
 
 <script>
-import { getCategoryOne, getCategoryTwo } from '@/api/home.js'
+import { getCategoryOne, getCategoryTwo, getGoodsList } from '@/api/home.js'
 let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 import {
 	getCategoryList
@@ -88,6 +88,7 @@ export default {
 	},
 	data () {
 		return {
+			goodsList: [],
 			selectItem: [],
 			src: 'http://www.gzzhsckj.com:9000/bladex/upload/20221026/5956cfd37ebc31cd2e00797909987482.jpg',
 			navlist: [],
@@ -156,10 +157,22 @@ export default {
 				if (res.data.length > 0) {
 					this.productList = res.data
 					this.selectItem = res.data[0]
-					this.getCategoryTwo(res.data[0].id)
+					// this.getCategoryTwo(res.data[0].id)
+					this.getGoodsList(res.data[0].id);
 				}
 			})
 		},
+		getGoodsList(cid) {
+			this.goodsList = [];
+			getGoodsList({
+				goodsCategoryId: cid,
+				current: 1,
+				size: 20
+			}).then(res => {
+				this.goodsList = res.data;
+			})
+			console.log(this.goodsList)
+		},
 		getCategoryTwo (id) {
 			getCategoryTwo({
 				parentId: id
@@ -234,7 +247,7 @@ export default {
 		},
 		tap: function (item, index, id) {
 			this.selectItem = item
-			this.getCategoryTwo(item.id)
+			this.getGoodsList(item.id)
 			this.toView = id;
 			this.navActive = index;
 			this.$set(this, 'lock', true);

pages/groupbuying/publish_group/index.vue

@@ -5,12 +5,12 @@
 				<view class='list'>
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>主标题</view>
-						<input type='text' placeholder='请填写主标题' name='realName' :value="userAddress.realName"
+						<input type='text' placeholder='请填写主标题' name='mainTitle' :value="grouponReqData.mainTitle"
 							placeholder-class='placeholder'></input>
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>副标题</view>
-						<input type='number' placeholder='请填写副标题' name="phone" :value='userAddress.phone'
+						<input type='number' placeholder='请填写副标题' name="subTitle" :value='grouponReqData.subTitle'
 							placeholder-class='placeholder' pattern="\d*" maxlength="11"></input>
 					</view>
 				</view>
@@ -21,28 +21,27 @@
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>团购时间</view>
 						<view @click="show1 = true">
-							<input type='number' placeholder='请选择团购时间' name="phone" disabled :value='userAddress.date'
+							<input placeholder='请选择团购时间' name="phone" disabled :value='userAddress.date'
 								placeholder-class='placeholder' maxlength="11"></input>
 						</view>
-
-						<u-datetime-picker @confirm="dateConfirm" :show="show1" v-model="value1" mode="datetime"></u-datetime-picker>
+						<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 type='number' placeholder='请选择提货时间' name="phone" disabled :value='userAddress.date2'
+							<input placeholder='请选择提货时间' name="phone" disabled :value='userAddress.date2'
 								placeholder-class='placeholder' maxlength="11"></input>
 						</view>
 
 						<u-datetime-picker @confirm="dateConfirmDate2()" :show="show2" v-model="value1"
-							mode="datetime"></u-datetime-picker>
+							mode="datetimerange"></u-datetime-picker>
 					</view>
 
 
 
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>自提点</view>
-						<view @click="showZTD = true">
+						<view @click="openSelfTakeTable()">
 							<input type='number' placeholder='请选择提自提点' name="phone" disabled :value='userAddress.ZTD'
 								placeholder-class='placeholder' maxlength="11"></input>
 						</view>
@@ -109,6 +108,7 @@
 
 <script>
 const city_res = require('@/mock/json/city_res.json')
+import {publishGroupon, getAllSelfTake} from '@/api/groupon.js';
 import {
 	postUserAddressSave,
 	postUserAddressUpdate,
@@ -145,6 +145,18 @@ export default {
 	mixins: [colors],
 	data () {
 		return {
+			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']
+			},
+			grouponTimeRange: [],
+			takeTimeRange: [],
 			columns: [
 				['中国', '美国', '日本']
 			],
@@ -177,7 +189,8 @@ export default {
 			defaultRegionCode: '110101',
 			news: '',
 			noCoupon: 0,
-			selectGoodList: []
+			selectGoodList: [],
+			selfTakeList: []
 		};
 	},
 	computed: mapGetters(['isLogin']),
@@ -209,6 +222,15 @@ export default {
 		}
 	},
 	methods: {
+		openSelfTakeTable() {
+			this.showZTD = true;
+			getAllSelfTake({
+				current: 1,
+				size: 20
+			}).then(res => {
+				this.selfTakeList = res.data.recoreds;
+			})
+		},
 		delItem (index) {
 			this.selectGoodList.splice(index, 1)
 		},
@@ -343,7 +365,7 @@ export default {
 			this.$set(this.multiArray, 1, multiArray[1]);
 			this.$set(this.multiArray, 2, multiArray[2]);
 			// #endif
-			// #ifdef H5 
+			// #ifdef H5
 			this.multiArray = multiArray;
 			// #endif
 
@@ -529,97 +551,66 @@ export default {
 			}).catch(err => { });
 		},
 		/**
-		 * 提交用户添加地址
-		 * 
+		 * 发布团购
 		 */
 		formSubmit: function (e) {
 			let that = this,
-				value = e.detail.value;
-			if (!value.realName.trim()) return that.$util.Tips({
-				title: that.$t(`请填写收货人姓名`)
-			});
-			if (!value.phone) return that.$util.Tips({
-				title: that.$t(`请填写联系电话`)
-			});
-			if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
-				title: that.$t(`请输入正确的手机号码`)
-			});
-			if (that.region[0] == that.$t(`省`)) return that.$util.Tips({
-				title: that.$t(`请选择所在地区`)
+			value = e.detail.value;
+			console.log(value);
+			console.log(that.grouponReqData);
+
+			if (!value.mainTitle.trim()) return that.$util.Tips({
+				title: that.$t(`请填写主标题`)
 			});
-			if (!value.detail.trim()) return that.$util.Tips({
-				title: that.$t(`请填写详细地址`)
+			if (!value.subTitle.trim()) return that.$util.Tips({
+				title: that.$t(`请填写副标题`)
 			});
-			value.id = that.id;
-			let regionArray = that.region;
-			value.province = regionArray[0],
-				value.city = regionArray[1],
-				value.district = regionArray[2],
-				// value.city_id = that.cityId,
-				value.isDeleted = 0
-			value.userId = this.$store.state.app.uid
-			value.defaultState = that.userAddress.defaultState ? 2 : 1
+
 			uni.showLoading({
-				title: that.$t(`保存中`),
+				title: that.$t(`发布中`),
 				mask: true
 			})
 			let resSuccess = false;
-			console.log(that.userAddress.defaultState);
-			if (that.id) {
-				postUserAddressUpdate(value).then(res => {
-					that.$util.Tips({
-						title: that.$t(`修改成功`),
-						icon: 'success'
-					});
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				})
+			publishGroupon(that.grouponReqData).then(res => {
+				that.$util.Tips({
+					title: that.$t(`提交成功`),
+					icon: 'success'
+				});
 				resSuccess = true
-			}
-			else {
-				postUserAddressSave(value).then(res => {
-					that.$util.Tips({
-						title: that.$t(`添加成功`),
-						icon: 'success'
-					});
+			}).catch(err => {
+				return that.$util.Tips({
+					title: err
+				});
+			})
 
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				})
-				resSuccess = true
-			}
 			if (resSuccess) {
-				setTimeout(function () {
-					if (that.cartId) {
-						let cartId = that.cartId;
-						let pinkId = that.pinkId;
-						let couponId = that.couponId;
-						that.cartId = '';
-						that.pinkId = '';
-						that.couponId = '';
-						uni.navigateTo({
-							url: '/pages/goods/order_confirm/index?new=' + that.news +
-								'&cartId=' + cartId + '&addressId=' + (that.id ? that.id :
-									res.data.id) + '&pinkId=' + pinkId + '&couponId=' +
-								couponId +
-								'&noCoupon=' + that
-									.noCoupon
-						});
-					} else {
-						// #ifdef H5
-						return history.back();
-						// #endif
-						// #ifndef H5
-						return uni.navigateBack({
-							delta: 1,
-						})
-						// #endif
-					}
-				}, 1000);
+				// setTimeout(function () {
+				// 	if (that.cartId) {
+				// 		let cartId = that.cartId;
+				// 		let pinkId = that.pinkId;
+				// 		let couponId = that.couponId;
+				// 		that.cartId = '';
+				// 		that.pinkId = '';
+				// 		that.couponId = '';
+				// 		uni.navigateTo({
+				// 			url: '/pages/goods/order_confirm/index?new=' + that.news +
+				// 				'&cartId=' + cartId + '&addressId=' + (that.id ? that.id :
+				// 					res.data.id) + '&pinkId=' + pinkId + '&couponId=' +
+				// 				couponId +
+				// 				'&noCoupon=' + that
+				// 					.noCoupon
+				// 		});
+				// 	} else {
+				// 		// #ifdef H5
+				// 		return history.back();
+				// 		// #endif
+				// 		// #ifndef H5
+				// 		return uni.navigateBack({
+				// 			delta: 1,
+				// 		})
+				// 		// #endif
+				// 	}
+				// }, 1000);
 			}
 		},
 		ChangeIsDefault: function (e) {

pages/groupbuying_details/index.vue

@@ -82,7 +82,8 @@
 									<image src="http://www.gzzzyd.com/groupon/home_slices/倒计时@2x.png" mode="scaleToFill" />
 									<text class="yellow">截止倒计时</text>
 									<!-- <text class="red2">02时25分19秒</text> -->
-									<uni-countdown color="#B22338" :show-day="false" :show-colon="false" :hour="storeInfo.h" :minute="storeInfo.m" :second="storeInfo.s"></uni-countdown>
+									<!-- <uni-countdown color="#B22338" :show-day="false" :show-colon="false" :hour="storeInfo.h" :minute="storeInfo.m" :second="storeInfo.s"></uni-countdown> -->
+									<u-count-down :timestamp="storeInfo.seconds" :show-days="false"></u-count-down>
 								</view>
 							</view>
 

pages/index/diy/components/latestGroupBuying.vue

@@ -52,7 +52,8 @@
 						<image src="http://www.gzzzyd.com/groupon/home_slices/倒计时@2x.png" mode="scaleToFill" />
 						<text class="yellow">截止倒计时</text>
 						<!-- <text class="red2">02时25分19秒</text> -->
-						<uni-countdown :show-day="false" :hour="e.h" :minute="e.m" :second="e.s"></uni-countdown>
+						<!-- <uni-countdown :show-day="false" :hour="e.h" :minute="e.m" :second="e.s"></uni-countdown> -->
+						<u-count-down :timestamp="e.seconds" :show-days="false"></u-count-down>
 					</view>
 				</view>
 				<view class="self-pickup-point">
@@ -141,6 +142,7 @@ export default {
 	},
 	data () {
 		return {
+			timestamp: 86400,
 			navigationList2: [],
 			ProductNavindex: 0,
 			numConfig: 9,