diff --git a/package1/group/groupBuyDetail.vue b/package1/group/groupBuyDetail.vue
index 83e3981..bba6a2c 100644
--- a/package1/group/groupBuyDetail.vue
+++ b/package1/group/groupBuyDetail.vue
@@ -1,11 +1,167 @@
+
+
+
+
+
+
+
+ 商家详情
+
+
+
+
+
+
+
+ 
+ 竹仔园牛仔农庄(第六分店)
+
+
+
+ 北校区沁园春食堂3楼321窗口
+
+
+
+ 周一到周日 10:50-21:00
+
+
+
+ 
+
+
+
+
+ 
+ 商家承诺
+
+
+ 
+ 
+
+
+
+
+ 
+ 商家公告
+
+
+ 公告：这里是第三食堂美食top1，好吃不贵，欢迎下好吃不贵，欢欢迎下单迎下单！欢迎下单！
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue
index aff6330..fcddc5e 100644
--- a/package1/group/groupBuySingle.vue
+++ b/package1/group/groupBuySingle.vue
@@ -39,8 +39,8 @@
-
- 已拼 12 单
+
+ 店铺评价
月售 100+
@@ -91,7 +91,7 @@
alt=""
style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" />
-
+
牛仔农庄(医专店)
@@ -121,105 +121,11 @@
-
直接购买
-
- 拼团购买￥15.00
-
-
-
-
-
-
- 
- 
-
-
-
- 牛仔农庄(医专店)
-
-
-
- 月售 100+
-
-
-
- 
- +
-
-
- 差1人拼成
-
-
-
-
-
- ￥90.00
-
-
- 拼团￥59.90
-
-
-
-
-
-
- 直接购买
-
-
- 拼团购买￥15.00
-
-
-
-
-
-
-
-
-
-
-
- 牛仔农庄(医专店)
-
-
-
- 月售 100+
-
-
-
-
- +
-
-
- 差1人拼成
-
-
-
-
-
- ￥90.00
-
-
- 拼团￥59.90
-
-
-
-
-
-
- 直接购买
-
-
+
拼团购买￥15.00
@@ -250,6 +156,67 @@
已加购商品（3）
+
+
+
+
+
+
+
+ 牛仔农庄(医专店)
+
+
+
+ 月售 100+
+
+
+
+
+ ￥90.00
+
+
+ 拼团￥59.90
+
+
+
+ -
+
+
+ 1
+
+
+ +
+
+
+
+
+
+
+
+
+
+ 
+
+
+ ￥18.00
+ 打包费￥1
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
@@ -257,7 +224,7 @@
alt=""
style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" />
-
+
牛仔农庄(医专店)
@@ -273,19 +240,147 @@
拼团￥59.90
-
-
-
- +
+
+
+
+
+
+
+ 选择食材1
+
+
+
+ 炸鸡块
+
+
+ 炸鸡块
+
+
+
+
+
+ 选择食材2
+
+
+
+ 炸鸡块
+
+
+ 炸鸡块
+
+
+
+
+
+ 成团选择
+
+
+
+
+
+ ￥16.00
+
+
+ 二人团
+
+
+
+
+ ￥15.00
+
+
+ 三人团
+
+
+
+
+ 他们都在拼
+
+
+
+
+
+
+ +
+
+
+
+ 二人拼
+
+
+ 差1人拼成
+
+
+
+ ￥15.00
+
+
+
+ 拼团
+
+
+
+
+
+
+ +
+
+
+
+ 三人拼
+
+
+ 差1人拼成
+
+
+
+ ￥15.00
+
+
+
+ 拼团
+
+
+
+
+
+
+ +
+
+
+
+ 三人拼
-
+
差1人拼成
+
+ ￥15.00
+
+
+
+ 拼团
+
+
+
+
+ 面对面团
+
+
+ 拼团购买￥15.00
+
+
+
+ 直接购买
+
+
@@ -295,7 +390,8 @@
export default {
data() {
return {
- menuButtonInfo: {}
+ menuButtonInfo: {},
+ isPintuan:true,
}
},
components: {
@@ -308,16 +404,31 @@
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
},
methods: {
- openPopup(type){
+ openPopup(type,index){
if(type == 'car'){
this.$refs.carPopup.open('bottom')
+ }else if(type == 'pintuan'){
+ if(index == 0){
+ this.isPintuan = true
+ }else{
+ this.isPintuan = false
+ }
+ this.$refs.pintuanPopup.open('bottom')
}
},
goDetail(type) {
- if (type == 'shopDetail') {
+ if (type == 'goodsDetail') {
uni.navigateTo({
url: '/package1/goods/goodsDetail'
})
+ }else if(type == 'shopDetail'){
+ uni.navigateTo({
+ url: '/package1/group/groupBuyDetail'
+ })
+ }else if(type == 'shopEvaluate'){
+ uni.navigateTo({
+ url: '/package1/group/shopEvaluate'
+ })
}
},
back() {
@@ -544,7 +655,7 @@
}
.goods-top {
- padding: 20rpx;
+ padding: 20rpx 0;
display: flex;
}
@@ -639,6 +750,7 @@
display: flex;
background: #fff;
z-index: 98;
+ box-shadow: 0 -5px 5px rgba(0, 0, 0, 0.3);
}
.bottom-left {
@@ -688,6 +800,10 @@
position: relative;
height: 600px;
width: 100%;
+ border-top-left-radius: 10px;
+ border-top-right-radius: 10px;
+ padding: 10px;
+ overflow: scroll;
}
.car-close{
@@ -700,10 +816,191 @@
.car-title{
height: 48px;
- line-height: 48px;
- width: 95%;
+ line-height: 30px;
margin: 0 auto;
font-size: 14px;
font-weight: 700;
}
+ .num-plus{
+ width: 28px;
+ height: 28px;
+ font-size: 18px;
+ text-align: center;
+ font-weight: 700;
+ line-height: 24px;
+ border-radius: 5px;
+
+ background: rgba(0, 35, 28, 1);
+ color: rgba(166, 255, 234, 1);
+
+ }
+ .num{
+ width: 40px;
+ height: 28px;
+ text-align: center;
+ line-height: 28px;
+ font-size: 14px;
+ }
+ .goods-num{
+ display: flex;
+ height: 28px;
+ flex: 1;
+ margin-left: 20px;
+ }
+ .pintuan0{
+ width: 90%;
+ height: 50px;
+ border-radius: 50px;
+ background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
+ text-align: center;
+ font-size: 13px;
+ font-weight: 700;
+ line-height: 50px;
+ margin: auto;
+ }
+ .pintuan1{
+ width: 90%;
+ height: 50px;
+ line-height: 50px;
+ display: flex;
+ text-align: center;
+ margin: auto;
+ font-size: 13px;
+ font-weight: 700;
+ }
+ .pintuan2{
+ flex: 1;
+ background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
+ }
+ .spec11{
+ height: 48px;
+ line-height: 48px;
+ font-size: 14px;
+ font-weight: 700;
+ }
+
+ .spec222{
+ display: inline-block;
+ padding: 0 10px;
+ background: #eee;
+ color: #777;
+ height: 36px;
+ line-height: 36px;
+ text-align: center;
+ border-radius: 10px;
+ margin-right: 10px;
+ }
+ .spec-check{
+ display: inline-block;
+ padding: 0 10px;
+ background: rgba(166, 255, 234, 1);
+ height: 36px;
+ line-height: 36px;
+ text-align: center;
+ border-radius: 10px;
+ margin-right: 10px;
+ }
+ .team1{
+ width: 77px;
+ height: 83px;
+ background: #eee;
+ border-radius: 10px;
+ font-size: 13px;
+ text-align: center;
+ line-height: 30px;
+ float: left;
+ margin-right: 20px;
+ }
+ .team-check{
+ width: 77px;
+ height: 83px;
+ background: rgba(166, 255, 234, 1);
+ border-radius: 10px;
+ font-size: 13px;
+ text-align: center;
+ line-height: 30px;
+ float: left;
+ margin-right: 20px;
+ }
+ .team11{
+ margin-top: 10px;
+ }
+ .goods-team{
+ width: 100%;
+ min-height: 90px;
+ }
+ .list-right {
+ display: flex;
+ width: 100%;
+ padding: 15px 0 15px 15px;
+ flex: 1;
+ }
+
+ .list-right-img {
+ height: 40px;
+ display: flex;
+
+ img {
+ width: 40px;
+ height: 40px;
+ z-index: 98;
+ background-size: 100%;
+ }
+ }
+
+ .list-weipincheng {
+ width: 40px;
+ height: 40px;
+ background: #a6ffea;
+ border-radius: 40px;
+ text-align: center;
+ font-size: 28rpx;
+ font-weight: 700;
+ margin-left: -6rpx;
+ z-index: 97;
+ line-height: 40px;
+ }
+
+ .goods-center {
+ width: 100%;
+ margin: 0 auto 10px;
+ background: #f5f8f5;
+ height: 70px;
+ border-radius: 10px;
+ overflow: hidden;
+ display: flex;
+ }
+
+ .list-right-cha {
+ margin-left: 10px;
+ }
+ .list-right-price{
+ flex: 1;
+ text-align: right;
+ line-height: 40px;
+ color: red;
+ font-size: 14px;
+ font-weight: 700;
+ }
+
+ .list-btn {
+ background: linear-gradient(90deg, #e3ff96, #a6ffea);
+ width: 130rpx;
+ text-align: center;
+ font-size: 28rpx;
+ font-weight: 600;
+ border-radius: 30px;
+ height: 30px;
+ line-height: 30px;
+ margin: 20px;
+ }
+ .cha11{
+ font-size: 11px;
+ background: rgba(255, 57, 57, 0.2);
+ color: red;
+ display: inline-block;
+ padding: 3px;
+ border-radius: 5px;
+ margin-bottom: 5px;
+ }
\ No newline at end of file
diff --git a/package1/group/shopEvaluate.vue b/package1/group/shopEvaluate.vue
new file mode 100644
index 0000000..f9b5f25
--- /dev/null
+++ b/package1/group/shopEvaluate.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+ 商家评价
+
+
+
+
+
+
+
+
+
\ No newline at end of file