Skip to content

Commit

Permalink
拼团限购
Browse files Browse the repository at this point in the history
  • Loading branch information
wx15056046046 committed Oct 21, 2020
1 parent 1c93cbb commit 3bed4e0
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 14 deletions.
14 changes: 12 additions & 2 deletions src/pages/activities/groupon/grouponDetails/components/Product.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@
<div class="product_info">
<h4>{{product.name}}</h4>
<h5>{{product.intro}}</h5>
<p style="border: 1px solid red;border-radius: 5rpx;color: red;width:130rpx;font-size:25rpx;text-align:center">特惠抢购</p>
<span>销量:{{sales}}</span>
<div class="bottom">
<div class="left">
<i>¥</i>
<h3>{{product['retail_price']}}</h3>
<span v-if="product['show_market_price']">¥{{product['market_price']}}</span>
<!-- <h3>{{product['retail_price']}}</h3>group_price -->
<h3>{{product['group_price']}}</h3>
<!-- <span v-if="product['show_market_price']">¥{{product['market_price']}}</span> -->
<span >¥{{product['retail_price']}}</span>

<span style="text-decoration: none;" v-if="product['everybody_limit_num']>0">限购{{product['everybody_limit_num']}}份</span>
</div>
<img v-if="deadlineTime > 0 && product.stock > 0" src="../../../../../../static/icons/add.png" @click="addToCart" alt="">
<img v-else src="../../../../../../static/icons/disabledAdd.jpg" alt="">
Expand Down Expand Up @@ -44,6 +49,11 @@
</script>

<style scoped>
.a{



}
.product {
width: 100%;
box-sizing: border-box;
Expand Down
36 changes: 25 additions & 11 deletions src/pages/societyFood/fastFoot/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
<!-- <label>分享好友</label> -->
<img src="../img/onshery.png" alt="">
</button>
<button style="margin-left: 20rpx" @click="searchMoreProduct">
<img src="../../../../static/icons/lookmore.png" alt="">
</button>
</div>
<div class="shop-five">
<div class="content-word" v-if="itemObj.support_home_delivery" style="margin-right: 10pt">送餐上门</div>
Expand All @@ -47,13 +50,13 @@
</div>
</div>
<div class="change-btn">
<view :class="{'selectTab':status === '1' && itemObj.state}" @click="selectProject('1')">立即订餐</view>
<view :class="{'selectTab':status === '2' && itemObj.state}" @click="selectProject('2')">明日预定</view>
<view class="more-product" @click="searchMoreProduct">
<view :class="{'selectTab':status === '1' && itemObj.state}" @click="selectProject('1')"><img src="../../../../static/icons/goods.png">现货购买</view>
<view :class="{'selectTab':status === '2' && itemObj.state}" @click="selectProject('2')"><img src="../../../../static/icons/reserve.png">明日预定</view>
<!-- <view class="more-product" @click="searchMoreProduct">
<view class="more-product-btn">
查看更多<img src="../../../../static/icons/rightArrow.png" class="rightArrow_imp" alt="">
</view>
</view>
</view> -->
</div>
<scroll-view scroll-y class="scroll-view_H">
<view class="product-list-detail" v-for="(item,index) in atOnceProList" :key="item.product_stock_id" v-if="status=='1'">
Expand Down Expand Up @@ -123,26 +126,31 @@
<div class="order-settlement" v-if="status=='1'">
<view class="order-pay-info">
<i-badge :count="onceOrderCount" overflow-count="99">
<view class="demo-badge"><img src="../img/buyCard.png"/></view>
<view class="demo-badge" v-if="onceOrderCount >0"><img src="../../../../static/icons/cards.png"/></view>
<view class="demo-badge" v-else><img src="../../../../static/icons/nocard.png"/></view>
</i-badge>
<view>
<view style="color: #111111;font-size: 40rpx;font-weight: 800">¥{{onceOrderCount<=0?0:oncePrice}}</view>
<view style="color: #999999;font-size: 11pt" v-if="money>0">满{{money}}元起订</view>
</view>
</view>
<button @click="completePayment">去结算</button>
<button v-if="onceOrderCount >0" @click="completePayment">去结算</button>
<button style="background:#999999" v-else @click="completePayment">去结算</button>

</div>
<div class="order-settlement" v-else>
<view class="order-pay-info">
<i-badge :count="reserveOrderCount" overflow-count="99">
<view class="demo-badge"><img src="../img/buyCard.png"/></view>
<view class="demo-badge" v-if="reserveOrderCount >0"><img src="../../../../static/icons/cards.png"/></view>
<view class="demo-badge" v-else><img src="../../../../static/icons/nocard.png"/></view>
</i-badge>
<view>
<view style="color: #111111;font-size: 17pt;font-weight: 700">¥{{reserveOrderCount<=0?0:reservePrice}}</view>
<view style="color: #999999;font-size: 11pt" v-if="money>0">满{{money}}元起订</view>
</view>
</view>
<button @click="completePayment">去结算</button>
<button v-if="reserveOrderCount >0" @click="completePayment">去结算</button>
<button style="background:#999999" v-else @click="completePayment">去结算</button>
</div>
</view>
</div>
Expand Down Expand Up @@ -754,13 +762,19 @@
.selectTab{
position: relative;
color: #111111 !important;
font-weight: 800;
}
.change-btn img{
width: 50rpx;
height: 50rpx;
margin-right: 10rpx;
}
.selectTab:after {
content: '';
position: absolute;
width:25pt;
height:3pt;
left: calc(50% - 12.5pt);;
width:135rpx;
height:6rpx;
left: calc(50% - 45rpx);;
background:rgba(255,204,0,1);
border-radius:1.5pt;
bottom: 0;
Expand Down
9 changes: 8 additions & 1 deletion src/pages/societyFood/selectShopByMap/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@
<img class="leftArrow" src="../../../../static/icons/leftArrow.png" alt="">
</div>
</div>
<map id="shopMap" :longitude="longitude" :latitude="latitude" scale="14" :markers="markers" @markertap="markertap" @regionchange="regionchange" @end="regionchange" show-location></map>
<map id="shopMap"
:longitude="longitude"
:latitude="latitude" scale="14"
:markers="markers"
@markertap="markertap"
@regionchange="regionchange"
@end="regionchange" show-location>
</map>
<input type="text" placeholder-class="placeholder-class" placeholder-style="padding-left:10px" :style="{'top': (imgHeight+15) + 'px'}" v-model="searchName" class="search-input" placeholder="请输入地点名称">
<view class="search-content" :style="{'top': (imgHeight+55) + 'px'}" v-if="showSearchContent">
<view v-for="(item,index) in searchAddressList" :key="index" style="margin-top: 20px" @click="selectedPos(item.location)">
Expand Down
Binary file added static/icons/cards.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/icons/food.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/icons/goods.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/icons/lookmore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/icons/nocard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/icons/reserve.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3bed4e0

Please sign in to comment.