fix:回退代码

pages/groupbuying_details/detail/index.vue

@@ -4,19 +4,17 @@
 		<scroll-view scroll-y="true" scroll-with-animation='true' style="height: calc(100% - 100rpx)">
 
 			<view class="detail-img">
-				<image
-					:src="goodsInfo.goodsCover"
-					mode="scaleToFill" />
+				<image :src="goodsInfo.goodsCover" mode="scaleToFill" />
 			</view>
 			<view class="detail-content">
 				<view style="display:flex; 	margin-bottom: 20rpx;">
-					<text class="red"> ¥{{goodsInfo.discountPrice}}</text>
-					<text class="line-thr">¥{{goodsInfo.salePrice}}</text>
+					<text class="red"> ¥{{ goodsInfo.discountPrice }}</text>
+					<text class="line-thr">¥{{ goodsInfo.salePrice }}</text>
 				</view>
 				<view class="detail-content-t">
-					{{goodsInfo.goodsName}}
+					{{ goodsInfo.goodsName }}
 				</view>
-<!-- 				<view class='time '>
+				<!-- 				<view class='time '>
 					<image src="http://www.gzzzyd.com/groupon/home_slices/编辑@2x.png" mode="scaleToFill" />
 					发布于：
 					<text class="imp_info">
@@ -25,10 +23,13 @@
 				</view> -->
 			</view>
 
-			<view class="detail-info">
+			<view class="detail-info product-intro">
 				<view class="title">
 					商品信息
+
 				</view>
+				<u-album :urls="storeInfo.detailImage" :rowCount="1" :multipleSize="albumWidth" maxCount="9999"
+					multipleMode="widthFix"></u-album>
 			</view>
 		</scroll-view>
 
@@ -49,7 +50,7 @@
 						<button class="share-btn ">
 							分享有礼
 						</button>
-						<button class="now-btn "  @submit="goBuy">
+						<button class="now-btn " @submit="goBuy">
 							立即购买
 						</button>
 					</view>
@@ -292,5 +293,4 @@ export default {
 
 
 }
-
 </style>

pages/groupbuying_details/index.vue

@@ -36,22 +36,9 @@
 						</view>
 
 						<view class="wrapper">
-
 							<view class="share acea-row row-between row-bottom">
-								<view class="box_3 flex-row justify-between">
-									<view class="text-group_11 flex-col"  @click="goToDetail(e.id)">
-										<view class="text-wrapper_4">
-											<text class="text_8">¥</text>
-											<text class="text_9">{{storeInfo.minPrice}}</text>
-											<text class="text_10">&nbsp;~</text>
-											<text class="text_8">¥</text>
-											<text class="text_9">{{storeInfo.maxPrice}}</text>
-										</view>
-										<text class="text_13">{{storeInfo.mainTitle}}</text>
-									</view>
-									<view class="iconfont icon-fenxiang skeleton-rect" @click="listenerActionSheet"></view>
-								</view>
 
+								<!-- <view class="iconfont icon-fenxiang skeleton-rect" @click="listenerActionSheet"></view> -->
 							</view>
 							<view class="introduce skeleton-rect" v-text="storeInfo.goodsName"></view>
 							<view class='info-area'>
@@ -69,10 +56,12 @@
 							</view>
 							<view class="countdown flex-row">
 								<view class="countdown-l" hover-class="none" hover-stop-propagation="false">
-										<block v-for="(item, index) in storeInfo.grouponUsers" :key="index">
-											<image v-if="index < 4" class="avatar-group_1" referrerpolicy="no-referrer"
-												:src="item.userAvatar || `http://wine.gzzzyd.com/test/static/img/bg.a82f9752.jpg`" />
-										</block>
+									<image class="avatar-group_1" referrerpolicy="no-referrer"
+										src="http://wine.gzzzyd.com/test/static/img/bg.a82f9752.jpg" />
+									<image class="avatar-group_1" referrerpolicy="no-referrer"
+										src="http://wine.gzzzyd.com/test/static/img/bg.a82f9752.jpg" />
+									<image class="avatar-group_1" referrerpolicy="no-referrer"
+										src="http://wine.gzzzyd.com/test/static/img/bg.a82f9752.jpg" />
 									<text class="red">{{storeInfo.grouponUserTotal}}人</text>
 									<text class="yellow">正在参团中</text>
 								</view>
