xt / xcx-book · Commits

Go to a project

Commit 5690a52a7712b73806491db610238968cb5f249c

Authored by vking
1 parent 5b715221
build: skipped

商家红包活动

Inline Side-by-side
Showing 15 changed files with 508 additions and 50 deletions
  1 +// components/reserve/discount.js
  2 +import App from '../../../utils/api'
  3 +Component({
  4 + /**
  5 + * 组件的属性列表
  6 + */
  7 + properties: {
  8 + seller:{
  9 + type:Object,
  10 + value:{}
  11 + }
  12 + },
  13 +
  14 + /**
  15 + * 组件的初始数据
  16 + */
  17 + data: {
  18 + display:false,
  19 + hiddenAni:'',
  20 + mycards:[],
  21 + money:0,//最大优惠
  22 + red_envelopes_price:0,//获得金额
  23 + },
  24 + lifetimes: {
  25 + // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
  26 + attached: function () {
  27 + App.Customer.SetCardRel({
  28 + sid:this.data.seller.id
  29 + }).then(res=>{
  30 + this.setData({
  31 + red_envelopes_price:res.data.red_envelopes_price,
  32 + money:res.data.money,
  33 + mycards:res.data.list,
  34 + })
  35 + if(res.data.red_envelopes_price>0){
  36 + setTimeout(()=>{
  37 + this.setData({
  38 + red_envelopes_price:0,
  39 + })
  40 + },3000)
  41 + }
  42 + })
  43 + },
  44 + moved: function () { },
  45 + detached: function () { },
  46 + },
  47 + /**
  48 + * 组件的方法列表
  49 + */
  50 + methods: {
  51 + hide(){
  52 + this.setData({
  53 + hiddenAni:'discountHide',
  54 + })
  55 + this.triggerEvent('hide')
  56 + setTimeout(()=>{
  57 + this.setData({
  58 + display:false,
  59 + hiddenAni:'',
  60 + })
  61 + },250)
  62 + },
  63 + show(){
  64 + this.setData({
  65 + display:true,
  66 + hiddenAni:'',
  67 + })
  68 + this.triggerEvent('show')
  69 + },
  70 + useCard(){
  71 + this.hide()
  72 + this.triggerEvent('event',{type:'gotoReserve'})
  73 + },
  74 + },
  75 +})
  1 +{
  2 + "component": true,
  3 + "usingComponents": {
  4 + "quan":"./quan"
  5 + }
  6 +}
  1 +<!--components/reserve/discount.wxml-->
  2 +<view class="mask" bindtap="hide" wx:if="{{display}}">
  3 + <view class="discount {{hiddenAni}}" catchtap="">
  4 + <view class="discount-name Medium" bindtap="hide">
  5 + 优惠
  6 + <view class="close"></view>
  7 + </view>
  8 + <view class="activity">
  9 + <view class="txt">活动</view>
  10 + <view class="flex-ll activity-item" wx:if="{{seller.receive_condition_2}}"
  11 + style="align-items: flex-start">
  12 + <view class="activity-left">消费返</view>
  13 + <view class="activity-right">在线买单{{seller.receive_condition_str}}红包</view>
  14 + </view>
  15 + <view class="flex-ll activity-item" wx:if="{{seller.isopen_md==1}}"
  16 + style="align-items: flex-start">
  17 + <view class="activity-left">平台红包</view>
  18 + <view class="activity-right">可叠加使用平台红包</view>
  19 + </view>
  20 + </view>
  21 + <block wx:if="{{true || mycards.length>0}}">
  22 + <view class="mycards-txt">已领取的红包</view>
  23 + <scroll-view
  24 + scroll-y
  25 + class="mycards"
  26 + >
  27 + <view class="mycards-item" wx:for="{{mycards}}" wx:key="mycards">
  28 + <quan quan="{{item}}">
  29 + <view class="button-use" bindtap="useCard">立即使用</view>
  30 + </quan>
  31 + <view class="quan-tips">仅可在“{{seller.sellername}}”预订包间、在线买单时使用</view>
  32 + </view>
  33 + </scroll-view>
  34 + </block>
  35 + </view>
  36 +</view>
  37 +<view class="toast flex-vc" wx:if="{{red_envelopes_price>0}}">
  38 + <view>恭喜您获得<text>{{red_envelopes_price}}元红包</text></view>
  39 +</view>
  40 +<view class="tips reserve-detail" wx:if="{{money>0 && red_envelopes_price==0}}">
  41 + <view class="msg">
  42 + {{money}}元
  43 + <view class="jiao"></view>
  44 + </view>
  45 +</view>
  1 +/* components/reserve/discount.wxss */
  2 +@import "../../../app.wxss";
  3 +.discount{
  4 + position: fixed;
  5 + bottom: 0;
  6 + background-color: #ffffff;
  7 + border-radius: 40rpx 40rpx 0rpx 0rpx;
  8 + color: #353535;
  9 + width: 100%;
  10 + padding: 40rpx 40rpx;
  11 + animation: discountShow 0.3s;
  12 + box-sizing: border-box;
  13 +}
  14 +.discount.discountHide{
  15 + animation: discountHide 0.3s;
  16 +}
  17 +.discount view{
  18 + background-size: 100% 100%;
  19 +}
  20 +.discount-name{
  21 + font-size: 32rpx;
  22 + height: 44rpx;
  23 + line-height: 44rpx;
  24 + width: 100%;
  25 + position: relative;
  26 + text-align: center;
  27 +}
  28 +.discount-name .close{
  29 + background-image: url("http://nosqn.colorcun.com/sellerbaobao/close.png");
  30 + width: 28rpx;
  31 + height: 29rpx;
  32 + position: absolute;
  33 + right:0;
  34 + top:6rpx;
  35 +}
  36 +.activity{
  37 + margin-top: 60rpx;
  38 +}
  39 +.activity .txt{
  40 + width:60rpx;
  41 + height:42rpx;
  42 + font-size:30rpx;
  43 + font-family:PingFangSC-Regular,PingFang SC;
  44 + font-weight:400;
  45 + color:rgba(136,136,136,1);
  46 + line-height:42rpx;
  47 +}
  48 +.activity-item{
  49 + margin-top: 20rpx;
  50 +}
  51 +.activity-left{
  52 + height:28rpx;
  53 + border-radius:4rpx;
  54 + border:2rpx solid rgba(248,164,135,1);
  55 + font-size:20rpx;
  56 + font-family:PingFangSC-Medium,PingFang SC;
  57 + font-weight:500;
  58 + color:rgba(240,88,36,1);
  59 + line-height:28rpx;
  60 + padding: 0 6rpx;
  61 + min-width: 60rpx;
  62 + text-align: center;
  63 +}
  64 +.activity-right{
  65 + font-size:26rpx;
  66 + font-family:PingFangSC-Medium,PingFang SC;
  67 + font-weight:500;
  68 + color:rgba(53,53,53,1);
  69 + line-height:36rpx;
  70 + margin-left: 40rpx;
  71 +}
  72 +.mycards-txt{
  73 + height:42rpx;
  74 + font-size:30rpx;
  75 + font-family:PingFangSC-Regular,PingFang SC;
  76 + font-weight:400;
  77 + color:rgba(136,136,136,1);
  78 + line-height:42rpx;
  79 + margin-top: 50rpx;
  80 +}
  81 +.mycards{
  82 + margin-top: 20rpx;
  83 + max-height: 430rpx;
  84 +}
  85 +.quan-tips{
  86 + height:50rpx;
  87 + background:rgba(245,245,245,1);
  88 + border-radius:0rpx 0rpx 10rpx 10rpx;
  89 + font-size:22rpx;
  90 + font-family:PingFangSC-Regular,PingFang SC;
  91 + font-weight:400;
  92 + color:rgba(136,136,136,1);
  93 + line-height:50rpx;
  94 + padding-left: 36rpx;
  95 + width: 100%;
  96 + box-sizing: border-box;
  97 +}
  98 +.mycards-item{
  99 + margin-bottom: 20rpx;
  100 +}
  101 +.button-use{
  102 + width:120rpx;
  103 + height:44rpx;
  104 + background:linear-gradient(180deg,rgba(231,66,88,1) 0%,rgba(243,53,78,1) 100%);
  105 + border-radius:6rpx;
  106 + font-size:24rpx;
  107 + font-family:PingFangSC-Medium,PingFang SC;
  108 + font-weight:500;
  109 + color:rgba(255,227,192,1);
  110 + line-height:44rpx;
  111 + text-align: center;
  112 +}
  113 +@keyframes discountShow
  114 +{
  115 + from {bottom: -870rpx;}
  116 + to {bottom: 0rpx;}
  117 +}
  118 +@keyframes discountHide
  119 +{
  120 + from {height: auto;}
  121 + to {height: 0rpx;}
  122 +}
  123 +
  124 +.toast{
  125 + width:380rpx;
  126 + height:80rpx;
  127 + background:rgba(53,53,53,0.8);
  128 + border-radius:20rpx;
  129 +
  130 + font-size:32rpx;
  131 + font-family:PingFangSC-Medium,PingFang SC;
  132 + font-weight:500;
  133 + color:rgba(255,255,255,1);
  134 + line-height:44rpx;
  135 + position: fixed;
  136 + top:60%;
  137 + left:calc(50% - 190rpx);
  138 +}
  139 +.toast text{
  140 + color:#FEDE68;
  141 +}
  142 +
  143 +.tips{
  144 + position: fixed;
  145 + z-index: 9999;
  146 + background:rgba(84,83,84,0.8);
  147 + font-size:24rpx;
  148 + font-weight:500;
  149 + color:rgba(255,255,255,1);
  150 +}
  151 +.tips .msg{
  152 + height: 70rpx;
  153 + line-height: 70rpx;
  154 + padding: 0 24rpx;
  155 + position: relative;
  156 +}
  157 +.jiao{
  158 + width: 26rpx;
  159 + height: 10rpx;
  160 + background-image: url("http://nosqn.colorcun.com/activity/images/jiao2.png");
  161 + background-size: 100% 100%;
  162 + position: absolute;
  163 + bottom: -10rpx;
  164 + left:30rpx;
  165 +}
  166 +.tips.reserve-detail{
  167 + bottom:122rpx;
  168 + right:30rpx;
  169 +}
  170 +.tips.reserve-detail .jiao{
  171 + right:80rpx;
  172 + left:auto;
  173 +}
  174 +.tips.reserve-detail .msg{
  175 + color: #FEDE68;
  176 +}
  177 +.tips.reserve-detail .msg:before{
  178 + content: "预订买单，立即抵扣";
  179 + color:rgba(255,255,255,1);
  180 +}
  1 +// components/reserve/seller/quan.js
  2 +Component({
  3 + /**
  4 + * 组件的属性列表
  5 + */
  6 + properties: {
  7 + quan:Object,
  8 + },
  9 +
  10 + /**
  11 + * 组件的初始数据
  12 + */
  13 + data: {
  14 +
  15 + },
  16 +
  17 + /**
  18 + * 组件的方法列表
  19 + */
  20 + methods: {
  21 +
  22 + }
  23 +})
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
  1 +<!--components/reserve/seller/quan.wxml-->
  2 +<wxs src="../../../utils/util.wxs" module="util" />
  3 +<view class="quan flex-lr">
  4 + <view class="money flex-ll" style="align-items: flex-end">
  5 + <view class="dot">￥</view>
  6 + <view class="number">{{util.toFixed(quan.price,0)}}</view>
  7 + </view>
  8 + <view class="line"></view>
  9 + <view class="type">
  10 + <view class="card_title">{{quan.card_title}}</view>
  11 + <view class="card-date">
  12 + {{util.unixtoTime(quan.start_time,"YYYY.MM.DD")}}-{{util.unixtoTime(quan.end_time,"YYYY.MM.DD")}}
  13 + </view>
  14 + </view>
  15 + <view class="opt">
  16 + <slot></slot>
  17 + </view>
  18 +</view>
  1 +/* components/reserve/seller/quan.wxss */
  2 +@import "/app.wxss";
  3 +.quan{
  4 + width:100%;
  5 + height:170rpx;
  6 + background:rgba(255,239,223,1);
  7 + box-sizing: border-box;
  8 + padding: 36rpx;
  9 + border-radius:10rpx 10rpx 0rpx 0rpx;
  10 + border-right: 14rpx solid #fefefe;
  11 + position: relative;
  12 +}
  13 +.quan:after{
  14 + background-size: 100% 100%;
  15 + background-image: url("http://nosqn.colorcun.com/sellerbaobao/rp2.png");
  16 + position: absolute;
  17 + top:0;
  18 + right:-14rpx;
  19 + width: 16rpx;
  20 + height: 170rpx;
  21 + content: "";
  22 +}
  23 +.dot{
  24 + width:22rpx;
  25 + height:50rpx;
  26 + font-size:36rpx;
  27 + font-family:PingFangSC-Semibold,PingFang SC;
  28 + font-weight:600;
  29 + color:rgba(204,65,17,1);
  30 + line-height:50rpx;
  31 +}
  32 +.number{
  33 + height:78rpx;
  34 + font-size:64rpx;
  35 + font-family:PingFangSC-Semibold,PingFang SC;
  36 + font-weight:600;
  37 + color:rgba(204,65,17,1);
  38 + line-height:78rpx;
  39 + margin-left: 10rpx;
  40 +}
  41 +.line{
  42 + border-right-color:#D38238;
  43 + border-right-width:2rpx;
  44 + border-right-style: dashed;
  45 + height: 100rpx;
  46 + width:2rpx;
  47 + box-sizing: border-box;
  48 +}
  49 +.card_title{
  50 + height:40rpx;
  51 + font-size:28rpx;
  52 + font-family:PingFangSC-Medium,PingFang SC;
  53 + font-weight:500;
  54 + color:rgba(187,113,50,1);
  55 + line-height:40rpx;
  56 +}
  57 +.card-date{
  58 + height:32rpx;
  59 + font-size:22rpx;
  60 + font-family:PingFangSC-Regular,PingFang SC;
  61 + font-weight:400;
  62 + color:rgba(187,113,50,1);
  63 + line-height:32rpx;
  64 + margin-top: 10rpx;
  65 +}
