From dd71a0f32a381d877a8ec784e8fab09672bdc4ee Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 24 Jul 2020 19:48:57 +0800
Subject: [PATCH] comment 7.2

---
 common/api/shop.js                     |   9 +-
 components/comment/index.vue           | 100 ++++
 components/shop/group/index.vue        |  40 +-
 components/shop/group/item.vue         |  33 +-
 components/shop/list/index.vue         |  40 +-
 components/shop/list/item.vue          |  33 +-
 components/shop/recommend/index.vue    |   2 +-
 components/shop/recommend/pintuan.vue  |  39 +-
 components/shop/seckill/index.vue      |   3 +
 components/shop/seckill/item.vue       |  35 +-
 components/shop/special-shop/index.vue |  68 ++-
 components/shop/youhq/index.vue        |  11 +-
 pageB/comment/index.vue                |  79 +++
 pageB/components/sdetails/guige.vue    |   2 +-
 pageB/components/sdetails/tloos.vue    | 176 ++++--
 pageB/sdetails/index.vue               | 430 +++++++++++----
 pageB/sdetails/index1.vue              | 723 +++++++++++++++++++++++++
 pageC/cart/ConfirmOrder.vue            |  13 +-
 pageC/cart/cashier.vue                 |  34 +-
 pageE/order/Comment.vue                |   8 +-
 pages.json                             |  11 +
 pages/shop/index.vue                   |  91 ++--
 static/image/common/20.png             | Bin 0 -> 3205 bytes
 23 files changed, 1630 insertions(+), 350 deletions(-)
 create mode 100644 components/comment/index.vue
 create mode 100644 pageB/comment/index.vue
 create mode 100644 pageB/sdetails/index1.vue
 create mode 100644 static/image/common/20.png

diff --git a/common/api/shop.js b/common/api/shop.js
index ae8b05a..a56f116 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -259,7 +259,14 @@ export default {
 			},
 			getStoreInfo({id}){
 				return vm.$u.post('Store/getStoreInfo',{id})
-			}
+			},
+			// 获取商品评论
+			getAllEvalue({ goods_id, page }) {
+				return vm.$u.post('Specialci/getAllEvalue', {
+					goods_id: goods_id,
+					page: page,
+				})
+			},
         }
     }
     
