Commit d9a3d4622ebf8b6be234894da870697f7f40fa05

Authored by vking
1 parent 9a9baec4

taocan

@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 </view> 19 </view>
20 <view class="flex align-center"> 20 <view class="flex align-center">
21 <view class="bg-white label txt-20-h">套餐数量</view> 21 <view class="bg-white label txt-20-h">套餐数量</view>
22 - <view class="txt-28-h margin-left-lg">1</view> 22 + <view class="txt-28-h margin-left-lg">1份</view>
23 </view> 23 </view>
24 <view class="flex align-center"> 24 <view class="flex align-center">
25 <view class="bg-white label txt-20-h">有效期限</view> 25 <view class="bg-white label txt-20-h">有效期限</view>
@@ -126,13 +126,16 @@ Page({ @@ -126,13 +126,16 @@ Page({
126 }) 126 })
127 } 127 }
128 }, 128 },
  129 + createSaleIng:false,
129 createSale(){ 130 createSale(){
  131 + this.createSaleIng=true
130 let pack=this.data.packs[this.activityId] 132 let pack=this.data.packs[this.activityId]
131 App.PayOnline.JsApiPay({ 133 App.PayOnline.JsApiPay({
132 pay_type:1, 134 pay_type:1,
133 fid:this.activityId, 135 fid:this.activityId,
134 sid:pack.sid, 136 sid:pack.sid,
135 }).then(res=>{ 137 }).then(res=>{
  138 + this.createSaleIng=false
136 if(res.ret==200){ 139 if(res.ret==200){
137 let order_id=res.data.order_id 140 let order_id=res.data.order_id
138 res.data.timeStamp+="" 141 res.data.timeStamp+=""
@@ -150,6 +153,8 @@ Page({ @@ -150,6 +153,8 @@ Page({
150 }else{ 153 }else{
151 util.toast(res.msg,'none') 154 util.toast(res.msg,'none')
152 } 155 }
  156 + }).catch(res=>{
  157 + this.createSaleIng=false
153 }) 158 })
154 }, 159 },
155 }) 160 })
@@ -77,11 +77,11 @@ @@ -77,11 +77,11 @@
77 <view class="text-gray txt-28-h">下单时间</view> 77 <view class="text-gray txt-28-h">下单时间</view>
78 <view class="txt-28-h">{{util.unixtoTime(order_info.pay_time,'YYYY-MM-DD HH:II:SS')}}</view> 78 <view class="txt-28-h">{{util.unixtoTime(order_info.pay_time,'YYYY-MM-DD HH:II:SS')}}</view>
79 </view> 79 </view>
80 - <view class="view padding-bottom padding-lr-lg flex justify-between"> 80 + <view class="view padding-bottom padding-lr-lg flex justify-between" wx:if="{{order_info.status==3}}">
81 <view class="text-gray txt-28-h">使用时间</view> 81 <view class="text-gray txt-28-h">使用时间</view>
82 <view class="txt-28-h">{{util.unixtoTime(order_info.use_time,'YYYY-MM-DD HH:II:SS')}}</view> 82 <view class="txt-28-h">{{util.unixtoTime(order_info.use_time,'YYYY-MM-DD HH:II:SS')}}</view>
83 </view> 83 </view>
84 - <view class="view padding-bottom padding-lr-lg flex justify-between"> 84 + <view class="view padding-bottom padding-lr-lg flex justify-between" wx:if="{{order_info.status==5}}">
85 <view class="text-gray txt-28-h">退款时间</view> 85 <view class="text-gray txt-28-h">退款时间</view>
86 <view class="txt-28-h">{{util.unixtoTime(order_info.refund_time,'YYYY-MM-DD HH:II:SS')}}</view> 86 <view class="txt-28-h">{{util.unixtoTime(order_info.refund_time,'YYYY-MM-DD HH:II:SS')}}</view>
87 </view> 87 </view>
@@ -730,7 +730,7 @@ @@ -730,7 +730,7 @@
730 { 730 {
731 "name": "pages/taocan/order", 731 "name": "pages/taocan/order",
732 "pathName": "pages/taocan/order", 732 "pathName": "pages/taocan/order",
733 - "query": "id=0000000011", 733 + "query": "id=0000000039",
734 "scene": null 734 "scene": null
735 }, 735 },
736 { 736 {