@@ -9,7 +9,7 @@ Page({ @@ -9,7 +9,7 @@ Page({
9 * 页面的初始数据 9 * 页面的初始数据
10 */ 10 */
11 data: { 11 data: {
12 - seller:{}, 12 + seller:null,
13 IsCollectionSeller:false, 13 IsCollectionSeller:false,
14 pagesHeight:'auto', 14 pagesHeight:'auto',
15 current:0, 15 current:0,
@@ -99,6 +99,18 @@ Page({ @@ -99,6 +99,18 @@ Page({
99 } 99 }
100 }) 100 })
101 } 101 }
  102 + if(seller.card_info){
  103 + let xff=[]
  104 + seller.card_info.forEach(card=>{
  105 + seller['receive_condition_'+card.receive_condition]=true
  106 + if(card.receive_condition==2){
  107 + xff.push(`满${card.order_price}元返${card.price}元`)
  108 + }
  109 + })
  110 + if(xff.length>0){
  111 + seller.receive_condition_str=xff.join('/')
  112 + }
  113 + }
102 this.setData({ 114 this.setData({
103 seller:seller, 115 seller:seller,
104 hasOnlineReserve:seller.is_online_reserve==1, 116 hasOnlineReserve:seller.is_online_reserve==1,
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 "as":"/components/actionSheet/index", 10 "as":"/components/actionSheet/index",
11 "nav":"/components/nav/nav", 11 "nav":"/components/nav/nav",
12 "getpos":"/components/userinfo/getpos", 12 "getpos":"/components/userinfo/getpos",
13 - "discount":"/components/reserve/discount", 13 + "discount":"/components/reserve/seller/discount",
14 "share":"/components/reserve/share/share", 14 "share":"/components/reserve/share/share",
15 "people":"/components/reserve/people/people", 15 "people":"/components/reserve/people/people",
16 "dur":"/components/reserve/dur/dur", 16 "dur":"/components/reserve/dur/dur",
@@ -78,56 +78,33 @@ @@ -78,56 +78,33 @@
78 </view> 78 </view>
79 </view> 79 </view>
80 </view> 80 </view>
81 - <view style="display:{{pagesHeight=='auto'?'block':'none'}}"> 81 + <view style="display:{{pagesHeight=='auto'?'block':'none'}}" wx:if="{{seller}}">
82 <view class="black20line"></view> 82 <view class="black20line"></view>
83 - <view class="seller" wx:if="{{seller.activity.length>0}}">  
84 - <formids bindclick="showDiscount"> 83 + <block wx:if="{{seller.card_info.length>0}}">
  84 + <view class="activity-view-easy flex-lr" bindtap="showDiscount">
  85 + <view class="activity-left flex-ll">
  86 + <view class="activity-view-tit">优惠</view>
  87 + <view class="activity-view-blk" wx:if="{{seller.receive_condition_1}}">进店赠红包</view>
  88 + <view class="activity-view-blk" wx:if="{{seller.receive_condition_2}}">消费赠红包</view>
  89 + <view class="activity-view-blk" wx:if="{{seller.isopen_md==1}}">平台红包</view>
  90 + </view>
  91 + <view class="flex-rr activity-right">
  92 + <view class="more"></view>
  93 + </view>
  94 + </view>
  95 + <view class="black20line"></view>
  96 + </block>
  97 + <block wx:if="{{seller.isopen_md!=1}}">
  98 + <view class="seller" >
85 <view class="activity-view-easy flex-lr" > 99 <view class="activity-view-easy flex-lr" >
86 <view class="activity-left flex-ll"> 100 <view class="activity-left flex-ll">
87 <view class="icon"></view> 101 <view class="icon"></view>
88 - <block wx:for="{{seller.activity}}"  
89 - wx:key="seller.activity.key"  
90 - wx:if="{{index<2}}">  
91 - <view class="discount" >{{item.title}}</view>  
92 - </block>  
93 - </view>  
94 - <view class="flex-rr activity-right">  
95 - <view class="more-text">更多</view>  
96 - <view class="more"></view>  
97 - </view>  
98 - </view>  
99 - </formids>  
100 - <!--  
101 - <formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">  
102 - <view class="activity-view" >  
103 - <view class="activity" >  
104 - <view class="flex-lr">  
105 - <view class="activity-left">  
106 - <view class="activity-first flex-ll" style="align-items: flex-start">  
107 - <image src="http://nosqn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>  
108 - <view class="flex-cc discount" wx:for="{{seller.activity}}"  
109 - wx:key="seller.activity.key"  
110 - wx:if="{{index<2}}">  
111 - <view class="discount-left"></view>  
112 - <view class="discount-text">{{item.title}}</view>  
113 - <view class="discount-right"></view>  
114 - </view>  
115 - </view>  
116 - </view>  
117 - <view class="activity-right flex-rr Semibold">  
118 - <view></view>  
119 - <view class="more"></view>  
120 - </view>  
121 - </view>  
122 - <view class="activity-text">  
123 - 该优惠仅适用于一键订平台预订客户  
124 - </view> 102 + <view class="discount" >本店不可使用平台红包</view>
125 </view> 103 </view>
126 </view> 104 </view>
127 - </formids>  
128 - -->  
129 - </view>  
130 - <view class="black20line" wx:if="{{seller.activity.length>0}}"></view> 105 + </view>
  106 + <view class="black20line"></view>
  107 + </block>
131 <view class="block" wx:if="{{seller.room_image.length>0}}"> 108 <view class="block" wx:if="{{seller.room_image.length>0}}">
132 <view class="header flex-ll"> 109 <view class="header flex-ll">
133 <view class="line"></view> 110 <view class="line"></view>
@@ -206,9 +183,14 @@ @@ -206,9 +183,14 @@
206 </view> 183 </view>
207 <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone" hasTip="{{false}}"></as> 184 <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone" hasTip="{{false}}"></as>
208 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos> 185 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
209 - <discount id="discount" seller="{{seller}}" bindhide="discountHide" bindshow="discountShow"></discount>  
210 <share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share> 186 <share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>
  187 + <!--
211 <activity-tips str="￥price" cla="reserve-detail" pos="pages/reserve/detail"></activity-tips> 188 <activity-tips str="￥price" cla="reserve-detail" pos="pages/reserve/detail"></activity-tips>
  189 + -->
  190 + <discount id="discount" seller="{{seller}}" wx:if="{{seller}}"
  191 + bindevent="reserveEvent"
  192 + bindhide="discountHide"
  193 + bindshow="discountShow"></discount>
212 </view> 194 </view>
213 <view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}"> 195 <view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}">
214 <view class="olreserve bg_white"> 196 <view class="olreserve bg_white">
@@ -290,10 +290,10 @@ @@ -290,10 +290,10 @@
290 padding: 28rpx 0; 290 padding: 28rpx 0;
291 } 291 }
292 .activity-left{ 292 .activity-left{
293 - width: calc(100% - 120rpx); 293 + width: calc(100% - 60rpx);
294 } 294 }
295 .activity-right{ 295 .activity-right{
296 - min-width: 120rpx; 296 + min-width: 60rpx;
297 color: #C0A369; 297 color: #C0A369;
298 } 298 }
299 .activity-first{ 299 .activity-first{
@@ -472,6 +472,7 @@ @@ -472,6 +472,7 @@
472 padding-right: 20rpx; 472 padding-right: 20rpx;
473 padding-left: 20rpx; 473 padding-left: 20rpx;
474 margin-right: 0; 474 margin-right: 0;
  475 + font-weight:500;
475 } 476 }
476 .activity-view-easy .discount:last-child{ 477 .activity-view-easy .discount:last-child{
477 border-right-width: 0; 478 border-right-width: 0;
@@ -553,3 +554,42 @@ @@ -553,3 +554,42 @@
553 bottom:0; 554 bottom:0;
554 background: #fff; 555 background: #fff;
555 } 556 }
  557 +.activity-view-tit{
  558 + height:42rpx;
  559 + font-size:30rpx;
  560 + font-family:PingFangSC-Medium,PingFang SC;
  561 + font-weight:500;
  562 + color:rgba(53,53,53,1);
  563 + line-height:42rpx;
  564 + margin-right: 42rpx;
  565 +}
  566 +.activity-view-blk{
  567 + height:34rpx;
  568 + border-top:2rpx solid rgba(240,88,36,1);
  569 + border-bottom:2rpx solid rgba(240,88,36,1);
  570 + box-sizing: border-box;
  571 + font-size:24rpx;
  572 + font-family:PingFangSC-Medium,PingFang SC;
  573 + font-weight:500;
  574 + color:rgba(240,88,36,1);
  575 + line-height:34rpx;
  576 + margin-right: 22rpx;
  577 + padding: 0 12rpx;
  578 + position: relative;
  579 + border-radius: 6rpx;
  580 +}
  581 +.activity-view-blk:before,.activity-view-blk:after{
  582 + background-size: 100% 100%;
  583 + width: 12rpx;
  584 + height: 34rpx;
  585 + background-image: url("http://nosqn.colorcun.com/sellerbaobao/left-1.png");
  586 + content: "";
  587 + position: absolute;
  588 + left:0;
  589 + top:-2rpx;
  590 +}
  591 +.activity-view-blk:after{
  592 + background-image: url("http://nosqn.colorcun.com/sellerbaobao/right-1.png");
  593 + right:0;
  594 + left:auto;
  595 +}
@@ -357,7 +357,7 @@ @@ -357,7 +357,7 @@
357 "id": 39, 357 "id": 39,
358 "name": "pages/reserve/detail 在线订座 ", 358 "name": "pages/reserve/detail 在线订座 ",
359 "pathName": "pages/reserve/detail", 359 "pathName": "pages/reserve/detail",
360 - "query": "id=1", 360 + "query": "id=80",
361 "scene": null 361 "scene": null
362 }, 362 },
363 { 363 {
@@ -474,4 +474,9 @@ export default { @@ -474,4 +474,9 @@ export default {
474 'App.Customer.UpdateOrderInfo':{ 474 'App.Customer.UpdateOrderInfo':{
475 silence:false, 475 silence:false,
476 }, 476 },
  477 +
  478 + //进店领取红包
  479 + 'App.Customer.SetCardRel':{
  480 + openid:'openid',
  481 + },
477 } 482 }
@@ -96,4 +96,7 @@ module.exports = { @@ -96,4 +96,7 @@ module.exports = {
96 } 96 }
97 return ''; 97 return '';
98 }, 98 },
  99 + toFixed:function(num,limit){
  100 + return parseFloat(num).toFixed(limit)
  101 + },
99 }; 102 };