Showing
13 changed files
with
278 additions
and
251 deletions
| @@ -31,11 +31,12 @@ Component({ | @@ -31,11 +31,12 @@ Component({ | ||
| 31 | methods: { | 31 | methods: { |
| 32 | Invoice(){ | 32 | Invoice(){ |
| 33 | wx.chooseInvoiceTitle({ | 33 | wx.chooseInvoiceTitle({ |
| 34 | - success:res=>{ | 34 | + success:(res)=>{ |
| 35 | console.log('wx.chooseInvoiceTitle',res) | 35 | console.log('wx.chooseInvoiceTitle',res) |
| 36 | + this.triggerEvent('event',res) | ||
| 36 | }, | 37 | }, |
| 37 | fail:(efail)=>{ | 38 | fail:(efail)=>{ |
| 38 | - console.log('wx.chooseInvoiceTitle',res) | 39 | + console.log('wx.chooseInvoiceTitle',efail) |
| 39 | wx.showModal({ | 40 | wx.showModal({ |
| 40 | title: '授权提示', | 41 | title: '授权提示', |
| 41 | content: '您拒绝了获取发票抬头,请点击确定打开授权', | 42 | content: '您拒绝了获取发票抬头,请点击确定打开授权', |
pack-checkout/components/jinduBar.js
0 → 100644
| 1 | +// pack-checkout/components/jinduBar.js | ||
| 2 | +Component({ | ||
| 3 | + /** | ||
| 4 | + * 组件的属性列表 | ||
| 5 | + */ | ||
| 6 | + properties: { | ||
| 7 | + checkout:Object, | ||
| 8 | + }, | ||
| 9 | + | ||
| 10 | + /** | ||
| 11 | + * 组件的初始数据 | ||
| 12 | + */ | ||
| 13 | + data: { | ||
| 14 | + steps:[ | ||
| 15 | + {number:1,txt:'获取消费金额'}, | ||
| 16 | + {number:2,txt:'商家反馈消费金额'}, | ||
| 17 | + {number:3,txt:'提前买单'}, | ||
| 18 | + ], | ||
| 19 | + }, | ||
| 20 | + | ||
| 21 | + /** | ||
| 22 | + * 组件的方法列表 | ||
| 23 | + */ | ||
| 24 | + methods: { | ||
| 25 | + | ||
| 26 | + } | ||
| 27 | +}) |
pack-checkout/components/jinduBar.json
0 → 100644
pack-checkout/components/jinduBar.wxml
0 → 100644
| 1 | +<!--pack-checkout/components/jinduBar.wxml--> | ||
| 2 | +<view class="jindu-view"> | ||
| 3 | + <view class="tips-info">3步轻松买单</view> | ||
| 4 | + <view class="top flex-lr"> | ||
| 5 | + <view class="top-icon flex-vc {{checkout.status>=index?'active':''}}" wx:for="{{steps}}" wx:key="key"> | ||
| 6 | + <view class="top-icon-txt flex-vc">{{item.number}}</view> | ||
| 7 | + </view> | ||
| 8 | + </view> | ||
| 9 | + <view class="bottom flex-lr"> | ||
| 10 | + <view class="bottom-txt {{checkout.status>=index?'active':''}}" wx:for="{{steps}}" wx:key="key">{{item.txt}}</view> | ||
| 11 | + </view> | ||
| 12 | +</view> |
pack-checkout/components/jinduBar.wxss
0 → 100644
| 1 | +/* pack-checkout/components/jinduBar.wxss */ | ||
| 2 | +@import "/app.wxss"; | ||
| 3 | +.jindu-view{ | ||
| 4 | + padding-top: 90rpx; | ||
| 5 | + padding-bottom: 36rpx; | ||
| 6 | + position: relative; | ||
| 7 | +} | ||
| 8 | +.tips-info{ | ||
| 9 | + width:238rpx; | ||
| 10 | + height:50rpx; | ||
| 11 | + position: absolute; | ||
| 12 | + top:-4rpx; | ||
| 13 | + left:calc(50% - 129rpx); | ||
| 14 | + | ||
| 15 | + font-size:28rpx; | ||
| 16 | + font-weight:500; | ||
| 17 | + color:rgba(255,255,255,1); | ||
| 18 | + line-height:50rpx; | ||
| 19 | + text-align: center; | ||
| 20 | + | ||
| 21 | + background-size: 100% 100%; | ||
| 22 | + background-image: url("http://qn.colorcun.com/checkout/images/4.png"); | ||
| 23 | +} | ||
| 24 | +.top{ | ||
| 25 | + height:50rpx; | ||
| 26 | + position: relative; | ||
| 27 | +} | ||
| 28 | +.top:before{ | ||
| 29 | + display: block; | ||
| 30 | + position: absolute; | ||
| 31 | + height: 2rpx; | ||
| 32 | + background-color: #E0E0E0; | ||
| 33 | + top:25rpx; | ||
| 34 | + left:0; | ||
| 35 | + width: 100%; | ||
| 36 | + content: ""; | ||
| 37 | +} | ||
| 38 | +.top-icon{ | ||
| 39 | + width: 130rpx; | ||
| 40 | + background-color: #fff; | ||
| 41 | + position: relative; | ||
| 42 | + | ||
| 43 | +} | ||
| 44 | +.top-icon-txt{ | ||
| 45 | + width:50rpx; | ||
| 46 | + height:50rpx; | ||
| 47 | + | ||
| 48 | + border-radius:10rpx; | ||
| 49 | + background:rgba(153,153,153,1); | ||
| 50 | + font-size:28rpx; | ||
| 51 | + font-weight:500; | ||
| 52 | + color:rgba(255,255,255,1); | ||
| 53 | +} | ||
| 54 | +.active .top-icon-txt{ | ||
| 55 | + background:linear-gradient(180deg,rgba(227,191,131,1) 0%,rgba(211,157,92,1) 100%); | ||
| 56 | + box-shadow:2rpx 2rpx 4rpx 0rpx rgba(179,124,54,1); | ||
| 57 | +} | ||
| 58 | +.bottom{ | ||
| 59 | + margin-top: 24rpx; | ||
| 60 | + height: 40rpx; | ||
| 61 | + font-size:28rpx; | ||
| 62 | + font-weight:500; | ||
| 63 | + color:rgba(153,153,153,1); | ||
| 64 | + line-height:40rpx; | ||
| 65 | +} | ||
| 66 | +.bottom-txt{ | ||
| 67 | + text-align: center; | ||
| 68 | +} | ||
| 69 | +.bottom-txt:first-child{ | ||
| 70 | + text-align: left; | ||
| 71 | +} | ||
| 72 | +.bottom-txt:last-child{ | ||
| 73 | + text-align: right; | ||
| 74 | +} | ||
| 75 | +.bottom-txt.active{ | ||
| 76 | + color:rgba(38,38,40,1); | ||
| 77 | +} |
| @@ -7,8 +7,7 @@ Page({ | @@ -7,8 +7,7 @@ Page({ | ||
| 7 | * 页面的初始数据 | 7 | * 页面的初始数据 |
| 8 | */ | 8 | */ |
| 9 | data: { | 9 | data: { |
| 10 | - activity:null, | ||
| 11 | - count:0, | 10 | + checkout:null, |
| 12 | }, | 11 | }, |
| 13 | 12 | ||
| 14 | /** | 13 | /** |
| @@ -16,21 +15,7 @@ Page({ | @@ -16,21 +15,7 @@ Page({ | ||
| 16 | */ | 15 | */ |
| 17 | onLoad: function (options) { | 16 | onLoad: function (options) { |
| 18 | this.options=options | 17 | this.options=options |
| 19 | - let sys=wx.getSystemInfoSync(); | ||
| 20 | - if("wxwork"==sys.environment){ | ||
| 21 | - console.log('wxwork run pack-activity',options) | ||
| 22 | - App.Task.GetTaskByOpenid({ | ||
| 23 | - ...options | ||
| 24 | - }).then(res=>{ | ||
| 25 | - this.options.id=options.aid | ||
| 26 | - if(res.ret==200){ | ||
| 27 | - util.toast('恭喜获得红包','none') | ||
| 28 | - setTimeout(()=>{ | ||
| 29 | - this.GetTaskInfos() | ||
| 30 | - },300) | ||
| 31 | - } | ||
| 32 | - }) | ||
| 33 | - } | 18 | + |
| 34 | }, | 19 | }, |
| 35 | 20 | ||
| 36 | /** | 21 | /** |
| @@ -44,7 +29,7 @@ Page({ | @@ -44,7 +29,7 @@ Page({ | ||
| 44 | * 生命周期函数--监听页面显示 | 29 | * 生命周期函数--监听页面显示 |
| 45 | */ | 30 | */ |
| 46 | onShow: function () { | 31 | onShow: function () { |
| 47 | - this.GetTaskInfos() | 32 | + this.GetCheckout() |
| 48 | }, | 33 | }, |
| 49 | 34 | ||
| 50 | /** | 35 | /** |
| @@ -74,59 +59,40 @@ Page({ | @@ -74,59 +59,40 @@ Page({ | ||
| 74 | onReachBottom: function () { | 59 | onReachBottom: function () { |
| 75 | 60 | ||
| 76 | }, | 61 | }, |
| 77 | - | ||
| 78 | - /** | ||
| 79 | - * 用户点击右上角分享 | ||
| 80 | - */ | ||
| 81 | - onShareAppMessage: function () { | ||
| 82 | - return { | ||
| 83 | - title:this.data.activity.title, | ||
| 84 | - path:'/pages/reserve/index', | ||
| 85 | - imageUrl:this.data.activity.bgurl+'.share.jpg', | ||
| 86 | - } | ||
| 87 | - }, | ||
| 88 | - GetTaskInfos(){ | ||
| 89 | - App.Task.GetTaskInfos({ | ||
| 90 | - aid:this.options.id, | ||
| 91 | - }).then(res=>{ | ||
| 92 | - let activity=res.data.activity | ||
| 93 | - activity.list=res.data.task | ||
| 94 | - let count=0 | ||
| 95 | - activity.list.forEach(t=>{ | ||
| 96 | - if(t.status==2){ | ||
| 97 | - count+=(t.price*1) | ||
| 98 | - } | ||
| 99 | - }) | 62 | + GetCheckout(){ |
| 63 | + App.Customer.GetOrderInfo({rid:this.options.rid}).then(res=>{ | ||
| 100 | this.setData({ | 64 | this.setData({ |
| 101 | - count:count.toFixed(2), | ||
| 102 | - activity:activity | 65 | + checkout:res.data |
| 103 | }) | 66 | }) |
| 104 | }) | 67 | }) |
| 105 | }, | 68 | }, |
| 106 | - taskNextDo(e){ | ||
| 107 | - let index=util.attr(e,'index') | ||
| 108 | - let task=this.data.activity.list[index] | ||
| 109 | - let tid=task.id | ||
| 110 | - ,path=util.http_build_query({aid:this.data.activity.id,tid:tid},task.task_url||'/pack-activity/pages/yuding') | ||
| 111 | - console.log(path) | ||
| 112 | - if(task.status==0){ | ||
| 113 | - App.Task.SetTaskInfo({//领取任务 | ||
| 114 | - aid:this.data.activity.id, | ||
| 115 | - tid:tid, | ||
| 116 | - }).then(()=>{ | ||
| 117 | - this.GetTaskInfos() | ||
| 118 | - wx.navigateTo({ | ||
| 119 | - url: path | ||
| 120 | - }) | ||
| 121 | - }) | ||
| 122 | - }else if(task.status==1){ | ||
| 123 | - wx.navigateTo({ | ||
| 124 | - url: path | ||
| 125 | - }) | ||
| 126 | - }else{ | ||
| 127 | - wx.navigateTo({ | ||
| 128 | - url: '/pack-activity/pages/money' | ||
| 129 | - }) | 69 | + is_wine:0, |
| 70 | + is_pack:0, | ||
| 71 | + checkoutData(e){ | ||
| 72 | + console.log(e) | ||
| 73 | + this[util.attr(e,'type')]=util.val(e)?1:0 | ||
| 74 | + }, | ||
| 75 | + checkoutInit(){ | ||
| 76 | + let params={ | ||
| 77 | + rid:this.options.rid, | ||
| 78 | + sid:this.options.sid, | ||
| 79 | + is_wine:this.is_wine, | ||
| 80 | + is_pack:this.is_pack | ||
| 130 | } | 81 | } |
| 82 | + App.Customer.InitOrder(params).then(res=>{ | ||
| 83 | + this.GetCheckout() | ||
| 84 | + }) | ||
| 85 | + }, | ||
| 86 | + setInvoice(e){ | ||
| 87 | + let invoice={ | ||
| 88 | + orderid:this.data.checkout.id, | ||
| 89 | + } | ||
| 90 | + Object.keys(e.detail).forEach(key=>{ | ||
| 91 | + invoice[key.toLowerCase()]=e.detail[key] | ||
| 92 | + }) | ||
| 93 | + console.log('setInvoice',invoice) | ||
| 94 | + App.Customer.SetInvoice(invoice).then(res=>{ | ||
| 95 | + util.toast('发票已提交','none') | ||
| 96 | + }) | ||
| 131 | }, | 97 | }, |
| 132 | }) | 98 | }) |
| @@ -3,6 +3,9 @@ | @@ -3,6 +3,9 @@ | ||
| 3 | "navigationBarBackgroundColor": "#fff", | 3 | "navigationBarBackgroundColor": "#fff", |
| 4 | "navigationBarTextStyle":"black", | 4 | "navigationBarTextStyle":"black", |
| 5 | "usingComponents": { | 5 | "usingComponents": { |
| 6 | - "nav":"/components/nav/nav" | 6 | + "nav":"/components/nav/nav", |
| 7 | + "showModal":"/components/tips/showModal/showModal", | ||
| 8 | + "invoice":"/components/userinfo/invoice", | ||
| 9 | + "jinduBar":"../components/jinduBar" | ||
| 7 | } | 10 | } |
| 8 | } | 11 | } |
| 1 | <!--pack-activity/pages/index.wxml--> | 1 | <!--pack-activity/pages/index.wxml--> |
| 2 | <nav hasHome>周到安排</nav> | 2 | <nav hasHome>周到安排</nav> |
| 3 | -<view class="pages" style="background-color: {{activity.element}}"> | ||
| 4 | - <view class="banner"> | ||
| 5 | - <image mode="widthFix" src="{{activity.bgurl}}" style="width: 100%"></image> | ||
| 6 | - <navigator url="/pack-activity/pages/rule?id={{activity.id}}" hover-class="navigator-hover"> | ||
| 7 | - <view class="guize">活动 规则</view> | ||
| 8 | - </navigator> | ||
| 9 | - <view class="nomoney" wx:if="{{activity.balance<=1000}}"></view> | ||
| 10 | - </view> | 3 | +<view class="pages"> |
| 11 | <view class="content"> | 4 | <view class="content"> |
| 12 | - <navigator url="/pack-activity/pages/money" hover-class="navigator-hover"> | ||
| 13 | - <view class="tips flex-lr"> | ||
| 14 | - <view>活动累计收入:{{count}}元</view> | ||
| 15 | - <view class="flex-rr"> | ||
| 16 | - 查看余额 | ||
| 17 | - <view class="more"></view> | ||
| 18 | - </view> | 5 | + <jinduBar checkout="{{checkout}}"></jinduBar> |
| 6 | + </view> | ||
| 7 | + <!--//买单相关(可选)--> | ||
| 8 | + <block wx:if="{{checkout.status<1}}"> | ||
| 9 | + <view class="content checkout"> | ||
| 10 | + <view class="title">买单相关(可选)</view> | ||
| 11 | + <view class="item flex-lr"> | ||
| 12 | + <view>剩余酒水饮料需要退</view> | ||
| 13 | + <switch color="#C0A369" bindchange="checkoutData" data-type="is_wine"/> | ||
| 14 | + </view> | ||
| 15 | + <view class="item flex-lr"> | ||
| 16 | + <view>菜品打包</view> | ||
| 17 | + <switch color="#C0A369" bindchange="checkoutData" data-type="is_pack"/> | ||
| 19 | </view> | 18 | </view> |
| 20 | - </navigator> | ||
| 21 | - <view class="list"> | ||
| 22 | - <view class="header flex-cc"> | ||
| 23 | - <view class="header-img lt"></view> | ||
| 24 | - <view class="header-txt">完成任务得红包</view> | ||
| 25 | - <view class="header-img gt"></view> | 19 | + </view> |
| 20 | + <view class="checkout-get" bindtap="checkoutInit">获取消费金额</view> | ||
| 21 | + </block> | ||
| 22 | + <block wx:elif="{{checkout.status==1}}"> | ||
| 23 | + <view class="content checkout" wx:if="{{checkout.is_pack==1 || checkout.is_wine==1}}"> | ||
| 24 | + <view class="title">已提交信息</view> | ||
| 25 | + <view class="item flex-lr" wx:if="{{checkout.is_wine==1}}"> | ||
| 26 | + <view>有剩余酒水饮料要退</view> | ||
| 26 | </view> | 27 | </view> |
| 27 | - <view class="item flex-lr" wx:for="{{activity.list}}" wx:key="list"> | ||
| 28 | - <image class="icon" src="{{item.icon_url}}" mode="aspectFit"></image> | ||
| 29 | - <view class="item-content"> | ||
| 30 | - <view class="item-title">{{item.title}}</view> | ||
| 31 | - <view class="item-desc">{{item.desc}}</view> | ||
| 32 | - </view> | ||
| 33 | - <view class="opt" bindtap="taskNextDo" data-index="{{index}}" wx:if="{{activity.balance>1000}}"> | ||
| 34 | - <view class="opt-button status{{item.status}}">{{['领取','去完成','已完成'][item.status]}}</view> | ||
| 35 | - <view class="opt-money">{{item.price}}元红包</view> | ||
| 36 | - </view> | 28 | + <view class="item flex-lr" wx:if="{{checkout.is_pack==1}}"> |
| 29 | + <view>菜品打包</view> | ||
| 37 | </view> | 30 | </view> |
| 38 | </view> | 31 | </view> |
| 39 | - <view class="share-but"> | ||
| 40 | - <button class="button-none" open-type="share">分享活动</button> | 32 | + <view class="content invoice"> |
| 33 | + <view class="title">提前开发票</view> | ||
| 34 | + <view class="item flex-lr" bindtap="setInvoice"> | ||
| 35 | + <view>发票</view> | ||
| 36 | + <invoice bindevent="setInvoice"> | ||
| 37 | + <view class="flex-rr invoice-right"> | ||
| 38 | + <view class="title {{checkout.invoice?'active':''}}">{{checkout.invoice.title||'提前提交发票抬头'}}</view> | ||
| 39 | + <view class="more"></view> | ||
| 40 | + </view> | ||
| 41 | + </invoice> | ||
| 42 | + </view> | ||
| 41 | </view> | 43 | </view> |
| 42 | - </view> | 44 | + <view class="checkout-get subscribe" bindtap="checkoutInit">商家反馈金额后提醒我</view> |
| 45 | + <view class="checkout-get tx-seller" bindtap="checkoutInit">催一下商家</view> | ||
| 46 | + </block> | ||
| 43 | </view> | 47 | </view> |
| 48 | +<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal> |
| 1 | /* pack-activity/pages/index.wxss */ | 1 | /* pack-activity/pages/index.wxss */ |
| 2 | -.pages{ | 2 | +page{ |
| 3 | + background-color: #F5F5F5; | ||
| 3 | } | 4 | } |
| 4 | -.banner{ | ||
| 5 | - width:100%; | ||
| 6 | - background:linear-gradient(202deg,rgba(213,45,182,1) 0%,rgba(240,72,102,1) 100%); | ||
| 7 | - position: relative; | 5 | +.pages{ |
| 6 | + padding: 204rpx 0 52rpx; | ||
| 7 | + background-size: 100% auto; | ||
| 8 | + background-repeat: no-repeat; | ||
| 9 | + background-image: url("http://qn.colorcun.com/checkout/images/3.png"); | ||
| 8 | } | 10 | } |
| 9 | .content{ | 11 | .content{ |
| 10 | - height: 1020rpx; | ||
| 11 | width: calc(100% - 40rpx); | 12 | width: calc(100% - 40rpx); |
| 12 | margin: 0 20rpx 0; | 13 | margin: 0 20rpx 0; |
| 13 | -} | ||
| 14 | -.tips{ | ||
| 15 | - width:100%; | ||
| 16 | - height:50rpx; | ||
| 17 | - background:rgba(53,53,53,0.3); | ||
| 18 | - border-radius:30rpx; | 14 | + position: relative; |
| 15 | + background-color: #fff; | ||
| 16 | + background:rgba(255,255,255,1); | ||
| 17 | + border-radius:10px; | ||
| 18 | + padding: 0 40rpx; | ||
| 19 | box-sizing: border-box; | 19 | box-sizing: border-box; |
| 20 | - padding: 0 28rpx 0 40rpx; | ||
| 21 | - | ||
| 22 | - font-size:24rpx; | ||
| 23 | - font-weight:500; | ||
| 24 | - color:rgba(255,255,255,1); | ||
| 25 | - line-height:50rpx; | ||
| 26 | } | 20 | } |
| 27 | -.more{ | ||
| 28 | - background-image: url("http://qn.colorcun.com/activity/images/more.png"); | ||
| 29 | - margin-left: 22rpx; | 21 | +.checkout,.invoice{ |
| 22 | + margin-top: 10rpx; | ||
| 30 | } | 23 | } |
| 31 | -.guize{ | ||
| 32 | - width:40rpx; | ||
| 33 | - height:120rpx; | ||
| 34 | - background:rgba(53,53,53,0.29); | ||
| 35 | - border-radius:10rpx 0rpx 0rpx 10rpx; | ||
| 36 | - padding: 2rpx 10rpx 0; | 24 | +.title{ |
| 25 | + height: 80rpx; | ||
| 37 | box-sizing: border-box; | 26 | box-sizing: border-box; |
| 38 | - | ||
| 39 | - font-size:20rpx; | 27 | + border-bottom: 1rpx solid #F5F5F5; |
| 28 | + line-height: 80rpx; | ||
| 29 | + font-size:28rpx; | ||
| 40 | font-weight:500; | 30 | font-weight:500; |
| 41 | - color:rgba(255,255,255,1); | ||
| 42 | - line-height:28rpx; | ||
| 43 | - position: absolute; | ||
| 44 | - top:20rpx; | ||
| 45 | - right:0; | ||
| 46 | -} | ||
| 47 | -.nomoney{ | ||
| 48 | - background-image: url("http://qn.colorcun.com/activity/images/nomoney.png"); | ||
| 49 | - width:176rpx; | ||
| 50 | - height:144rpx; | ||
| 51 | - right:24rpx; | ||
| 52 | - bottom: 42rpx; | ||
| 53 | - position: absolute; | ||
| 54 | - background-size: 100% 100%; | 31 | + color:rgba(153,153,153,1); |
| 55 | } | 32 | } |
| 56 | -.list{ | ||
| 57 | - background:rgba(255,255,255,1); | ||
| 58 | - box-shadow:4rpx 4rpx 6rpx 4rpx rgba(218,61,69,1); | ||
| 59 | - border-radius:20rpx; | ||
| 60 | - margin-top: 20rpx; | 33 | +.item{ |
| 34 | + height: 138rpx; | ||
| 61 | box-sizing: border-box; | 35 | box-sizing: border-box; |
| 62 | - padding-top: 60rpx; | ||
| 63 | - padding-bottom: 60rpx; | ||
| 64 | -} | ||
| 65 | - | ||
| 66 | -.header{ | ||
| 67 | - margin-bottom: 60rpx; | ||
| 68 | -} | ||
| 69 | -.header .header-txt{ | ||
| 70 | - width:236rpx; | ||
| 71 | - height:44rpx; | 36 | + border-bottom: 1rpx solid #F5F5F5; |
| 37 | + line-height: 138rpx; | ||
| 72 | font-size:32rpx; | 38 | font-size:32rpx; |
| 73 | font-weight:600; | 39 | font-weight:600; |
| 74 | - color:rgba(204,17,39,1); | ||
| 75 | - line-height:44rpx; | ||
| 76 | - margin: 0 20rpx; | 40 | + color:rgba(53,53,53,1); |
| 77 | } | 41 | } |
| 78 | -.header-img{ | ||
| 79 | - background-size: 100% 100%; | ||
| 80 | - width: 70rpx; | ||
| 81 | - height: 16rpx; | 42 | +.item:last-child{ |
| 43 | + border-bottom-width: 0; | ||
| 82 | } | 44 | } |
| 83 | -.header-img.gt{ | ||
| 84 | - background-image: url("http://qn.colorcun.com/activity/images/lt.png"); | 45 | +.checkout-get{ |
| 46 | + position: fixed; | ||
| 47 | + bottom: 80rpx; | ||
| 48 | + left: 38rpx; | ||
| 49 | + width: calc(100% - 72rpx); | ||
| 50 | + height: 80rpx; | ||
| 51 | + line-height: 80rpx; | ||
| 52 | + font-size:34rpx; | ||
| 53 | + font-weight:400; | ||
| 54 | + color:rgba(254,254,254,1); | ||
| 55 | + background:rgba(36,35,32,1); | ||
| 56 | + text-align: center; | ||
| 85 | } | 57 | } |
| 86 | -.header-img.lt{ | ||
| 87 | - background-image: url("http://qn.colorcun.com/activity/images/gt.png"); | 58 | +.checkout-get.subscribe{ |
| 59 | + bottom: 178rpx; | ||
| 88 | } | 60 | } |
| 89 | -.list .item{ | ||
| 90 | - margin-bottom: 60rpx; | ||
| 91 | - height: 94rpx; | ||
| 92 | - padding: 0 20rpx; | 61 | +.checkout-get.tx-seller{ |
| 62 | + background: none; | ||
| 63 | + border:2rpx solid rgba(38,38,40,1); | ||
| 93 | box-sizing: border-box; | 64 | box-sizing: border-box; |
| 65 | + color:rgba(38,38,40,1); | ||
| 66 | + bottom: 80rpx; | ||
| 94 | } | 67 | } |
| 95 | -.list .item:last-child{ | ||
| 96 | - margin-bottom: 0; | ||
| 97 | -} | ||
| 98 | -.item .icon{ | ||
| 99 | - width: 94rpx; | ||
| 100 | - height: 94rpx; | ||
| 101 | - min-width: 94rpx; | ||
| 102 | -} | ||
| 103 | -.item-content{ | ||
| 104 | - margin-left: 10rpx; | ||
| 105 | - width: 100%; | ||
| 106 | -} | ||
| 107 | -.opt{ | ||
| 108 | - width: 130rpx; | ||
| 109 | - min-width: 130rpx; | ||
| 110 | -} | ||
| 111 | -.item-title{ | ||
| 112 | - height:44rpx; | 68 | +.invoice-right .title{ |
| 113 | font-size:32rpx; | 69 | font-size:32rpx; |
| 114 | - font-weight:600; | ||
| 115 | - color:rgba(53,53,53,1); | ||
| 116 | - line-height:44rpx; | ||
| 117 | -} | ||
| 118 | -.item-desc{ | ||
| 119 | - height:34rpx; | ||
| 120 | - font-size:24rpx; | ||
| 121 | font-weight:500; | 70 | font-weight:500; |
| 122 | color:rgba(153,153,153,1); | 71 | color:rgba(153,153,153,1); |
| 123 | - line-height:34rpx; | ||
| 124 | - margin-top: 10rpx; | 72 | + margin-right: 20rpx; |
| 125 | } | 73 | } |
| 126 | -.opt-money{ | ||
| 127 | - height:28rpx; | ||
| 128 | - font-size:20rpx; | ||
| 129 | - font-weight:600; | ||
| 130 | - color:rgba(230,34,57,1); | ||
| 131 | - line-height:28rpx; | ||
| 132 | - margin-top: 10rpx; | ||
| 133 | -} | ||
| 134 | -.opt-button{ | ||
| 135 | - box-sizing: border-box; | ||
| 136 | - width:130rpx; | ||
| 137 | - height:50rpx; | ||
| 138 | - border-radius:25rpx; | ||
| 139 | - border:2rpx solid rgba(235,41,65,1); | ||
| 140 | - | ||
| 141 | - font-size:24rpx; | ||
| 142 | - font-weight:600; | ||
| 143 | - color:rgba(230,34,57,1); | ||
| 144 | - line-height:50rpx; | ||
| 145 | - text-align: center; | ||
| 146 | -} | ||
| 147 | -.opt-button.status0,.opt-button.status1{ | ||
| 148 | - background:linear-gradient(180deg,rgba(225,27,49,1) 0%,rgba(243,53,78,1) 100%); | ||
| 149 | - box-shadow:0rpx 2rpx 4rpx 0rpx rgba(232,37,60,1),2rpx 0rpx 6rpx 0rpx rgba(255,172,171,1); | ||
| 150 | - color:rgba(255,227,192,1); | ||
| 151 | -} | ||
| 152 | -.share-but{ | ||
| 153 | - width:400rpx; | ||
| 154 | - height:80rpx; | ||
| 155 | - background:linear-gradient(180deg,rgba(252,190,38,1) 0%,rgba(255,233,128,1) 100%); | ||
| 156 | - box-shadow:0rpx 4rpx 8rpx 0rpx rgba(182,43,68,1); | ||
| 157 | - border-radius:40rpx; | ||
| 158 | - margin-top: 40rpx; | ||
| 159 | - | ||
| 160 | - font-size:32rpx; | ||
| 161 | - font-weight:600; | ||
| 162 | - color:rgba(230,34,57,1); | ||
| 163 | - line-height:80rpx; | ||
| 164 | - text-align: center; | ||
| 165 | - margin-left: calc(50% - 200rpx); | ||
| 166 | -} | ||
| 167 | -.share-but .button-none{ | ||
| 168 | - height: 80rpx; | ||
| 169 | - line-height:80rpx; | 74 | +.invoice-right .title.active{ |
| 75 | + color:rgba(53,53,53,1); | ||
| 170 | } | 76 | } |
| @@ -323,7 +323,10 @@ Page({ | @@ -323,7 +323,10 @@ Page({ | ||
| 323 | }).show(); | 323 | }).show(); |
| 324 | }else{ | 324 | }else{ |
| 325 | wx.navigateTo({ | 325 | wx.navigateTo({ |
| 326 | - url:'/pack-checkout/pages/index?rid='+this.data.detail.id | 326 | + url:util.http_build_query({ |
| 327 | + rid:this.data.detail.id, | ||
| 328 | + sid:this.data.detail.sid | ||
| 329 | + },'/pack-checkout/pages/index') | ||
| 327 | }) | 330 | }) |
| 328 | } | 331 | } |
| 329 | }, | 332 | }, |
| @@ -178,6 +178,14 @@ | @@ -178,6 +178,14 @@ | ||
| 178 | width: 32rpx; | 178 | width: 32rpx; |
| 179 | height: 32rpx; | 179 | height: 32rpx; |
| 180 | margin-right: 20rpx; | 180 | margin-right: 20rpx; |
| 181 | - background-color: #1AAD19; | ||
| 182 | background-size: 100% 100%; | 181 | background-size: 100% 100%; |
| 182 | +} | ||
| 183 | +.checkout-icon-1{ | ||
| 184 | + background-image: url("http://qn.colorcun.com/checkout/images/2.png"); | ||
| 185 | +} | ||
| 186 | +.checkout-icon-2{ | ||
| 187 | + background-image: url("http://qn.colorcun.com/checkout/images/1.png"); | ||
| 188 | +} | ||
| 189 | +.checkout-icon-3{ | ||
| 190 | + background-image: url("http://qn.colorcun.com/checkout/images/1.png"); | ||
| 183 | } | 191 | } |
| @@ -483,7 +483,7 @@ | @@ -483,7 +483,7 @@ | ||
| 483 | "id": 57, | 483 | "id": 57, |
| 484 | "name": "pages/customer/detail_owner", | 484 | "name": "pages/customer/detail_owner", |
| 485 | "pathName": "pages/customer/detail_owner", | 485 | "pathName": "pages/customer/detail_owner", |
| 486 | - "query": "id=60409&firstShowMsg=", | 486 | + "query": "id=60472&firstShowMsg=", |
| 487 | "scene": null | 487 | "scene": null |
| 488 | }, | 488 | }, |
| 489 | { | 489 | { |
| @@ -639,6 +639,13 @@ | @@ -639,6 +639,13 @@ | ||
| 639 | "pathName": "pack-activity/pages/rule", | 639 | "pathName": "pack-activity/pages/rule", |
| 640 | "query": "id=1", | 640 | "query": "id=1", |
| 641 | "scene": null | 641 | "scene": null |
| 642 | + }, | ||
| 643 | + { | ||
| 644 | + "id": 80, | ||
| 645 | + "name": "pack-checkout/pages/index", | ||
| 646 | + "pathName": "pack-checkout/pages/index", | ||
| 647 | + "query": "rid=60472&sid=80", | ||
| 648 | + "scene": null | ||
| 642 | } | 649 | } |
| 643 | ] | 650 | ] |
| 644 | } | 651 | } |
| @@ -455,4 +455,12 @@ export default { | @@ -455,4 +455,12 @@ export default { | ||
| 455 | }, | 455 | }, |
| 456 | //获取账单详情 | 456 | //获取账单详情 |
| 457 | 'App.Customer.GetOrderInfo':null, | 457 | 'App.Customer.GetOrderInfo':null, |
| 458 | + //初始化账单 | ||
| 459 | + 'App.Customer.InitOrder':{ | ||
| 460 | + openid:'openid', | ||
| 461 | + }, | ||
| 462 | + //用户发票关联账单、同时生成个人发票记录 | ||
| 463 | + 'App.Customer.SetInvoice':{ | ||
| 464 | + openid:'openid', | ||
| 465 | + }, | ||
| 458 | } | 466 | } |
-
Please register or login to post a comment