@@ -80,7 +69,6 @@
 									<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> -->
 									<u-count-down :timestamp="storeInfo.seconds" :show-days="false"></u-count-down>
 								</view>
 							</view>
@@ -88,17 +76,62 @@
 							<view class="groupbuying-log" hover-class="none" hover-stop-propagation="false">
 								<view class="log-top">
 									<text class="log-top-title">团购记录</text>
-									<text class="log-top-count">共{{storeInfo.grouponUserTotal}}条</text>
+									<text class="log-top-count">共8条</text>
 								</view>
-								<view class="log-body" v-if="storeInfo.grouponUserTotal > 0" v-for="(item, index) in storeInfo.grouponUsers" :key="index">
+								<view class="log-body">
 									<view class="log-item">
 										<image
-											:src="item.userAvatar"
+											src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
 											mode="scaleToFill" />
 
 										<view class="log-item-content">
 											<view class="log-item-content-t">
-												{{item.createTime}} 下单了
+												2023-05-31 10:22:35 下单了
+											</view>
+											<view class="log-item-content-b">
+												宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
+											</view>
+										</view>
+									</view>
+									<view class="log-item">
+										<image
+											src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
+											mode="scaleToFill" />
+
+										<view class="log-item-content">
+											<view class="log-item-content-t">
+												2023-05-31 10:22:35 下单了
+											</view>
+											<view class="log-item-content-b">
+												宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
+											</view>
+										</view>
+									</view>
+									<view class="log-item">
+										<image
+											src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
+											mode="scaleToFill" />
+
+										<view class="log-item-content">
+											<view class="log-item-content-t">
+												2023-05-31 10:22:35 下单了
+											</view>
+											<view class="log-item-content-b">
+												宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
+											</view>
+										</view>
+									</view>
+									<view class="log-item">
+										<image
+											src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
+											mode="scaleToFill" />
+
+										<view class="log-item-content">
+											<view class="log-item-content-t">
+												2023-05-31 10:22:35 下单了
+											</view>
+											<view class="log-item-content-b">
+												宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
 											</view>
 										</view>
 									</view>
@@ -114,8 +147,8 @@
 								</view>
 
 								<view class="all-products-body" v-for="(item, index) in storeInfo.goodsList" :key="index">
-
-									<view class="all-products-item" @click="getGoodsDetails(item.id)">
+									
+									<view class="all-products-item" @click="addGoodPopupShow = true">
 										<image
 											:src="item.goodsCover"
 											mode="scaleToFill" />
@@ -131,7 +164,7 @@
 												</view>
 
 												<view>
-													<u-number-box :min="0" :max="10" v-model="storeInfo.goodsList[index].num" @change="addGoodsNum"></u-number-box>
+													<u-number-box v-model="value" @change="valChange"></u-number-box>
 												</view>
 											</view>
 										</view>
@@ -154,7 +187,7 @@
 					</view>
 					<view class="product-intro" id="past3">
 						<view class="title">{{ $t(`产品介绍`) }}</view>
-						<u-album :urls="storeInfo.detailImgUrlList" :rowCount="1" :multipleSize="albumWidth" maxCount="9999"
+						<u-album :urls="storeInfo.detailImage" :rowCount="1" :multipleSize="albumWidth" maxCount="9999"
 							multipleMode="widthFix"></u-album>
 					</view>
 				</scroll-view>
@@ -258,7 +291,7 @@
 
 		<u-popup :show="addGoodPopupShow" @close="addGoodPopupShow = false" @open="	">
 			<view>
-				<detail :goodsInfo="goods" v-if="addGoodPopupShow"></detail>
+				<detail v-if="addGoodPopupShow"></detail>
 			</view>
 		</u-popup>
 
@@ -452,16 +485,9 @@ export default {
 			currentPage: false,
 			svip_price_open: 1,
 			promotionNo: '',
-			promotionShare: '',
-			selfTakeId: '',
-			organizerUserId: '',
-			goodsMap:{},
-			goods: {}
+			promotionShare: ''
 		};
 	},
