diff --git a/package2/IdleTrad/chat.vue b/package2/IdleTrad/chat.vue index d896a24..9e1f895 100644 --- a/package2/IdleTrad/chat.vue +++ b/package2/IdleTrad/chat.vue @@ -193,9 +193,12 @@ }, methods: { isOpen(type) { + if (type == 'photo') { + this.isIcon = false this.isPhoto = !this.isPhoto } else if (type == 'icon') { + this.isPhoto = false this.isIcon = !this.isIcon } else { this.isInput = !this.isInput diff --git a/package2/group/groupBuyDetail.vue b/package2/group/groupBuyDetail.vue index 1e43d6a..115a129 100644 --- a/package2/group/groupBuyDetail.vue +++ b/package2/group/groupBuyDetail.vue @@ -28,16 +28,18 @@ - + - 商家资质 + + 商家资质 + - + @@ -83,7 +85,7 @@ methods: { //查看大图 largeImg(img) { - this.bigImg = 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/00b1f011787c4549bbea650d95a4eb39.png' + this.bigImg = img this.$refs.imgPopup.open() }, //拨打电话 diff --git a/package2/group/groupBuyList.vue b/package2/group/groupBuyList.vue index 37b3a67..cd0945e 100644 --- a/package2/group/groupBuyList.vue +++ b/package2/group/groupBuyList.vue @@ -557,6 +557,7 @@ return currentMinutes >= startMinutes && currentMinutes <= endMinutes; }, goDetail(type, item) { + console.log('数据',item) if (type == 'shop') { uni.navigateTo({ url: '/package2/group/groupBuySingle?type=shop&item=' + JSON.stringify(item) diff --git a/package2/group/groupBuySingle.vue b/package2/group/groupBuySingle.vue index 52a1cb3..a072ac1 100644 --- a/package2/group/groupBuySingle.vue +++ b/package2/group/groupBuySingle.vue @@ -72,8 +72,7 @@ + style="padding: 0;margin-top:20rpx;display: flex;" @tap="openOrderWait('')"> @@ -81,8 +80,9 @@ 去凑团 - + @@ -100,8 +100,7 @@ - + + @@ -152,7 +151,9 @@ 销量 {{item.tailWarn != null ? item.tailWarn : 0}} - + ¥{{item.attributeListPrice | sliceMsg}} @@ -160,8 +161,7 @@ - + + @@ -303,7 +303,8 @@ - {{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省!' : '拼团搭子哪里找-隔壁宿舍全是宝!'}} + {{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省!' : '拼团搭子哪里找-隔壁宿舍全是宝!'}} + @@ -424,12 +425,11 @@ @@ -464,8 +464,7 @@ :key="index"> - + + @@ -505,10 +504,12 @@ - 配送费(均摊) {{tuanzhangOrder.deliveryFee}} 元 + 配送费(均摊) + {{tuanzhangOrder.deliveryFee}} 元 - 打包费 {{currentItem.lunchBox}} 元 + 打包费 + {{currentItem.lunchBox}} 元 优惠券抵扣 -¥{{selectedCoupon.discountAmount.toFixed(2)}} @@ -517,7 +518,8 @@ 若拼团失败,将会为您自动退款 - +