diff --git a/components/comment/index.vue b/components/comment/index.vue
new file mode 100644
index 0000000..fcdb680
--- /dev/null
+++ b/components/comment/index.vue
@@ -0,0 +1,100 @@
+<template>
+	<view class="comment-item">
+		<view class="user">
+			<u-avatar :src="content.member_avatar" class="avatar" size="60"></u-avatar>
+			<text class="name">{{ content.geval_frommembername }}</text>
+			<u-rate v-if="reply" :disabled='true' count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
+		</view>
+		<view class="content">
+			<view class="text">{{ content.geval_content }}</view>
+		</view>
+		<view class="reply" v-if="reply && content.geval_explain">
+			<view class="title">掌柜回复：</view>
+			<view class="content u-line-4">{{ content.geval_explain }}</view>
+		</view>
+		<view class="time" v-if="reply">
+			<image src="/static/image/common/20.png"></image>
+			<view class="value">{{ content.geval_addtime }}</view>
+		</view>
+	</view>
+</template>
+<script>
+/*
+* @description 显示评价
+* @property {Boolean} reply 是否显示回复/时间/评分
+**/
+export default {
+	data() {
+		return {
+			count: 5,
+			rate: 2,
+		}
+	},
+	props: {
+		content: Object,
+		reply: Boolean,
+	},
+	created() {
+		if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two;
+	}
+};
+</script>
+<style lang="scss" scoped>
+.comment-item {
+	background-color: #ffffff;
+	.user {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		.name {
+			margin: 0 20rpx;
+			font-size: 26rpx;
+			color: rgba(153,153,153,1);
+		}
+	}
+	.content {
+		margin-bottom: 20rpx;
+		.text {
+			font-size: 26rpx;
+			color: rgba(51,51,51,1);
+			line-height: 40rpx;
+			margin-bottom: 20rpx;
+		}
+		> image {
+			width: 210rpx;
+			height: 210rpx;
+			border-radius: 10px;
+			&:not(:nth-child(3n)) {
+				margin-right: 30rpx;
+			}
+		}
+	}
+	.reply {
+		padding: 30rpx;
+		background: rgba(240,238,238,1);
+		border-radius: 10rpx;
+		font-size: 24rpx;
+		color: rgba(102,102,102,1);
+		margin-bottom: 20rpx;
+		.title {
+			margin-bottom: 16rpx;
+		}
+		.content {
+			line-height: 36rpx;
+		}
+	}
+	.time {
+		display: flex;
+		align-items: center;
+		> image {
+			width: 28rpx;
+			height: 28rpx;
+			margin-right: 12rpx;
+		}
+		.value {
+			font-size: 24rpx;
+			color: rgba(153,153,153,1);
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/shop/group/index.vue b/components/shop/group/index.vue
index f13d33c..fba5f4f 100644
--- a/components/shop/group/index.vue
+++ b/components/shop/group/index.vue
@@ -11,7 +11,7 @@
 			<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
 				<!-- 最多显示3个 -->
 				<sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem>
-				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList.length"></u-empty>
+				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList.length" style="margin: 0 auto;"></u-empty>
 			</swiper-item>
 		</swiper>
     </view>
@@ -24,16 +24,33 @@ export default {
         sitem
 	},
 	props: {
-		groupList: Array,
 		classifyList: Array,
 	},
     data(){
         return {
-			current: 0,
+			current: -1,
 			swiperCurrent: 0,
+			groupList: [], // 拼团商品
         }
 	},
+	watch: {
+		current(value) {
+			this.getPinTuanList(this.classifyList[value].gc_id);
+		}
+	},
+	created() {
+		this.current = 0;
+	},
 	methods: {
+		// 拼团列表
+		getPinTuanList(id) {
+			this.$u.api.getPinTuanList({
+				page: 0,
+				gc_id: id,
+			}).then(res => {
+				this.groupList = res.data;
+			})
+		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
 		},
@@ -52,7 +69,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 .group{
-    .top{
+	background-color: #ffffff;
+    .top {
+		padding: 0 30rpx;
         height: 90rpx;
         width: 100%;
         display: flex;
@@ -67,18 +86,11 @@ export default {
             color: #999;
         }
     }
-    // .label{
-    //     display: flex; 
-    //     font-size: 24rpx;
-    //     color: #999;
-    //     >text{
-    //         margin-right: 34rpx;
-    //     }
-    // }
-    .list{
+    .list {
+		box-sizing: border-box;
+		padding: 30rpx;
         display: flex;
         justify-content: space-between;
-        margin-top: 21rpx;
     }
 }
 </style>
\ No newline at end of file
diff --git a/components/shop/group/item.vue b/components/shop/group/item.vue
index 1dc51fe..141f0e9 100644
--- a/components/shop/group/item.vue
+++ b/components/shop/group/item.vue
@@ -16,19 +16,26 @@ export default {
 	},
 	methods: {
 		toDetailsPage() {
-			this.$u.api.getPinTuanDetails({
-				pintuan_id: this.info.pintuan_id,
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.data,
-						type: 2,
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGoodsId', this.info.pintuan_id);
-					this.$u.route({
-						url: 'pageB/sdetails/index',
-					})
+			// this.$u.api.getPinTuanDetails({
+			// 	pintuan_id: this.info.pintuan_id,
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.data,
+			// 			type: 2,
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGoodsId', this.info.pintuan_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: this.info.pintuan_id,
+					type: 2,
 				}
 			})
 		}
diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 89cdc9c..9a0d72f 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -1,25 +1,21 @@
 <template>
     <view class="list">
-        <view class="top">
-            商品推荐
-        </view>
+        <view class="top">商品推荐</view>
 		<view>
 			<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60" ></u-tabs-swiper>
 		</view>
 		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
-				<!-- <scroll-view scroll-y style="height: 800rpx;width: 100%;"> -->
-					<view class="goods-item">
-						<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
-					</view>
-					<u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
-				<!-- </scroll-view> -->
+				<view class="goods-item">
+					<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
+				</view>
+				<u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
 			</swiper-item>
 		</swiper>
 		<!-- 加载更多 -->
-		<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20"></u-loadmore>
+		<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20"></u-loadmore>
 		<!-- <loadmore ref="loadmore" @callback="getGoodsRecommend" bgColor="#FFF" :page="page"></loadmore> -->
-    </view>    
+    </view>
 </template>
 <script>
 import item from "./item";
@@ -124,29 +120,17 @@ export default {
 </script>
 <style lang="scss" scoped>
 .list{
-    .top{
+	background-color: #ffffff;
+	padding: 30rpx {
+		top: 0;
+	};
+    .top {
         font-size: 30rpx;
         height: 90rpx;
         line-height: 90rpx;
         text-align: center;
         color: #333;
     }
-    // .label{
-    //     display: flex;
-    //     color: #999;
-	// 	flex-wrap: wrap;
-    //     >text{
-    //         margin-right: 34rpx;
-	// 		margin-bottom: 10rpx;
-    //     }
-    // }
-    // .item{
-    //     display: flex;
-    //     flex-wrap: wrap;
-    //     justify-content: space-between;
-    //     margin-top: 20rpx;
-
-    // }
 	.goods-item {
 		display: flex;
 		flex-wrap: wrap;
diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue
index 71fe6ea..c33e26c 100644
--- a/components/shop/list/item.vue
+++ b/components/shop/list/item.vue
@@ -16,20 +16,27 @@ export default {
 	},
 	methods: {
 		toDetailsPage() {
-			this.$u.api.getGoodsDetails({ id: this.info.goods_id }).then(res => {
-				if (res.errCode == 0) {
-					const goods = {
-						goods: res.data,
-						type: 1,
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGoodsId', this.info.goods_id);
-					this.$u.route({
-						url: 'pageB/sdetails/index',
-					})
-					// console.log(this.goodsInfo.mobile_body);
+			// this.$u.api.getGoodsDetails({ id: this.info.goods_id }).then(res => {
+			// 	if (res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data,
+			// 			type: 1,
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGoodsId', this.info.goods_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 		// console.log(this.goodsInfo.mobile_body);
+			// 	}
+			// })
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: this.info.goods_id,
+					type: 1,
 				}
-            })
+			})
 		}
 	},
 }
diff --git a/components/shop/recommend/index.vue b/components/shop/recommend/index.vue
index abba02c..fd70123 100644
--- a/components/shop/recommend/index.vue
+++ b/components/shop/recommend/index.vue
@@ -32,7 +32,7 @@ export default {
 	props: ['recommendData', 'type'],
 	created() {
 		this.info = this.recommendData;
-		console.log(this.recommendData);
+		// console.log(this.recommendData);
 	}
 }
 </script>
diff --git a/components/shop/recommend/pintuan.vue b/components/shop/recommend/pintuan.vue
index 86195c2..fa3193f 100644
--- a/components/shop/recommend/pintuan.vue
+++ b/components/shop/recommend/pintuan.vue
@@ -39,19 +39,26 @@ export default {
 	},
 	methods: {
 		toDetailsPage() {
-			this.$u.api.getPinTuanDetails({
-				pintuan_id: this.recommendData.pintuan_id
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.data,
-						type: 2,
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGoodsId', this.recommendData.pintuan_id);
-					this.$u.route({
-						url: 'pageB/sdetails/index',
-					})
+			// this.$u.api.getPinTuanDetails({
+			// 	pintuan_id: this.recommendData.pintuan_id
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.data,
+			// 			type: 2,
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGoodsId', this.recommendData.pintuan_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: this.recommendData.pintuan_id,
+					type: 2,
 				}
 			})
 		}
@@ -60,7 +67,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .recommend{
-    .top{
+	margin-bottom: 20rpx;
+	padding: 0 30rpx;
+	background-color: #ffffff;
+    .top {
         height: 90rpx;
         display: flex;
         align-items: center;
@@ -75,6 +85,7 @@ export default {
         }
     }
     .connect{
+		padding: 30rpx;
         display: flex;
 		align-items: center;
         .user {
diff --git a/components/shop/seckill/index.vue b/components/shop/seckill/index.vue
index bbce842..d80891d 100644
--- a/components/shop/seckill/index.vue
+++ b/components/shop/seckill/index.vue
@@ -45,6 +45,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 .seckill{
+	background-color: #fff;
+	padding: 30rpx;
+	margin-bottom: 20rpx;
     .top{
         height: 60rpx;
         display: flex;
diff --git a/components/shop/seckill/item.vue b/components/shop/seckill/item.vue
index 6e1a4dd..efebd34 100644
--- a/components/shop/seckill/item.vue
+++ b/components/shop/seckill/item.vue
@@ -26,20 +26,27 @@ export default {
 	methods: {
 		spikeGoods() {
 			// console.log(this.item.groupbuy_id);
-			this.$u.api.getSpikeInfo({
-				groupbuy_id: this.item.groupbuy_id
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.goodsInfo,
-						type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
-					this.$store.commit('setGoodsId', this.item.groupbuy_id);
-					this.$u.route({
-						url: 'pageB/sdetails/index',
-					})
+			// this.$u.api.getSpikeInfo({
+			// 	groupbuy_id: this.item.groupbuy_id
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.goodsInfo,
+			// 			type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
+			// 		this.$store.commit('setGoodsId', this.item.groupbuy_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: this.item.groupbuy_id,
+					type: 3,
 				}
 			})
 		},
diff --git a/components/shop/special-shop/index.vue b/components/shop/special-shop/index.vue
index 24d3255..f623003 100644
--- a/components/shop/special-shop/index.vue
+++ b/components/shop/special-shop/index.vue
@@ -42,37 +42,51 @@ export default {
 	methods: {
 		spikeGoods() {
 			// console.log(this.item.groupbuy_id);
-			this.$u.api.getSpikeInfo({
-				groupbuy_id: this.item.groupbuy_id
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.goodsInfo,
-						type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
-					this.$store.commit('setGoodsId', this.item.groupbuy_id);
-					this.$u.route({
-						url: 'pageB/sdetails/index',
-					})
+			// this.$u.api.getSpikeInfo({
+			// 	groupbuy_id: this.item.groupbuy_id
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.goodsInfo,
+			// 			type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
+			// 		this.$store.commit('setGoodsId', this.item.groupbuy_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: this.item.groupbuy_id,
+					type: 3,
 				}
 			})
 		},
 		toDetailsPage() {
-			this.$u.api.getPinTuanDetails({
-				pintuan_id: this.item.pintuan_id
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.data,
-						type: 2,
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGoodsId', this.item.pintuan_id);
-					this.$u.route({
-						url: 'pageB/sdetails/index',
-					})
+			// this.$u.api.getPinTuanDetails({
+			// 	pintuan_id: this.item.pintuan_id
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.data,
+			// 			type: 2,
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGoodsId', this.item.pintuan_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: this.item.pintuan_id,
+					type: 2,
 				}
 			})
 		}
diff --git a/components/shop/youhq/index.vue b/components/shop/youhq/index.vue
index f6641d4..97a0431 100644
--- a/components/shop/youhq/index.vue
+++ b/components/shop/youhq/index.vue
@@ -78,7 +78,7 @@ export default {
 			num = this.couponList.length 
 				? this.couponList.length > 4 ? 4 : this.couponList.length
 				: 1
-			this.swiperHeight = (97 + 10) * num - 10 + 'px';
+			this.swiperHeight = (97 + 10) * num + 'px';
 		},
 		toCouponPage() {
 			this.$u.route({
@@ -93,8 +93,11 @@ export default {
 </script>
 <style lang="scss" scoped>
 .coupon-swiper {
+	background-color: #ffffff;
+	margin-bottom: 40rpx;
 	.top {
-		padding-top: 30rpx;
+		padding: 0 30rpx;
+		height: 90rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
@@ -109,11 +112,9 @@ export default {
 		}
 	}
 	.swiper-coupon-item {
+		padding: 0 30rpx;
 		box-sizing: border-box;
 		background-color: #ffffff;
-		// padding: 30rpx {
-		// 	top: 0;
-		// };
 		.coupon-item {
 			margin-bottom: 20rpx;
 		}
diff --git a/pageB/comment/index.vue b/pageB/comment/index.vue
new file mode 100644
index 0000000..0ad8cbe
--- /dev/null
+++ b/pageB/comment/index.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="comment">
+		<view class="label-list">
+			<view v-for="(label, index) in 5" :key="index" :class="{'active': current == index}" @click="current=index">{{ '全部(' + label * 389 + '}' }}</view>
+		</view>
+		<view class="comment-container">
+			<view v-for="(item, index) in evalueList" :key="index" class="itme">
+				<comment :reply="true" :content="item"></comment>
+			</view>
+			<u-empty text="暂无评论" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
+		</view>
+	</view>
+</template>
+<script>
+import comment from "@/components/comment/index";
+export default {
+	data() {
+		return {
+			current: 0,
+			page: 0,
+			evalueList: [],
+		}
+	},
+	components: {
+		comment
+	},
+	onLoad(option) {
+		this.getAllEvalue(option.id);
+	},
+	methods: {
+		getAllEvalue(id) {
+			this.$u.api.getAllEvalue({ 
+				goods_id: id, 
+				page: this.page 
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.evalueList = res.data;
+				} else {
+					this.evalueList = [];
+				}
+			})
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.comment {
+	height: calc(100vh - var(--window-top));
+	background-color: #EEEBEE;
+	padding-bottom: 30rpx;
+	.label-list {
+		padding: 30rpx;
+		background-color: #ffffff;
+		margin-bottom: 14rpx;
+		display: flex;
+		flex-wrap: wrap;
+		> view {
+			box-sizing: content-box;
+			padding: 16rpx 20rpx;
+			border-radius: 30rpx;
+			margin: 0 20rpx 20rpx 0;
+			background: rgba(236,236,236,1);
+			font-size: 26rpx;
+			color: rgba(153,153,153,1);
+		}
+		.active {
+			background: rgba(255,120,15,1);
+			color: #ffffff;
+		}
+	}
+	.comment-container {
+		.itme {
+			padding: 30rpx;
+			background-color: #ffffff;
+			margin-bottom: 10rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageB/components/sdetails/guige.vue b/pageB/components/sdetails/guige.vue
index 59a695b..7ba8a6e 100644
--- a/pageB/components/sdetails/guige.vue
+++ b/pageB/components/sdetails/guige.vue
@@ -50,7 +50,7 @@ export default {
     name:"guige",
     data(){
         return {
-            select:0
+            select: 0
         }
     },
     props:['item','title'],
diff --git a/pageB/components/sdetails/tloos.vue b/pageB/components/sdetails/tloos.vue
index 8039406..d1e37bd 100644
--- a/pageB/components/sdetails/tloos.vue
+++ b/pageB/components/sdetails/tloos.vue
@@ -1,6 +1,7 @@
 <template>
     <view>
-        <view class="tloos">
+		<!-- 普通商品 tool -->
+        <view class="tloos" v-if="type == 1">
             <view class="navs">
                 <image src="/static/image/common/18.png"></image>
                 店铺
@@ -13,6 +14,28 @@
             <view class="button" style="background:rgba(253,211,96,1);" @click="buy(2)">加入购物车</view>
             <view class="button" style="background:rgba(255,120,15,1);" @click="buy(1)">立即购买</view>
         </view>
+		<!-- 拼团 tool -->
+		<view class="group-tool" v-if="type==2">
+			<view class="launch" @click="settlementOrder">发起拼团</view>
+			<view class="involvement" @click="showGroupUser=true">参与拼团</view>
+		</view>
+		<!-- 秒杀 tool -->
+		<view class="spike-tool" v-if="type==3">
+			<view class="left">
+				<view>
+					<image src="/static/image/common/18.png"></image>
+					<text>店铺</text>
+				</view>
+				<view>
+					<image src="/static/image/common/19.png"></image>
+					<text>客服</text>
+				</view>
+			</view>
+			<view class="btn" v-if="groupbuyInfo.groupbuy_state == 20 && groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity" @click="spikeGoods">立即秒杀</view>
+			<view class="btn" :class="{'cannot': groupbuyInfo.groupbuy_state == 32 || groupbuyInfo.inventory == groupbuyInfo.groupbuy_buy_quantity}" v-else>
+				{{ groupbuyInfo.groupbuy_state == 32 ? '时间已结束' : (groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity ? '立即秒杀' : '已售空') }}
+			</view>
+		</view>
         <u-popup v-model="show" mode="bottom">
 			<scroll-view scroll-y="true" class="popup">
 				<view>
@@ -40,9 +63,9 @@
 import guige from "./guige"
 export default {
 	name:"tloos",
-	props: ['id', 'info'],
+	props: ['id', 'info', 'type'],
     components:{
-        guige
+		guige,
     },
     data(){
         return {
@@ -107,6 +130,69 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.group-tool {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 98rpx;
+	display: flex;
+	font-size: 32rpx;
+	color: rgba(255,255,255,1);
+	z-index: 99;
+	.launch {
+		flex: 1;
+		background: rgba(253,211,96,1);
+		line-height: 98rpx;
+		text-align: center;
+	}
+	.involvement {
+		flex: 1;
+		background: rgba(255,120,15,1);
+		line-height: 98rpx;
+		text-align: center;
+	}
+}
+.spike-tool {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 98rpx;
+	display: flex;
+	z-index: 99;
+	.left {
+		width: 190rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		> view {
+			text-align: center;
+			> image {
+				width: 35rpx;
+				height: 35rpx;
+				margin-bottom: 15rpx;
+			}
+			> text {
+				display: block;
+				font-size: 24rpx;
+				color: rgba(102,102,102,1);
+			}
+		}
+	}
+	.btn {
+		flex: 1;
+		height: 98rpx;
+		line-height: 98rpx;
+		text-align: center;
+		font-size: 32rpx;
+		color: rgba(255,255,255,1);
+		background: rgba(255,120,15,1);
+	}
+	.cannot {
+		background: rgba(221,221,221,1);
+	}
+}
 .tloos{
 	background-color: #fff;
     display: flex;
@@ -143,46 +229,46 @@ export default {
     }
   
 }
-  .popup{
-        padding: 30rpx;
-        box-sizing: border-box;
-        max-height: 750rpx;
-        .head{
-            display: flex;
-            margin-bottom: 30rpx;
-            .image{
-                width: 195rpx;
-                height: 195rpx;
-                border-radius: 10rpx;
-                flex-shrink: 0;
-            }
-            .info{
-                display: flex;
-                padding: 21rpx 0;
-                justify-content: space-between;
-                margin-left: 27rpx;
-                flex-direction: column;
-                >text:first-child{
-                    font-size: 28rpx;
-                    color: #333;
-                }
-                >text:last-child{
-                    font-size: 30rpx;
-                    color: #ff3131;
-                }
-            }
-        }
-    
-        .num{
-            height: 84rpx;
-            display: flex;
-            border-bottom: #ececec solid 2rpx;
-            justify-content: space-between;
-            align-items: center;
-            >text{
-                font-size: 26rpx;
-                color: #666;
-            }
-        }
-    }
+.popup{
+	padding: 30rpx;
+	box-sizing: border-box;
+	max-height: 750rpx;
+	.head{
+		display: flex;
+		margin-bottom: 30rpx;
+		.image{
+			width: 195rpx;
+			height: 195rpx;
+			border-radius: 10rpx;
+			flex-shrink: 0;
+		}
+		.info{
+			display: flex;
+			padding: 21rpx 0;
+			justify-content: space-between;
+			margin-left: 27rpx;
+			flex-direction: column;
+			>text:first-child{
+				font-size: 28rpx;
+				color: #333;
+			}
+			>text:last-child{
+				font-size: 30rpx;
+				color: #ff3131;
+			}
+		}
+	}
+
+	.num{
+		height: 84rpx;
+		display: flex;
+		border-bottom: #ececec solid 2rpx;
+		justify-content: space-between;
+		align-items: center;
+		>text{
+			font-size: 26rpx;
+			color: #666;
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index de2c8bf..5443d92 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="sdetails">
         <u-swiper :list="list" height="500" border-radius="0" mode="dot"></u-swiper>
-		<view class="spike-view" v-if="type==3">
+		<view class="spike-view" v-if="type == 3">
 			<view class="left">
 				<view class="price">
 					<view class="now-price">￥{{ groupbuyInfo.groupbuy_price }}</view>
@@ -25,10 +25,20 @@
         </view>
         <view class="hr"></view>
 		<!-- <navs :value="领券"></navs> -->
-        <navs :value="'产品规格'"></navs>
+        <navs :value="'产品规格'" @click.native="showSpec=true"></navs>
 		<!-- <navs :value="'产品颜色'"></navs> -->
 		<!-- <navs :value="'选择尺码'"></navs> -->
-		<!-- <navs v-for="(value, index) in goodsInfo.spec_name" :value="value" :key="index"></navs> -->
+		<view class="comment">
+			<view class="title">
+				<view class="left">商品评价（{{ evaluate.evaluate_num }}）</view>
+				<view class="right" @click="viewComment">
+					<text>查看全部</text>
+					<image src="/static/image/common/1.png"></image>
+				</view>
+			</view>
+			<comment :reply="false" :content="evaluate" v-if="evaluate.evaluate_num"></comment>
+			<view class="comment-none">暂无评价</view>
+		</view>
 		<view class="hr"></view>
 		<view class="group-user" v-if="groupUser.length">
 			<view class="top">
@@ -97,12 +107,47 @@
 		<view class="rich">
 			<rich-text :nodes="goodsInfo.mobile_body"></rich-text>
 		</view>
+		<!-- 选择规格数量 -->
+		<u-popup v-model="showSpec" mode="bottom">
+			<scroll-view scroll-y="true" class="spec-popup">
+				<view>
+					<view class="head">
+						<image class="image" :src="goodsInfo.goods_image"></image>
+						<view class="info">
+							<text class="u-line-2">{{goodsInfo.goods_name}}</text>
+							<text>￥{{goodsInfo.goods_price}}</text>
+						</view>
+					</view>
+					<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige>
+					<view class="num">
+						<text>购买数量</text>
+						<u-number-box v-model="goodsNumber" @change="valChange"></u-number-box>
+					</view>
+					<view style="height:100rpx"></view>
+				</view>
+				<u-toast ref="uToast" />
+			</scroll-view>
+        </u-popup>
+		<!-- 普通商品 tool -->
+        <view class="tloos" v-if="type == 1">
+            <view class="navs">
+                <image src="/static/image/common/18.png"></image>
+                店铺
+            </view>
+            <view class="navs" style="margin-right:30rpx">
+                <image src="/static/image/common/19.png"></image>
+                客服
+            </view>
+            <view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1">试穿试送</view>
+            <view class="button" style="background:rgba(253,211,96,1);" @click="addCart">加入购物车</view>
+            <view class="button" style="background:rgba(255,120,15,1);" @click="settlementOrder">立即购买</view>
+        </view>
 		<!-- 拼团 tool -->
 		<view class="group-tool" v-if="type==2">
 			<view class="launch" @click="settlementOrder">发起拼团</view>
 			<view class="involvement" @click="showGroupUser=true">参与拼团</view>
 		</view>
-		<!-- 秒杀 -->
+		<!-- 秒杀 tool -->
 		<view class="spike-tool" v-if="type==3">
 			<view class="left">
 				<view>
@@ -119,97 +164,111 @@
 				{{ groupbuyInfo.groupbuy_state == 32 ? '时间已结束' : (groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity ? '立即秒杀' : '已售空') }}
 			</view>
 		</view>
-		<!-- 普通商品 tool -->
-        <tloos @buy="buy" @xuanze="xuanze" :id="goodsInfo.goods_commonid" :info="goodsInfo" v-if="type==1"></tloos>
+        <!-- <tloos @buy="buy" @xuanze="xuanze" :id="id" :info="goodsInfo" :type="type"></tloos> -->
         <u-toast ref="uToast" />
     </view>
 </template>
 <script>
-/*
-* 详情是请求完存在store的，在这里从store取值
-**/
-import navs from "../components/sdetails/navs"
-import tloos from "../components/sdetails/tloos"
+import comment from "@/components/comment/index";
+import navs from "../components/sdetails/navs";
+import guige from "../components/sdetails/guige"
+import tloos from "../components/sdetails/tloos";
 export default {
-    name:"sdetails",
+    name: "sdetails",
     data() {
         return {
             list: [],　// 轮播图列表
-            goodsInfo: {},
-            info:{},
-            glist:[],
-			id:0, // 商品id
+            goodsInfo: {}, // 商品信息
+            glist: [], // 规格列表
+			id: 0, // 商品id/秒杀id/拼团 id
 			type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
 			groupUser: [], // 拼团用户
 			user_suc: [], // 拼团成功用户
-			avatarWidth: '',
-			pintuan_id: '', // 拼团id
 			showGroupUser: false, // 拼团
 			showInvolvementUser: false, // 参团
 			involvemenGroupInfo: [], // 参团的人
 			groupbuyInfo: {}, // 秒杀详情
 			spikeTime: '',
-			timer: '', // 时间定时器
+			timer: '', // 秒杀时间定时器
+			spec_id: '', // 规格 id, 下单用的
+			evaluate: {}, // 评价内容
+			showSpec: false, // 是否显示选择规格
+			goodsNumber: 1,
+			sel: "", // 拼接的规格
+            quanxuan: false, // 规格是否选择
         }
 	},
-    components:{
+    components: {
+		comment,
         navs,
-        tloos
+		tloos,
+		guige,
+	},
+	watch: {
+		sel(value){
+			this.xuanze(value);
+		},
 	},
 	onShow() {
-		// if(this.pintuan_id) {
-		// 	this.$u.api.getPinTuanDetails({
-		// 		pintuan_id: this.pintuan_id
-		// 	}).then(res => {
-		// 		if(res.errCode == 0) {
-		// 			const goods = {
-		// 				goods: res.data.data,
-		// 				type: 2,
-		// 			}
-		// 			this.$store.commit('setGoodsDetails', goods);
-		// 			this.$store.commit('setGoodsId', this.pintuan_id);
-		// 		}
-		// 	})
-		// }
+		this.showSpec = false;
+		this.showGroupUser = false;
+		this.showInvolvementUser = false;
 	},
-	onLoad() {
-		this.init();
+	onLoad(option) {
+		// this.init();
+		// console.log(option);
+		this.type = Number(option.type);
+		this.id = option.id;
+		this.getGoodsDetails(this.id);
+		this.setTitle();
 	},
 	beforeDestroy() {
 		clearInterval(this.timer);
 	},
 	methods: {
-		init() {
-			this.id = this.$store.state.goods_id;
-			this.type = this.$store.getters.getGoodsType;
-			const info = this.$store.getters.getGoodsInfo;
-			if(this.type == 2) {
-				this.user_suc = info.user_suc;
-				this.groupUser = info.user;
-				this.pintuan_id = info.pintuan_id;
-			}
-			if (this.type == 3) {
-				this.groupbuyInfo = this.$store.state.groupbuyInfo;
-				this.setSpikeTime();
-			}
-			// console.log(this.groupbuyInfo);
-			this.goodsInfo = info.goods;
-			// 设置轮播图
-			let list = [];
-			info.goods_image[0].forEach(item => {
+		// init() {
+		// 	this.id = this.$store.state.goods_id;
+		// 	this.type = this.$store.getters.getGoodsType;
+		// 	const info = this.$store.getters.getGoodsInfo;
+		// 	// 拼团商品
+		// 	if(this.type == 2) {
+		// 		this.user_suc = info.user_suc;
+		// 		this.groupUser = info.user;
+		// 		this.pintuan_id = info.pintuan_id;
+		// 	}
+		// 	// 秒杀商品
+		// 	if (this.type == 3) {
+		// 		this.groupbuyInfo = this.$store.state.groupbuyInfo;
+		// 		this.setSpikeTime();
+		// 	}
+		// 	// console.log(this.groupbuyInfo);
+		// 	this.goodsInfo = info.goods;
+		// 	// 设置轮播图
+		// 	let list = [];
+		// 	info.goods_image[0].forEach(item => {
+		// 		let temp = {
+		// 			image: item
+		// 		}
+		// 		list.push(temp);
+		// 	})
+		// 	this.list = list;
+		// 	this.setTitle();
+		// },
+		setSwiperList(list) {
+			let img = [];
+			list.forEach(item => {
 				let temp = {
 					image: item
 				}
-				list.push(temp);
+				img.push(temp);
 			})
-			this.list = list;
-			this.setTitle();
+			this.list = img;
 		},
 		spikeGoods() {
 			this.settlementOrder()
 		},
-		setSpikeTime() {
-			const time = this.groupbuyInfo.groupbuy_endtime;
+		setSpikeTime(time) {
+			// const time = this.groupbuyInfo.groupbuy_endtime;
 			this.timer = setInterval(() => {
 				let spikeTime = time * 1000 - new Date().getTime();
 				// 计算天数
@@ -229,61 +288,102 @@ export default {
 				// console.log(this.spikeTime);
 			}, 1000)
 		},
-        buy(info){
-            if(info.type == 2){ // 加入购物车
-                this.$u.api.addCart({
-                    goods_id: this.id,
-                    quantity: info.value,
-                }).then(res => {
-                    this.$refs.uToast.show({
-                        title: res.message,
-                        type: res.errCode == 0 ? 'success' : 'warning',
-                    })
-                })
-            } else if (info.type == 1) { // 支付
-				this.settlementOrder({num: info.value});
-			}
-        },
+		addCart() {
+			this.$u.api.addCart({
+				goods_id: this.id,
+				quantity: this.goodsNumber,
+			}).then(res => {
+				this.$refs.uToast.show({
+					title: res.message,
+					type: res.errCode == 0 ? 'success' : 'warning',
+				})
+			})
+		},
+		purchase() {
+			this.settlementOrder();
+		},
 		getGoodsDetails(id) {
-			this.id = id;
+			switch (this.type) {
+				case 1:
+					this.ordinaryDetails(id);
+					break;
+				case 2:
+					this.pinTuanDetails(id);
+					break;
+				case 3:
+					this.spikeGoodsDetails(id);
+					break;
+				case 4:
+					
+					break;
+			
+				default:
+					break;
+			}
+		},
+		// 普通商品
+		ordinaryDetails(id) {
 			this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
 				if (res.errCode == 0) {
+					this.evaluate = res.data.goods_evaluate_info;
 					this.goodsInfo = res.data.goods;
-					let list = [];
-					res.data.goods_image[0].forEach(item => {
-						let temp = {
-							image: item
-						}
-						list.push(temp);
-					})
-					this.list = list;
-					this.info = res.data.goods;
+					this.setSwiperList(res.data.goods_image[0]);
 					this.glist = res.data.spec_list;
 					// console.log(this.goodsInfo.mobile_body);
 				}
 			})
 		},
-		// 下单
+		// 拼团
+		pinTuanDetails(id) {
+			this.$u.api.getPinTuanDetails({
+				pintuan_id: id
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.evaluate = res.data.data.goods_evaluate_info;
+					this.goodsInfo = res.data.data.goods;
+					this.setSwiperList(res.data.data.goods_image[0]);
+					this.glist = res.data.data.spec_list;
+					this.user_suc = res.data.data.user_suc;
+					this.groupUser =res.data.data.user;
+				}
+			})
+		},
+		// 秒杀
+		spikeGoodsDetails(id) {
+			this.$u.api.getSpikeInfo({
+				groupbuy_id: id
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.groupbuyInfo = res.data.groupbuyInfo;
+					this.evaluate = res.data.goodsInfo.goods_evaluate_info;
+					this.goodsInfo = res.data.goodsInfo.goods;
+					this.setSwiperList(res.data.goodsInfo.goods_image[0]);
+					this.setSpikeTime(res.data.groupbuyInfo.groupbuy_endtime);
+				}
+			})
+		},
 		/*
+		* @description 下单 订单步骤1：展示结算数据
 		* @params {Number} type 拼团或者开团
+		* @params {Number} num 数量
+		* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
 		**/
-		settlementOrder({type, num = 1} = {}) {
-			// ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
+		settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
 			let params = {
-				ifcart: 0, 
+				ifcart: ifcart, 
 				cart_id: [this.goodsInfo.goods_id + '|' + num],
 			}
 			if(this.type == 2) {
 				if(type == 'involvement') {
 					Object.assign(params, {
-						pintuan_id: this.pintuan_id, 
+						pintuan_id: this.id, 
 						pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id 
 					})
 				} else {
 					const userId = uni.getStorageSync('user_info').member.member_id;
 					this.$store.commit('setGroupHeadId', userId);
 					Object.assign(params, {
-						pintuan_id: this.pintuan_id,
+						pintuan_id: this.id,
 					})
 				}
 			}
@@ -297,16 +397,42 @@ export default {
 				}
 			})
 		},
+		// 参团
 		involvemenGroup(user) {
 			this.involvemenGroupInfo = user;
 			this.showGroupUser = false;
 			this.showInvolvementUser = true;
 			// console.log(this.involvemenGroupInfo);
 		},
+		valChange(e) {
+            // console.log(this.value)
+        },
+        self(){
+            // console.log(this.$refs.guige)
+            let index = 0;
+            let arr = [];
+            for(let i in this.goodsInfo.spec_value){
+                // console.log(i)
+                // console.log(this.$refs.guige[index++].select)
+                // index++;
+                let sel = this.$refs.guige[index++].select
+                if(sel != 0){
+                    arr.push(sel)
+                }
+            }
+            // console.log(arr.length)
+            if(arr.length == index){
+                this.sel = arr.join("|")
+                this.quanxuan = true
+                // console.log(this.sel)
+            }
+        },
         xuanze(id){
-            console.log(id)
-            // this.getGoodsDetails(this.glist[id])
+			// console.log(id)
+            this.getGoodsDetails(this.glist[id])
+			this.id = this.glist[id];
 		},
+		// 设置页面标题
 		setTitle() {
 			let title = '';
 			switch (this.type) {
@@ -329,6 +455,14 @@ export default {
 				title: title
 			});
 		},
+		viewComment() {
+			this.$u.route({
+				url: 'pageB/comment/index',
+				params: {
+					id: this.goodsInfo.goods_id
+				}
+			})
+		}
 	},
 }
 </script>
@@ -336,6 +470,7 @@ export default {
 .sdetails {
 	padding-bottom: 98rpx;
 	position: relative;
+	background-color: #EEEBEE;
 	.spike-view {
 		position: absolute;
 		top: 396rpx;
@@ -397,7 +532,9 @@ export default {
 		}
 	}
     .info {
+		background:rgba(255,255,255,1);
         padding: 30rpx;
+		margin-bottom: 20rpx;
         .title{
             flex-wrap: wrap;
 			margin-bottom: 30rpx;
@@ -424,12 +561,42 @@ export default {
             }
         }
     }
+	.comment {
+		margin-top: 20rpx;
+		background:rgba(255,255,255,1);
+		padding: 30rpx;
+		.title {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 30rpx;
+			.left {
+				font-size: 30rpx;
+				color: rgba(51,51,51,1);
+			}
+			.right {
+				font-size: 24rpx;
+				color: rgba(153,153,153,1);
+				> image {
+					width: 8rpx;
+					height: 16rpx;
+					margin-left: 10rpx;
+				}
+			}
+		}
+		.comment-none {
+			font-size: 26rpx;
+			text-align: center;
+			margin-top: 30rpx;
+		}
+	}
     .hr {
         width: 100%;
         height: 20rpx;
         background-color: #ececec;
     }
 	.group-user {
+		background: rgba(255,255,255,1);
 		padding: 30rpx;
 		.top {
 			margin-bottom: 28rpx;
@@ -739,5 +906,82 @@ export default {
 			background: rgba(221,221,221,1);
 		}
 	}
+	.tloos{
+		background-color: #fff;
+		display: flex;
+		position: fixed;
+		height: 98rpx;
+		width: 100%;
+		bottom:0;
+		border-top: 1rpx solid #ececec;
+		z-index: 1000000;
+		.navs{
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			font-size: 24rpx;
+			color: #666;
+			flex-shrink: 0;
+			margin-left: 30rpx;
+			>image{
+				width: 35rpx;
+				height: 35rpx;
+				margin-bottom: 15rpx;
+			}
+			
+
+		}
+		.button{
+			width: 100%;
+			height: 100%;
+			line-height: 98rpx;
+			text-align: center;
+			color: #fff;
+
+		}
+	}
+	.spec-popup {
+		padding: 30rpx;
+		box-sizing: border-box;
+		max-height: 750rpx;
+		.head{
+			display: flex;
+			margin-bottom: 30rpx;
+			.image{
+				width: 195rpx;
+				height: 195rpx;
+				border-radius: 10rpx;
+				flex-shrink: 0;
+			}
+			.info{
+				display: flex;
+				padding: 21rpx 0;
+				justify-content: space-between;
+				margin-left: 27rpx;
+				flex-direction: column;
+				>text:first-child{
+					font-size: 28rpx;
+					color: #333;
+				}
+				>text:last-child{
+					font-size: 30rpx;
+					color: #ff3131;
+				}
+			}
+		}
+
+		.num{
+			height: 84rpx;
+			display: flex;
+			border-bottom: #ececec solid 2rpx;
+			justify-content: space-between;
+			align-items: center;
+			>text{
+				font-size: 26rpx;
+				color: #666;
+			}
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/pageB/sdetails/index1.vue b/pageB/sdetails/index1.vue
new file mode 100644
index 0000000..5f85781
--- /dev/null
+++ b/pageB/sdetails/index1.vue
@@ -0,0 +1,723 @@
+<template>
+    <view class="sdetails">
+        <u-swiper :list="list" height="500" border-radius="0" mode="dot"></u-swiper>
+		<view class="spike-view" v-if="type == 3">
+			<view class="left">
+				<view class="price">
+					<view class="now-price">￥{{ groupbuyInfo.groupbuy_price }}</view>
+					<view class="origin-price">￥{{ groupbuyInfo.goods_price }}</view>
+				</view>
+				<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}件</view>
+			</view>
+			<view class="right">
+				<view class="title">秒杀倒计时</view>
+				<view class="time">{{ spikeTime }}</view>
+			</view>
+		</view>
+        <view class="info">
+            <view class="title u-line-2">
+                <text>{{ goodsInfo.store_name }}</text>{{ goodsInfo.goods_name }}
+            </view>
+            <view class="pic">
+                <text>￥{{ goodsInfo.goods_price }}</text>
+                <s>￥{{ goodsInfo.goods_marketprice }}</s>
+            </view>
+        </view>
+        <view class="hr"></view>
+		<!-- <navs :value="领券"></navs> -->
+        <navs :value="'产品规格'"></navs>
+		<!-- <navs :value="'产品颜色'"></navs> -->
+		<!-- <navs :value="'选择尺码'"></navs> -->
+		<!-- <navs v-for="(value, index) in goodsInfo.spec_name" :value="value" :key="index"></navs> -->
+		<view class="comment">
+			<view class="title">
+				<view class="left">商品评价（1234）</view>
+				<view class="right" @click="viewComment">
+					<text>查看全部</text>
+					<image src="/static/image/common/1.png"></image>
+				</view>
+			</view>
+			<comment :reply="false"></comment>
+		</view>
+		<view class="hr"></view>
+		<view class="group-user" v-if="groupUser.length">
+			<view class="top">
+				<view class="title">{{ groupUser.length }}人正在拼团，可直接参与</view>
+				<view class="view-more" @click="showGroupUser=true">
+					<text>查看全部</text>
+					<image src="/static/image/common/1.png"></image>
+				</view>
+			</view>
+			<view class="bottom">
+				<view class="left" @click="showGroupUser=true">
+					<view class="avatar">
+						<image v-for="(user, i) in user_suc" :src="user[0].member_avatar" :key="i"></image>
+					</view>
+					<view class="all" @click="showGroupUser=true">
+						<text>查看全部</text>
+						<image src="/static/image/common/1.png"></image>
+					</view>
+				</view>
+				<view class="right">
+					<view class="launch-user" @click="showGroupUser=true">
+						<image :src="groupUser[0][0].member_avatar"></image>
+						<text class="u-line-1">{{ groupUser[0][0].member_nickname }}</text>
+					</view>
+					<view class="involvement-user">
+						<view class="item" v-for="(user, i) in groupUser.slice(1, 5)" :key="i" @click="showGroupUser=true">
+							<image :src="user[0].member_avatar"></image>
+							<text class="u-line-1">{{ user[0].member_nickname }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-popup v-model="showGroupUser" mode="center">
+			<view class="launch-container">
+				<view class="title u-line-1">正在拼团</view>
+				<scroll-view class="launch-view">
+					<view class="launch-user">
+						<view class="item" v-for="(user, i) in groupUser" :src="user[0].member_avatar" :key="i" @click="involvemenGroup(user)">
+							<image class="avatar" :src="user[0].member_avatar"></image>
+							<view class="name u-line-1">{{ user[0].member_nickname }}</view>
+						</view>
+					</view>
+				</scroll-view>
+				<image class="close" src="/static/image/common/17.png" @click="showGroupUser=false"></image>
+			</view>
+		</u-popup>
+		<u-popup v-model="showInvolvementUser" mode="center">
+			<view class="involvement-container" v-if="involvemenGroupInfo.length">
+				<view class="title u-line-1">参与{{ involvemenGroupInfo[0].member_nickname }}的拼团</view>
+				<view class="involvement-view">
+					<view class="item" v-for="(user, i) in involvemenGroupInfo" :key="i">
+						<image class="avatar" :src="user.member_avatar"></image>
+						<view class="name u-line-1">{{ user.member_nickname }}</view>
+					</view>
+				</view>
+				<view class="involvement-btn" @click="settlementOrder({ type: 'involvement' })">参与拼团</view>
+				<image class="close" src="/static/image/common/17.png" @click="showInvolvementUser=false"></image>
+			</view>
+		</u-popup>
+        <view class="xiangqing">
+            <view class="heng"></view>
+            <view class="title">商品详情</view>
+            <view class="heng"></view>
+        </view>
+		<view class="rich">
+			<rich-text :nodes="goodsInfo.mobile_body"></rich-text>
+		</view>
+        <tloos @buy="buy" @xuanze="xuanze" :id="goodsInfo.goods_commonid" :info="goodsInfo" :type="type" v-if="type"></tloos>
+        <u-toast ref="uToast" />
+    </view>
+</template>
+<script>
+/*
+* 详情是请求完存在 store 的，在这里从 store 取值
+**/
+import comment from "@/components/comment/index";
+import navs from "../components/sdetails/navs";
+import tloos from "../components/sdetails/tloos";
+export default {
+    name: "sdetails",
+    data() {
+        return {
+            list: [],　// 轮播图列表
+            goodsInfo: {},
+            info: {},
+            glist: [],
+			id: 0, // 商品id
+			type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
+			groupUser: [], // 拼团用户
+			user_suc: [], // 拼团成功用户
+			avatarWidth: '',
+			pintuan_id: '', // 拼团id
+			showGroupUser: false, // 拼团
+			showInvolvementUser: false, // 参团
+			involvemenGroupInfo: [], // 参团的人
+			groupbuyInfo: {}, // 秒杀详情
+			spikeTime: '',
+			timer: '', // 秒杀时间定时器
+        }
+	},
+    components: {
+		comment,
+        navs,
+        tloos,
+	},
+	onLoad() {
+		this.init();
+	},
+	beforeDestroy() {
+		clearInterval(this.timer);
+	},
+	methods: {
+		init() {
+			this.id = this.$store.state.goods_id;
+			this.type = this.$store.getters.getGoodsType;
+			const info = this.$store.getters.getGoodsInfo;
+			// 拼团商品
+			if(this.type == 2) {
+				this.user_suc = info.user_suc;
+				this.groupUser = info.user;
+				this.pintuan_id = info.pintuan_id;
+			}
+			// 秒杀商品
+			if (this.type == 3) {
+				this.groupbuyInfo = this.$store.state.groupbuyInfo;
+				this.setSpikeTime();
+			}
+			// console.log(this.groupbuyInfo);
+			this.goodsInfo = info.goods;
+			// 设置轮播图
+			let list = [];
+			info.goods_image[0].forEach(item => {
+				let temp = {
+					image: item
+				}
+				list.push(temp);
+			})
+			this.list = list;
+			this.setTitle();
+		},
+		spikeGoods() {
+			this.settlementOrder()
+		},
+		setSpikeTime() {
+			const time = this.groupbuyInfo.groupbuy_endtime;
+			this.timer = setInterval(() => {
+				let spikeTime = time * 1000 - new Date().getTime();
+				// 计算天数
+				const days = Math.floor(spikeTime/(24*3600*1000));
+				//计算出小时数
+				const leave1 = spikeTime % (24*3600*1000) // 计算天数后剩余的毫秒数
+				let hours = Math.floor(leave1/(3600*1000));
+				//计算相差分钟数
+				const leave2 = leave1 % (3600*1000) // 计算小时数后剩余的毫秒数
+				const minutes = Math.floor(leave2 / (60*1000))
+				//计算相差秒数
+				const leave3 = leave2 % (60*1000) // 计算分钟数后剩余的毫秒数
+				const seconds = Math.round(leave3 / 1000)
+				// 把天数算在小时里
+				hours = days * 24 + hours;
+				this.spikeTime = hours + ':' + minutes + ':' + seconds;
+				// console.log(this.spikeTime);
+			}, 1000)
+		},
+        buy(info) {
+            if(info.type == 2){ // 加入购物车
+                this.$u.api.addCart({
+                    goods_id: this.id,
+                    quantity: info.value,
+                }).then(res => {
+                    this.$refs.uToast.show({
+                        title: res.message,
+                        type: res.errCode == 0 ? 'success' : 'warning',
+                    })
+                })
+            } else if (info.type == 1) { // 支付
+				this.settlementOrder({num: info.value});
+			}
+		},
+		getGoodsDetails() {
+			switch (this.type) {
+				case 1:
+					
+					break;
+				case 2:
+					
+					break;
+				case 3:
+					
+					break;
+				case 4:
+					
+					break;
+			
+				default:
+					break;
+			}
+		},
+		getGoodsDetails(id) {
+			this.id = id;
+			this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
+				if (res.errCode == 0) {
+					this.goodsInfo = res.data.goods;
+					let list = [];
+					res.data.goods_image[0].forEach(item => {
+						let temp = {
+							image: item
+						}
+						list.push(temp);
+					})
+					this.list = list;
+					this.info = res.data.goods;
+					this.glist = res.data.spec_list;
+					// console.log(this.goodsInfo.mobile_body);
+				}
+			})
+			this.$u.api.getGoodsDetails({ id: this.info.goods_id }).then(res => {
+				if (res.errCode == 0) {
+					const goods = {
+						goods: res.data,
+						type: 1,
+					}
+					this.$store.commit('setGoodsDetails', goods);
+					this.$store.commit('setGoodsId', this.info.goods_id);
+					this.$u.route({
+						url: 'pageB/sdetails/index',
+					})
+					// console.log(this.goodsInfo.mobile_body);
+				}
+            })
+		},
+		/*
+		* @description 下单 订单步骤1：展示结算数据
+		* @params {Number} type 拼团或者开团
+		* @params {Number} num 数量
+		* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
+		**/
+		settlementOrder({type, num = 1, ifcart = 0} = {}) {
+			let params = {
+				ifcart: ifcart, 
+				cart_id: [this.goodsInfo.goods_id + '|' + num],
+			}
+			if(this.type == 2) {
+				if(type == 'involvement') {
+					Object.assign(params, {
+						pintuan_id: this.pintuan_id, 
+						pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id 
+					})
+				} else {
+					const userId = uni.getStorageSync('user_info').member.member_id;
+					this.$store.commit('setGroupHeadId', userId);
+					Object.assign(params, {
+						pintuan_id: this.pintuan_id,
+					})
+				}
+			}
+			this.$u.api.settlementOrder(params).then(res => {
+				if(res.errCode == 0) {
+					this.$store.commit('setOrderType', this.type);
+					this.$store.commit('updateOrderInfo', res.data)
+					this.$u.route({
+						url: '/pageC/cart/ConfirmOrder'
+					})
+				}
+			})
+		},
+		// 参团
+		involvemenGroup(user) {
+			this.involvemenGroupInfo = user;
+			this.showGroupUser = false;
+			this.showInvolvementUser = true;
+			// console.log(this.involvemenGroupInfo);
+		},
+        xuanze(id){
+            console.log(id)
+            // this.getGoodsDetails(this.glist[id])
+		},
+		// 设置页面标题
+		setTitle() {
+			let title = '';
+			switch (this.type) {
+				case 1:
+					title = '商品详情';
+					break;
+				case 2:
+					title = '拼团商品详情';
+					break;
+				case 3:
+					title = '秒杀商品详情';
+					break;
+				case 1:
+					
+					break;
+				default:
+					break;
+			}
+			uni.setNavigationBarTitle({
+				title: title
+			});
+		},
+		viewComment() {
+			this.$u.route({
+				url: 'pageB/comment/index',
+			})
+		}
+	},
+}
+</script>
+<style lang="scss" scoped>
+.sdetails {
+	padding-bottom: 98rpx;
+	position: relative;
+	background-color: #EEEBEE;
+	.spike-view {
+		position: absolute;
+		top: 396rpx;
+		left: 0;
+		width: 100%;
+		height: 104rpx;
+		background: rgba(255,120,15,1);
+		opacity: 0.96;
+		color:rgba(255,255,255,1);
+		display: flex;
+		align-items: center;
+		.left {
+			height: 104rpx;
+			flex: 1;
+			padding-left: 30rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			.price {
+				margin-bottom: 22rpx;
+				display: flex;
+				align-items: center;
+				.now-price {
+					font-size: 32rpx;
+					font-weight: bold;
+					margin-right: 16rpx;
+				}
+				.origin-price {
+					font-size: 26rpx;
+					text-decoration: line-through;
+				}
+			}
+			.num {
+				font-size: 22rpx;
+				font-weight: 500;
+			}
+		}
+		.right {
+			height: 104rpx;
+			width: 232rpx;
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			&::before {
+				position: absolute;
+				left: 0;
+				content: "";
+				width: 2rpx;
+				height: 104rpx;
+				background:rgba(255,255,255,1);
+			}
+			font-size: 26rpx;
+			font-weight: 500;
+			.title {
+				margin-bottom: 18rpx;
+			}
+		}
+	}
+    .info {
+		background:rgba(255,255,255,1);
+        padding: 30rpx;
+		margin-bottom: 20rpx;
+        .title{
+            flex-wrap: wrap;
+			margin-bottom: 30rpx;
+            >text{
+                padding: 13rpx;
+                font-size: 24rpx;
+                color:#fff;
+                margin-right: 13rpx;
+                background-color: #FF780F;
+                display: inline-block;
+                border-radius: 25rpx;
+            }
+        }
+        .pic{
+            >text{
+                font-size: 32rpx;
+                color: #FF3131;
+            }
+            >s{
+                font-size: 26rpx;
+                color: #999;
+                display: inline-block;
+                margin-left: 30rpx;
+            }
+        }
+    }
+	.comment {
+		margin-top: 20rpx;
+		background:rgba(255,255,255,1);
+		padding: 30rpx;
+		.title {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 30rpx;
+			.left {
+				font-size: 30rpx;
+				color: rgba(51,51,51,1);
+			}
+			.right {
+				font-size: 24rpx;
+				color: rgba(153,153,153,1);
+				> image {
+					width: 8rpx;
+					height: 16rpx;
+					margin-left: 10rpx;
+				}
+			}
+		}
+	}
+    .hr {
+        width: 100%;
+        height: 20rpx;
+        background-color: #ececec;
+    }
+	.group-user {
+		padding: 30rpx;
+		.top {
+			margin-bottom: 28rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.title {
+				font-size: 30rpx;
+				color: rgba(51,51,51,1);
+			}
+			.view-more {
+				font-size: 24rpx;
+				color: rgba(153,153,153,1);
+				> image {
+					margin-left: 10rpx;
+					width: 8rpx;
+					height: 16rpx;
+				}
+			}
+		}
+		.bottom {
+			display: flex;
+			align-items: center;
+			font-size: 22rpx;
+			color: rgba(153,153,153,1);
+			.left {
+				margin-right: 40rpx;
+				.avatar {
+					width: 120rpx;
+					height: 60rpx;
+					margin-bottom: 16rpx;
+					position: relative;
+					@mixin avatar($left, $index) {
+						width: 60rpx;
+						height: 60rpx;
+						border-radius: 50%;
+						position: absolute;
+						top: 0;
+						left: $left;
+						z-index: $index;
+					}
+					> image {
+						&:first-child {
+							background-color: aliceblue;
+							@include avatar($left: 0rpx, $index: 7);
+						}
+						&:nth-child(2) {
+							background-color: aquamarine;
+							@include avatar($left: 30rpx, $index: 8);
+						}
+						&:nth-child(3) {
+							background-color: antiquewhite;
+							@include avatar($left: 60rpx, $index: 9);
+						}
+					}
+				}
+				.all {
+					> image {
+						margin-left: 10rpx;
+						width: 8rpx;
+						height: 16rpx;
+					}
+				}
+			}
+			.right {
+				display: flex;
+				image {
+					background-color: aquamarine;
+					width: 60rpx;
+					height: 60rpx;
+					margin-bottom: 15rpx;
+					border-radius: 50%;
+				}
+				.launch-user {
+					margin-right: 40rpx;
+					text-align: center;
+					> text {
+						width: 98rpx;
+						display: block;
+					}
+				}
+				.involvement-user {
+					display: flex;
+					align-items: center;
+					.item {
+						text-align: center;
+						> text {
+							display: block;
+							width: 72rpx;
+						}
+						&:not(:last-child) {
+							margin-right: 30rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+	.launch-container {
+		width: 558rpx;
+		height: 655rpx;
+		background: rgba(255,255,255,1);
+		border-radius: 20rpx;
+		position: relative;
+		overflow: hidden;
+		.title {
+			text-align: center;
+			padding: 40rpx 0;
+			font-size: 32rpx;
+			color: rgba(51,51,51,1);
+			position: relative;
+			&::after {
+				content: '';
+				position: absolute;
+				width: 558rpx;
+				height: 2rpx;
+				background: rgba(234,234,234,1);
+				bottom: 0;
+				left: 0;
+			}
+		}
+		.launch-view {
+			height: 500rpx;
+			box-sizing: border-box;
+			padding: 30rpx 50rpx;
+			.launch-user {
+				display: flex;
+				flex-direction: row;
+				flex-wrap: wrap;
+				align-items: flex-start;
+				justify-content: flex-start;
+				.item {
+					width: 96rpx;
+					height: 96rpx;
+					text-align: center;
+					margin-bottom: 30rpx;
+					.avatar {
+						width: 60rpx;
+						height: 60rpx;
+						border-radius: 50%;
+						margin-bottom: 15rpx;
+					}
+					.name {
+						font-size: 22rpx;
+						color: rgba(153,153,153,1);
+					}
+					&:not(:nth-child(3n)) {
+						margin-right: 80rpx;
+					}
+				}
+			}
+			
+		}
+		.close {
+			position: absolute;
+			width: 47rpx;
+			height: 47rpx;
+			top: 10rpx;
+			right: 20rpx;
+			border-radius: 50%;
+		}
+	}
+	.involvement-container {
+		width: 558rpx;
+		height: 486rpx;
+		background: rgba(255,255,255,1);
+		border-radius: 20rpx;
+		position: relative;
+		overflow: hidden;
+		.title {
+			text-align: center;
+			padding: 40rpx 0;
+			font-size: 32rpx;
+			color: rgba(51,51,51,1);
+			position: relative;
+			&::after {
+				content: '';
+				position: absolute;
+				width: 558rpx;
+				height: 2rpx;
+				background: rgba(234,234,234,1);
+				bottom: 0;
+				left: 0;
+			}
+		}
+		.involvement-view {
+			display: flex;
+			justify-content: center;
+			margin: 40rpx 0 70rpx;
+			.item {
+				width: 100rpx;
+				text-align: center;
+				margin-right: 10rpx;
+				.avatar {
+					width: 60rpx;
+					height: 60rpx;
+					border-radius: 50%;
+					margin-bottom: 15rpx;
+				}
+				.name {
+					font-size: 22rpx;
+					color: rgba(153,153,153,1);
+				}
+			}
+		}
+		.involvement-btn {
+			width: 400rpx;
+			height: 88rpx;
+			background: rgba(255,120,15,1);
+			border-radius: 44rpx;
+			font-size: 30rpx;
+			color:rgba(255,255,255,1);
+			text-align: center;
+			line-height: 88rpx;
+			margin: 0 auto;
+		}
+		.close {
+			position: absolute;
+			width: 47rpx;
+			height: 47rpx;
+			top: 10rpx;
+			right: 20rpx;
+			border-radius: 50%;
+		}
+	}
+    .xiangqing{
+        display: flex;
+        height: 85rpx;
+        background-color: #ececec;
+        align-items: center;
+        justify-content: center;
+        .heng{
+            width: 79rpx;
+            height: 2rpx;
+            background-color: #a9a9a9;
+
+        }
+        font-size: 28rpx;
+        color: #999;
+        .title{
+            margin: 0 20rpx;
+        }
+    }
+	.rich {
+		width: 100%;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue
index f9a1ff4..41a3b21 100644
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -205,9 +205,14 @@ export default {
 			})
 		},
 		intermediate() {
-			if(this.orderType == 2) this.withImmediate();
+			if(this.orderType == 2) {
+				this.withImmediate();
+			} else if(this.orderType == 1) {
+				this.sendOrder(0);
+			}
 			else this.sendOrder(1);
 		},
+		// @params {Number} ifcart 是否是购物车商品
 		sendOrder(ifcart) {
 			// 拼接后端需要的数据形式
 			let id = [], temp = '';
@@ -241,11 +246,11 @@ export default {
 				cart_id: id,
 				address_id: this.addressInfo.address_id,
 				buy_city_id: this.addressInfo.city_id,
-				voucher_id: coupon,
 			}
+			if(coupon.length) Object.assign(params, { voucher_id: coupon });
 			if(this.orderType == 2) {
-				Object.assign(params, { pintuan_id: this.orderInfo.pintuan_id })
-				if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id })
+				Object.assign(params, { pintuan_id: this.orderInfo.pintuan_id });
+				if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
 			}
 			// console.log(params);
 			this.$u.api.sendOrder(params).then(res => {
diff --git a/pageC/cart/cashier.vue b/pageC/cart/cashier.vue
index 9c03699..a6b61ac 100644
--- a/pageC/cart/cashier.vue
+++ b/pageC/cart/cashier.vue
@@ -54,24 +54,10 @@ export default {
 		// getProvider() {
 		// 	uni.getProvider({service: 'payment'})
 		// },
-		// 支付宝支付
-		payByAlipay (orderInfo) {
+		payOrder(provider, orderInfo) {
 			uni.requestPayment({
-				provider: 'alipay',
-				orderInfo: orderInfo, //支付宝订单数据
-				success: function (res) {
-					console.log('success:' + JSON.stringify(res));
-				},
-				fail: function (err) {
-					console.log('fail:' + JSON.stringify(err));
-				}
-			});
-		},
-		// 微信支付
-		payByWxpay (orderInfo) {
-			uni.requestPayment({
-				provider: 'wxpay',
-				orderInfo: orderInfo, //微信订单数据
+				provider: provider,
+				orderInfo: orderInfo, //订单数据
 				success: function (res) {
 					console.log('success:' + JSON.stringify(res));
 				},
@@ -86,11 +72,15 @@ export default {
 				payment_code: this.pay_way,
 			}).then(res => {
 				if(res.errCode == 0) {
-					// this.$u.toast(res.message);
-					// uni.navigateBack();
-					const orderInfo = JSON.parse(res.data.content);
-					console.log(orderInfo);
-					this.pay_way == 'wxpay_app' ? this.payByWxpay(orderInfo) : this.payByAlipay(orderInfo);
+					let orderInfo, provider;
+					if(res.data.payment_code == 'wxpay_app') {
+						provider = 'wxpay';
+						orderInfo = JSON.parse(res.data.content);
+					} else if(res.data.payment_code == 'alipay_app') {
+						provider = 'alipay';
+						orderInfo = res.data.content;
+					}
+					this.payOrder(provider, orderInfo);
 				}
 			})
 		}
diff --git a/pageE/order/Comment.vue b/pageE/order/Comment.vue
index 7007505..511814b 100644
--- a/pageE/order/Comment.vue
+++ b/pageE/order/Comment.vue
@@ -56,16 +56,16 @@ export default {
 		},
 		addOrderEvaluate() {
 			if(!this.verifyParams()) return false;
-			console.log(this.logistics);
-			console.log(this.service);
-			console.log(this.describe);
+			// console.log(this.logistics);
+			// console.log(this.service);
+			// console.log(this.describe);
 			this.$u.api.updateOrderEvaluate({
 				id: this.orderId,
 				content: this.content,
 				scores_one: this.logistics,
 				scores_two: this.service,
 				scores_three: this.describe,
-				file: '',
+				file: '',　// 只传文件名
 			}).then(res => {
 				
 			})
diff --git a/pages.json b/pages.json
index 0ac3fe7..5bcc360 100644
--- a/pages.json
+++ b/pages.json
@@ -113,6 +113,17 @@
 						}
 					}
 				},
+				{
+					"path": "comment/index",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"app-plus":{
+							"titleNView":{
+								"backgroundColor":"#ffffff"
+							}
+						}
+					}
+				},
 				{
 					"path": "search/index",
 					"style": {
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 4038d54..606f152 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -11,7 +11,9 @@
             </view>
             <image src="/static/image/shop/3.png" class="mnue" @click="toClassifyPage"></image>
         </view>
-        <u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
+        <view class="swiper-image">
+			<u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
+		</view>
         <view class="chengnuo">
             <view>
                 <image src="/static/image/shop/4.png"></image>
@@ -33,21 +35,16 @@
         <view class="fenlei">
             <shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item" class="item"></shopitem>
         </view>
-        <view class="hr" style="margin-top:80rpx"></view>
 		<!-- 秒杀 -->
         <recommend v-if="JSON.stringify(recommendedSpike) != '{}'" :recommendData="recommendedSpike" type="spike"></recommend>
-        <view v-if="JSON.stringify(recommendedSpike) != '{}'" class="hr" style="margin-top:40rpx"></view>
 		<!-- 秒杀列表 -->
         <seckill v-if="spikeList.length" :list="spikeList" :time="seckillTime"></seckill>
-        <view v-if="spikeList.length" class="hr" style="margin-top:40rpx"></view>
 		<!-- 拼团推荐 -->
         <pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan>
-        <view class="hr" style="margin-top:40rpx" v-if="JSON.stringify(pinTuanPush) != '{}'"></view>
 		<!-- 拼团列表 -->
-        <group :groupList="pinTuanList" :classifyList="couponGroupList"></group>
+        <group :classifyList="couponGroupList"></group>
         <image class="lingquan"></image>
         <youhq></youhq>
-        <view class="hr" style="margin-top:40rpx"></view>
         <list ref="recommendGoods"></list>
 		<view class="cart" @click="toCartPage">
 			<image src="/static/image/common/3.png"></image>
@@ -56,16 +53,16 @@
     </scroll-view>
 </template>
 <script>
-import shopitem from "@/components/shop/shop-item/index"
-import recommend from "@/components/shop/recommend/index"
-import pintuan from "@/components/shop/recommend/pintuan"
-import seckill from "@/components/shop/seckill/index"
-import group from "@/components/shop/group/index"
-import youhq from "@/components/shop/youhq/index"
-import list from "../../components/shop/list/index"
+import shopitem from "@/components/shop/shop-item/index";
+import recommend from "@/components/shop/recommend/index";
+import pintuan from "@/components/shop/recommend/pintuan";
+import seckill from "@/components/shop/seckill/index";
+import group from "@/components/shop/group/index";
+import youhq from "@/components/shop/youhq/index";
+import list from "@/components/shop/list/index";
 export default {
-    name:"shop",
-    components:{
+    name: "shop",
+    components: {
         shopitem,
         recommend,
         seckill,
@@ -74,7 +71,7 @@ export default {
 		list,
 		pintuan
     },
-    data(){
+    data() {
         return {
 			area: "请选择",
 			chooseArea: false,
@@ -83,15 +80,14 @@ export default {
 				city: true,
 				area: false
 			},
-            keyword:"",
-			list:[],
+            keyword: "",
+			list: [],
 			goodsClassify: [], // 商品分类
 			classifyList: [],
 			recommendedSpike: {}, // 秒杀推荐
 			spikeList: [], // 全部秒杀列表
 			seckillTime: {}, // 秒杀时间
 			couponGroupList: [], // 优惠券拼团分类
-			pinTuanList: [], // 拼团商品
 			pinTuanPush: {}, // 拼团推荐
         }
 	},
@@ -105,7 +101,7 @@ export default {
 		this.getPinTuanPush();
 	},
 	methods: {
-        sousuo(){
+        sousuo() {
             // console.log(123)
             this.$u.route({
                 url:"pageB/search/index"
@@ -146,7 +142,6 @@ export default {
 			this.$u.api.getGoodsClass().then(res => {
 				if(res.errCode == 0) {
 					this.couponGroupList = res.data;
-					this.getPinTuanList(this.couponGroupList[0].gc_id);
 				}
 			})
 		},
@@ -162,15 +157,6 @@ export default {
 				}
 			})
 		},
-		// 拼团列表
-		getPinTuanList(id) {
-			this.$u.api.getPinTuanList({
-				page: 0,
-				gc_id: id,
-			}).then(res => {
-				this.pinTuanList = res.data;
-			})
-		},
 		clickImage(index) {
 			console.log(index);
 			console.log(this.list[index]);
@@ -200,8 +186,10 @@ export default {
 .shop {
 	height: calc(100vh - var(--window-top));
 	box-sizing: border-box;
-    padding: 0 33rpx 100rpx;
-    .top{
+	background-color: #F0EDF1;
+    .top {
+		padding: 0 30rpx;
+		background-color: #ffffff;
         width: 100%;
         height: 88rpx;
         display: flex;
@@ -211,7 +199,11 @@ export default {
             height: 37rpx;
         }
     }
-    .add{
+	.swiper-image {
+		background-color: #ffffff;
+		padding: 0 30rpx;
+	}
+    .add {
         width: 115rpx;
         height: 25rpx;
         display: flex;
@@ -224,40 +216,43 @@ export default {
 		> text {
 			width: 80rpx;
 		}
-        >image{
+        > image {
             width: 24rpx;
             height: 15rpx;
         }
     }
-    .mnue{
+    .mnue {
+		background-color: #ffffff;
         width: 35rpx;
         height: 26rpx;
         margin-left: 36rpx;
     }
-    .chengnuo{
+    .chengnuo {
+		padding: 30rpx;
+		background-color: #ffffff;
         display: flex;
         justify-content: space-between;
         align-items: center;
-        margin-top: 24rpx;
-        >view{
+        > view {
             display: flex;
             align-items: center;
-            >image{
+            > image {
                 width: 23rpx;
                 height: 23rpx;
             }
-            >text{
+            > text {
                 font-size: 22rpx;
                 color: #999;
                 margin-left: 8rpx;
             }
         }
     }
-    .fenlei{
+    .fenlei {
+		padding: 30rpx;
+		background-color: #ffffff;
         display: flex;
-        // justify-content: space-between;
-        margin-top: 30rpx;
 		flex-wrap: wrap;
+		margin-bottom: 20rpx;
 		> view {
 			margin-bottom: 30rpx;
 			&:not(:nth-child(5n)) {
@@ -265,13 +260,7 @@ export default {
 			}
 		}
     }
-    .hr{
-        width: 750rpx;
-        margin-left: -33rpx;
-        height: 20rpx;
-        background-color: #ececec;
-    }
-    .lingquan{
+    .lingquan {
         width: 750rpx;
         height: 177rpx;
         margin-left: -33rpx;
diff --git a/static/image/common/20.png b/static/image/common/20.png
new file mode 100644
index 0000000000000000000000000000000000000000..902d68b2213767ec8392a96113a3dcf00cb10866
GIT binary patch
literal 3205
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

literal 0
HcmV?d00001