|
|
|
@ -122,6 +122,14 @@ |
|
|
|
{{data.receiverPhone}} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view v-if="data.orderType != 1" style="display: flex;height: 60rpx;line-height: 60rpx;"> |
|
|
|
<view style="width: 140rpx;"> |
|
|
|
团购信息 |
|
|
|
</view> |
|
|
|
<view @tap="checkGroup" style="flex: 1;text-align: right;"> |
|
|
|
查看 > |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -143,6 +151,37 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<!-- 拼团信息弹出层 --> |
|
|
|
<uni-popup ref="groupPopup" background-color="#fff"> |
|
|
|
<view class="group-content"> |
|
|
|
<view style="height: 100rpx;text-align: center;line-height: 100rpx;font-size: 36rpx;font-weight: 700;"> |
|
|
|
<text>{{data.groupInfo.targetMembers}}人团/</text><text>已拼{{data.groupInfo.currentMembers}}人</text> |
|
|
|
</view> |
|
|
|
<view class="kaituan2"> |
|
|
|
<view class="kaituan22" style="display: flex;"> |
|
|
|
<view class="" @tap="goDetail(item)" v-for="(item,index) in data.groupInfo.groupIdList" :key="index" style="width: 90rpx;height: 90rpx;margin: 0 auto;position: relative;"> |
|
|
|
<view style="z-index: 99;position: absolute;top:0;width: 90rpx;height: 90rpx;border-radius: 90rpx;border:4rpx solid #48D1CC"></view> |
|
|
|
<view style=""> |
|
|
|
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png" alt="" style="width: 90rpx;height: 90rpx;border-radius: 90rpx;display: block;" /> |
|
|
|
</view> |
|
|
|
<view style="background: #fff;position: absolute;bottom: 6rpx;width: 100%;height: 24rpx;font-size: 20rpx;line-height: 24rpx;text-align: center;"> |
|
|
|
{{item | lastFour}} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
</view> |
|
|
|
<view v-if="(data.groupInfo.targetMembers - data.groupInfo.currentMembers) > 0" class="kaituan22"> |
|
|
|
<view class="weipincheng"> |
|
|
|
+ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view style="height: 100rpx;line-height: 100rpx;text-align: center;font-weight: 700;"> |
|
|
|
点击头像可查看拼团订单详情 |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</uni-popup> |
|
|
|
</view> |
|
|
|
</template> |
|
|
|
|
|
|
|
@ -188,6 +227,9 @@ |
|
|
|
that.data.chouyong = price/100 * uni.getStorageSync('shopTakeaway').commissionRateMore |
|
|
|
that.data.yujishouru = price - that.data.chouyong |
|
|
|
} |
|
|
|
if(that.data.groupInfo != null){ |
|
|
|
that.data.groupInfo.groupIdList = that.data.groupInfo.groupOrderIds.split(','); |
|
|
|
} |
|
|
|
|
|
|
|
that.data.goodsNum = 0 |
|
|
|
for(let m=0;m<that.data.goodsList.length;m++){ |
|
|
|
@ -201,6 +243,14 @@ |
|
|
|
uni.hideLoading(); |
|
|
|
}).catch((res) => {}); |
|
|
|
}, |
|
|
|
goDetail(id){ |
|
|
|
this.shopId = id |
|
|
|
this.getDetail() |
|
|
|
this.$refs.groupPopup.close() |
|
|
|
}, |
|
|
|
checkGroup(){ |
|
|
|
this.$refs.groupPopup.open() |
|
|
|
}, |
|
|
|
mealServing(item){ |
|
|
|
let that = this |
|
|
|
uni.showModal({ |
|
|
|
@ -307,4 +357,33 @@ |
|
|
|
float: right; |
|
|
|
margin-left: 10px; |
|
|
|
} |
|
|
|
.group-content{ |
|
|
|
background: #fff; |
|
|
|
width: 300px; |
|
|
|
height: auto; |
|
|
|
border-radius: 20rpx; |
|
|
|
} |
|
|
|
.weipincheng { |
|
|
|
width: 90rpx; |
|
|
|
height: 90rpx; |
|
|
|
background: #a6ffea; |
|
|
|
border-radius: 90rpx; |
|
|
|
text-align: center; |
|
|
|
font-size: 60rpx; |
|
|
|
font-weight: 700; |
|
|
|
margin-left: -6rpx; |
|
|
|
z-index: 97; |
|
|
|
color: #02fbdd; |
|
|
|
border: 1px solid #a6ffea; |
|
|
|
line-height: 80rpx; |
|
|
|
margin: 0 auto; |
|
|
|
} |
|
|
|
.kaituan2{ |
|
|
|
display: flex; |
|
|
|
width: 90%; |
|
|
|
margin: 40rpx auto; |
|
|
|
} |
|
|
|
.kaituan22{ |
|
|
|
flex: 1; |
|
|
|
} |
|
|
|
</style> |
