Commit fa18c3deb831de02ea98341bc9851da7dd8a8cf9

Authored by vking
1 parent dd838921

商家红包活动

... ... @@ -5,6 +5,7 @@ Component({
* 组件的属性列表
*/
properties: {
cla:String,
seller:{
type:Object,
value:{}
... ...
... ... @@ -37,7 +37,7 @@
<view class="toast flex-vc" wx:if="{{red_envelopes_price>0}}">
<view style="text-align: center;">恭喜您获得<text>{{red_envelopes_price}}元红包</text></view>
</view>
<view class="tips reserve-detail" wx:if="{{money>0 && red_envelopes_price==0}}">
<view class="{{cla?cla:'tips reserve-detail'}}" wx:if="{{money>0 && red_envelopes_price==0}}">
<view class="msg">
{{money}}元
<view class="jiao"></view>
... ...
... ... @@ -179,4 +179,11 @@
.tips.reserve-detail .msg:before{
content: "预订买单,立即抵扣";
color:rgba(255,255,255,1);
}
.detail_owner .jiao{
display: none;
}
.detail_owner .msg:after{
content: "红包待用";
}
\ No newline at end of file
... ...
... ... @@ -16,7 +16,12 @@ Page({
*/
onLoad: function (options) {
this.options=options
this.GetBalance()
this.setData({
seller:{
id:options.sid
}
})
//this.GetBalance()
},
/**
... ...
... ... @@ -9,6 +9,7 @@
"subscribe":"/components/userinfo/subscribe",
"jinduBar":"../components/jinduBar",
"discount":"../components/discount",
"xfCard":"../components/xfCard"
"xfCard":"../components/xfCard",
"seller-discount":"/components/reserve/seller/discount"
}
}
\ No newline at end of file
... ...
... ... @@ -133,7 +133,10 @@
<subscribe ids="{{[1]}}" bindevent="checkoutInit">
<view class="checkout-button">
获取消费金额
<view class="checkout-button-money-tips" wx:if="{{user.price>0}}">{{user.price}}元红包待用</view>
<view class="checkout-button-money-tips">
<seller-discount id="seller-discount" seller="{{seller}}" wx:if="{{seller}}"
cla="detail_owner"></seller-discount>
</view>
</view>
</subscribe>
</view>
... ... @@ -141,4 +144,4 @@
</view>
<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
<discount id="discount" checkout="{{checkout}}" bindevent="discountEvent"></discount>
<xfCard id="xfCard" checkout="{{checkout}}"></xfCard>
\ No newline at end of file
<xfCard id="xfCard" checkout="{{checkout}}"></xfCard>
... ...
... ... @@ -127,7 +127,7 @@ Page({
firstShowMsg:firstShowMsg,
})
}
this.GetBalance()//余额
//this.GetBalance()//余额
this.GetCheckout()//账单
})
},
... ...
... ... @@ -14,6 +14,7 @@
"as":"/components/actionSheet/index",
"subscribe": "/components/userinfo/subscribe",
"activity-enter":"/components/activity/enter",
"showModal":"/components/tips/showModal/showModal"
"showModal":"/components/tips/showModal/showModal",
"seller-discount":"/components/reserve/seller/discount"
}
}
\ No newline at end of file
... ...
... ... @@ -50,7 +50,10 @@
class="share-but-view">
<view class="share-but Regular">
提前买单
<view class="money-tips" wx:if="{{user.price>0}}">{{user.price}}元红包待用</view>
<view class="money-tips">
<seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
cla="detail_owner"></seller-discount>
</view>
</view>
</userinfo>
</view>
... ... @@ -120,7 +123,10 @@
<view class="checkout-icon checkout-icon-{{checkout.status}}" wx:if="{{checkout}}"></view>
提前买单
</view>
<view class="money-tips" wx:if="{{user.price>0}}">{{user.price}}元红包待用</view>
<view class="money-tips">
<seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
cla="detail_owner"></seller-discount>
</view>
</view>
</userinfo>
</view>
... ... @@ -231,4 +237,4 @@
<as id="as" items="{{detail.seller.seller_tel}}" bindclick="callSellerPhone">拨打电话</as>
<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
<activity-enter floclass="detail_owner"></activity-enter>
<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
\ No newline at end of file
<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
... ...