商家红包活动

@@ -28,6 +28,7 @@ Component({
       App.Customer.SetCardRel({
       App.Customer.SetCardRel({
         sid:this.data.seller.id
         sid:this.data.seller.id
       }).then(res=>{
       }).then(res=>{
+        if(!res.data) return;
         this.setData({
         this.setData({
           red_envelopes_price:res.data.red_envelopes_price,
           red_envelopes_price:res.data.red_envelopes_price,
           money:res.data.money,
           money:res.data.money,

@@ -188,4 +188,38 @@
   content: "红包待用";
   content: "红包待用";
   text-indent: -4rpx;
   text-indent: -4rpx;
   display: inline-block;
   display: inline-block;
+}
+
+.money-tips{
+  min-width:184rpx;
+  height:34rpx;
+  padding: 0 20rpx;
+  background:rgba(240,85,34,1);
+  border-radius:16rpx 16rpx 16rpx 0rpx;
+
+  font-size:20rpx;
+  font-weight:500;
+  color:rgba(255,255,255,1);
+  line-height:34rpx;
+
+  position: absolute;
+  top:-28rpx;
+  right:-16rpx;
+}
+
+.checkout-button-money-tips{
+  min-width:184rpx;
+  padding: 0 20rpx;
+  height:34rpx;
+  background:rgba(240,85,34,1);
+  border-radius:16rpx 16rpx 16rpx 0rpx;
+
+  font-size:20rpx;
+  font-weight:500;
+  color:rgba(255,255,255,1);
+  line-height:34rpx;
+
+  position: absolute;
+  top:-28rpx;
+  right:40rpx;
 }
 }

@@ -133,10 +133,8 @@
             <subscribe ids="{{[1]}}" bindevent="checkoutInit">
             <subscribe ids="{{[1]}}" bindevent="checkoutInit">
                 <view class="checkout-button">
                 <view class="checkout-button">
                     获取消费金额
                     获取消费金额
-                    <view class="checkout-button-money-tips">
-                        <seller-discount id="seller-discount" seller="{{seller}}" wx:if="{{seller}}"
-                                         cla="detail_owner"></seller-discount>
-                    </view>
+                    <seller-discount id="seller-discount" seller="{{seller}}" wx:if="{{seller}}"
+                                     cla="checkout-button-money-tips detail_owner"></seller-discount>
                 </view>
                 </view>
             </subscribe>
             </subscribe>
         </view>
         </view>

@@ -137,22 +137,6 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked:before{
     content: "";
     content: "";
 }
 }
 
 
-.checkout-button-money-tips{
-    min-width:184rpx;
-    padding: 0 20rpx;
-    height:34rpx;
-    background:rgba(240,85,34,1);
-    border-radius:16rpx 16rpx 16rpx 0rpx;
-
-    font-size:20rpx;
-    font-weight:500;
-    color:rgba(255,255,255,1);
-    line-height:34rpx;
-
-    position: absolute;
-    top:-28rpx;
-    right:40rpx;
-}
 .waiting-txt{
 .waiting-txt{
     margin-top: 32rpx;
     margin-top: 32rpx;
     height:50rpx;
     height:50rpx;

@@ -50,10 +50,8 @@
                               class="share-but-view">
                               class="share-but-view">
                         <view class="share-but Regular">
                         <view class="share-but Regular">
                             提前买单
                             提前买单
-                            <view class="money-tips">
-                                <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
-                                                 cla="detail_owner"></seller-discount>
-                            </view>
+                            <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
+                                             cla="money-tips detail_owner"></seller-discount>
                         </view>
                         </view>
                     </userinfo>
                     </userinfo>
                 </view>
                 </view>
@@ -123,10 +121,8 @@
                             <view class="checkout-icon checkout-icon-{{checkout.status}}" wx:if="{{checkout}}"></view>
                             <view class="checkout-icon checkout-icon-{{checkout.status}}" wx:if="{{checkout}}"></view>
                             提前买单
                             提前买单
                         </view>
                         </view>
-                        <view class="money-tips">
-                            <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
-                                             cla="detail_owner"></seller-discount>
-                        </view>
+                        <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
+                                         cla="money-tips detail_owner"></seller-discount>
                     </view>
                     </view>
                 </userinfo>
                 </userinfo>
             </view>
             </view>

@@ -159,22 +159,7 @@
 .share-view.subscribe{
 .share-view.subscribe{
   margin-top: 24rpx;
   margin-top: 24rpx;
 }
 }
-.money-tips{
-  min-width:184rpx;
-  height:34rpx;
-  padding: 0 20rpx;
-  background:rgba(240,85,34,1);
-  border-radius:16rpx 16rpx 16rpx 0rpx;
 
 
-  font-size:20rpx;
-  font-weight:500;
-  color:rgba(255,255,255,1);
-  line-height:34rpx;
-
-  position: absolute;
-  top:-28rpx;
-  right:-16rpx;
-}
 .checkout-icon{
 .checkout-icon{
   width: 32rpx;
   width: 32rpx;
   height: 32rpx;
   height: 32rpx;