-	created() {
-		this.goodsMap = new Map();
-	},
 	computed: mapGetters(["isLogin", "uid", "userInfo", "selectAddr"]),
 	watch: {
 		isLogin: {
@@ -502,9 +528,6 @@ export default {
 	},
 	onLoad (options) {
     console.log("options -》 ",options);
-	let that = this;
-	that.selfTakeId = options.selfTakeId;
-	that.organizerUserId = options.organizerUserId;
 		console.log(this.userInfo);
 		uni.hideShareMenu();
 		console.log("是否登录：" + this.isLogin);
@@ -902,7 +925,7 @@ export default {
       let that = this;
       console.log(that.id)
       detailGroupon({grouponId: that.id}).then((res) => {
-        that.storeInfo = res.data;
+        that.storeInfo = res.data
       })
     },
 
@@ -910,41 +933,38 @@ export default {
 		 * 获取产品详情
 		 *
 		 */
-		getGoodsDetails (goodsId) {
-			// uni.showLoading({ title: '团购信息加载中' });
+		getGoodsDetails: function () {
+			uni.showLoading({ title: '团购信息加载中' });
 			let that = this;
-			that.goods = {}
-			that.addGoodPopupShow = true
-			goodsDetail({ id: goodsId })
+			goodsDetail({ id: that.id })
 				.then((res) => {
-					that.goods = res.data;
-					// let storeInfo = res.data;
-					// that.storeInfo = res.data
-
-					// console.log('res.data.slideshowList', res.data.slideshowList);
-					// res.data.imgList = res.data.slideshowList.map(e => {
-					// 	return {
-					// 		image: e,
-					// 		title: ''
-					// 	}
-					// })
-					// console.log('res.data', res.data);
-					// // 处理分享
-					// if (that.storeInfo.zoneType == 8) {
-					// 	that.sharePacket.isState = true
-					// }
-					// that.skuArr = storeInfo.goodsSpecList
-					// that.$set(that, "storeInfo", storeInfo);
-					// that.$set(that.attr, "productAttr", storeInfo.goodsSpecList);
-					// // that.downloadFilestoreImage();
-					// that.getUserAddressByUserId()
-					// setTimeout(function () {
-					// 	that.infoScroll();
-					// }, 500);
-					// setTimeout(() => {
-					// 	this.showSkeleton = false;
-					// }, 100);
-				}).catch((err) => {
+					let storeInfo = res.data;
+					that.storeInfo = res.data
+					console.log('res.data.slideshowList', res.data.slideshowList);
+					res.data.imgList = res.data.slideshowList.map(e => {
+						return {
+							image: e,
+							title: ''
+						}
+					})
+					console.log('res.data', res.data);
+					// 处理分享
+					if (that.storeInfo.zoneType == 8) {
+						that.sharePacket.isState = true
+					}
+					that.skuArr = storeInfo.goodsSpecList
+					that.$set(that, "storeInfo", storeInfo);
+					that.$set(that.attr, "productAttr", storeInfo.goodsSpecList);
+					// that.downloadFilestoreImage();
+					that.getUserAddressByUserId()
+					setTimeout(function () {
+						that.infoScroll();
+					}, 500);
+					setTimeout(() => {
+						this.showSkeleton = false;
+					}, 100);
+				})
+				.catch((err) => {
 					//状态异常返回上级页面
 					return that.$util.Tips({
 						title: err.toString(),
@@ -953,9 +973,9 @@ export default {
 						url: 1,
 					});
 				});
-			// this.sharePacket.isCanShare = false
-			// this.sharePacket.isFristUrl = true
-			// this.listenerActionSheet()
+			this.sharePacket.isCanShare = false
+			this.sharePacket.isFristUrl = true
+			this.listenerActionSheet()
 		},
 		infoScroll: function () {
 			var that = this,
@@ -1328,23 +1348,20 @@ export default {
 			}
 		},
 		goBuyNew(){
-			let goodsArr = []
-			this.storeInfo.goodsList.forEach(e => {
-				if(e.num > 0) {
-					goodsArr.push({goodsId: e.id, num: e.num})
+			if (true) {
+					uni.navigateTo({
+						url: "/pages/groupbuying_details/order_details_confirm/index?num=123"
+							+ "&freight=123"
+
+					});
+				} else {
+					that.$util.Tips({
+						title: that.$t(`所选商品属性不支持下单`),
+						success: () => {
+							// that.getCartCount(true);
+						},
+					});
 				}
-			})
-			if (goodsArr.length < 1) {
-				uni.showToast({
-					title: '请选择商品',
-					icon: 'none'
-				});
-				return;
-			}
-			uni.navigateTo({
-				url: "/pages/groupbuying_details/order_details_confirm/index?organizerUserId=" + this.organizerUserId
-				 + "&selfTakeId=" + this.selfTakeId + "&goods=" + encodeURIComponent(JSON.stringify(goodsArr)) + "&grouponId=" + this.id
-			});
 		},
 		open (data) {
 			this.showMenuIcon = data;
@@ -1517,9 +1534,6 @@ export default {
 				this.$set(this, "attrValue", productSelect.suk);
 			}
 		},
-		addGoodsNum(item) {
-
-		}
 	},
 };
 </script>
@@ -2314,10 +2328,9 @@ action-sheet-item {
 	box-sizing: border-box;
 	background-color: rgba(255, 247, 248, 1.000000);
 	border-radius: 12rpx;
-	width: 95%;
-	height: 80rpx;
-	padding-top: 10rpx;
-	line-height: 80rpx;
+	height: 100rpx;
+	padding: 20rpx;
+	line-height: 100rpx;
 	align-self: center;
 	display: flex;
 	border: 1px solid dashed;
@@ -2326,12 +2339,17 @@ action-sheet-item {
 
 	.countdown-l {
 		flex: 1;
+		display: flex;
+    align-items: center;
 	}
 
 	.countdown-r {
 		flex: 1;
+		display: flex;
+		align-items: center;
 	}
 
+
 	.red {
 		height: 34rpx;
 		font-size: 24rpx;
@@ -2350,13 +2368,13 @@ action-sheet-item {
 		vertical-align: super;
 	}
 
-	.yellow {
-		height: 34rpx;
-		font-size: 24rpx;
-		font-weight: 400;
-		color: #FF9600;
-		line-height: 34rpx;
-		vertical-align: super;
+	/deep/.yellow,.u-count-down  {
+		font-size: 24rpx ;
+		font-weight: 400 ;
+		color: #FF9600 ;
+		line-height: 80rpx ;
+		margin: 0 10rpx ;
+		vertical-align: super ;
 	}
 
 	image {
@@ -2552,65 +2570,8 @@ action-sheet-item {
 	font-weight: 400;
 	color: #fff;
 	line-height: 84rpx;
-}
 
-.box_3 {
-	width: 100%;
-	align-self: center;
-	margin-top: 4px;
-	padding: 0 10px;
-}
-.text-group_11 {
-	flex-direction: column;
-}
-.text-wrapper_4 {
-	height: 24px;
-	margin-bottom: 10px;
-	overflow-wrap: break-word;
-	letter-spacing: 0.20000000298023224px;
-	font-family: PingFangSC-Medium;
-	font-weight: 500;
-	text-align: left;
-	line-height: 24px;
-}
-
-.text_8 {
-	overflow-wrap: break-word;
-	color: rgba(178, 35, 56, 1);
-	font-size: 12px;
-	font-family: PingFangSC-Medium;
-	font-weight: 500;
-	text-align: left;
-	line-height: 24px;
-}
-
-.text_9 {
-	overflow-wrap: break-word;
-	color: rgba(178, 35, 56, 1);
-	font-size: 18px;
-	font-family: DINAlternate-Bold;
-	font-weight: 700;
-	text-align: left;
-	white-space: nowrap;
-	line-height: 24px;
-}
-.text_10 {
-	overflow-wrap: break-word;
-	color: rgba(178, 35, 56, 1);
-	font-size: 17px;
-	font-family: DINAlternate-Bold;
-	font-weight: 700;
-	text-align: left;
-	white-space: nowrap;
-	line-height: 24px;
-}
-.text_13 {
-	width: 100%;
-}
-.icon_4 {
-	width: 12px;
-	height: 12px;
-	margin: 33px 0 5px 0;
+
 }
 </style>