Commit e81e25ab26a4a2ae1ae8c1155433b0f5de1166e2

Authored by vking
1 parent 4b1bde20

master-activity

@@ -7,10 +7,6 @@ @@ -7,10 +7,6 @@
7 font-weight:500; 7 font-weight:500;
8 color:rgba(255,255,255,1); 8 color:rgba(255,255,255,1);
9 } 9 }
10 -.tips.reserve-detail{  
11 - bottom:122rpx;  
12 - right:30rpx;  
13 -}  
14 .tips .msg{ 10 .tips .msg{
15 height: 70rpx; 11 height: 70rpx;
16 line-height: 70rpx; 12 line-height: 70rpx;
@@ -26,6 +22,10 @@ @@ -26,6 +22,10 @@
26 bottom: -14rpx; 22 bottom: -14rpx;
27 left:30rpx; 23 left:30rpx;
28 } 24 }
  25 +.tips.reserve-detail{
  26 + bottom:122rpx;
  27 + right:30rpx;
  28 +}
29 .tips.reserve-detail .jiao{ 29 .tips.reserve-detail .jiao{
30 right:80rpx; 30 right:80rpx;
31 left:auto; 31 left:auto;
@@ -40,4 +40,26 @@ @@ -40,4 +40,26 @@
40 .tips.reserve-detail .msg:after{ 40 .tips.reserve-detail .msg:after{
41 content: "红包"; 41 content: "红包";
42 color:rgba(255,255,255,1); 42 color:rgba(255,255,255,1);
  43 +}
  44 +
  45 +.tips.detail-invitation{
  46 + bottom:112rpx;
  47 + left:28rpx;
  48 +}
  49 +.tips.detail-invitation .msg{
  50 + color: #ECD9B7;
  51 + font-weight: bold;
  52 +}
  53 +.tips.detail-invitation .msg:before{
  54 + content: "订包间即可获得";
  55 + color:rgba(236,217,183,1);
  56 + font-weight: normal;
  57 +}
  58 +.tips.detail-invitation .msg:after{
  59 + content: "红包";
  60 + color:rgba(236,217,183,1);
  61 + font-weight: normal;
  62 +}
  63 +.tips.detail-invitation .jiao{
  64 + left:80rpx;
43 } 65 }
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 "nav":"/components/nav/nav", 7 "nav":"/components/nav/nav",
8 "formids":"/components/formids/formids", 8 "formids":"/components/formids/formids",
9 "a2l":"/components/tips/add-to-lite", 9 "a2l":"/components/tips/add-to-lite",
  10 + "activity-tips":"/components/activity/tips",
10 "userinfo-share": "/components/userinfo/share" 11 "userinfo-share": "/components/userinfo/share"
11 } 12 }
12 } 13 }
1 <!--pages/customer/detail_owner.wxml--> 1 <!--pages/customer/detail_owner.wxml-->
2 <import src="../tpl/invitation"></import> 2 <import src="../tpl/invitation"></import>
3 <nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav> 3 <nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav>
4 -<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}"> 4 +<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px; padding-top: 120rpx;overflow-y: auto;" wx:if="{{options.tplid}}">
5 <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation,detail}}"></template> 5 <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation,detail}}"></template>
6 - <view class="opt-view flex-vc">  
7 - <block wx:if="{{!detail.hasCanSuccess && detail.status!=4}}"> 6 + <view class="opt-view flex-vc" style="padding-bottom: 320rpx;">
  7 + <block wx:if="{{true || !detail.hasCanSuccess && detail.status!=4}}">
8 <userinfo class="button-none flex-vc" binduserinfo="confirmed" catchtap="catchtap"> 8 <userinfo class="button-none flex-vc" binduserinfo="confirmed" catchtap="catchtap">
9 <view class="buts-share animation customer"></view> 9 <view class="buts-share animation customer"></view>
10 </userinfo> 10 </userinfo>
@@ -44,3 +44,4 @@ @@ -44,3 +44,4 @@
44 <template is="tpl-wenxin" data="{{...seller,options}}"></template> 44 <template is="tpl-wenxin" data="{{...seller,options}}"></template>
45 </template> 45 </template>
46 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INVIT"></a2l> 46 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INVIT"></a2l>
  47 +<activity-tips str="¥price" pos="pages/reserve/detail" cla="detail-invitation"></activity-tips>