xt / xcx-book · Commits

Go to a project

Commit 0fc19042140cd770069eaf0c427eef4ec7c7afed

Authored by vking
1 parent 67742b80
build: skipped

taocan ui fix

Inline Side-by-side
Showing 2 changed files with 107 additions and 90 deletions
@@ -10,6 +10,7 @@ Page({ @@ -10,6 +10,7 @@ Page({
10 current:0, 10 current:0,
11 activityId:'', 11 activityId:'',
12 packs:{}, 12 packs:{},
  13 + hasNoSets:false,//没有任何套餐
13 }, 14 },
14 activityId:'', 15 activityId:'',
15 /** 16 /**
@@ -32,16 +33,22 @@ Page({ @@ -32,16 +33,22 @@ Page({
32 while(Object.keys(packs).length<3){ 33 while(Object.keys(packs).length<3){
33 packs[Math.random()]={} 34 packs[Math.random()]={}
34 } 35 }
35 - if(!packs[this.activityId]){  
36 - util.toast('套餐已下架','none')  
37 - this.activityId=res.data[0].id 36 + try{
  37 + if(!packs[this.activityId]){
  38 + util.toast('套餐已下架','none')
  39 + this.activityId=res.data[0].id
  40 + }
  41 + this.setData({
  42 + packs:packs,
  43 + activityId:this.activityId,
  44 + current:this.getCurrent(this.activityId,packs)
  45 + })
  46 + this.getActivityDetail()
  47 + }catch (e){
  48 + this.setData({
  49 + hasNoSets:true,//没有任何套餐
  50 + });
38 } 51 }
39 - this.setData({  
40 - packs:packs,  
41 - activityId:this.activityId,  
42 - current:this.getCurrent(this.activityId,packs)  
43 - })  
44 - this.getActivityDetail()  
45 }) 52 })
46 }, 53 },
47 54
@@ -19,99 +19,109 @@ @@ -19,99 +19,109 @@
19 </block> 19 </block>
20 </swiper> 20 </swiper>
21 --> 21 -->
22 -<scroll-view class="view margin-left-lg header text-black"  
23 - scroll-x="true" bindscroll="scroll" scroll-into-view="PID{{activityId}}"  
24 - style="width: 100%;white-space: nowrap;height:80rpx;padding-top: 16rpx;">  
25 - <block wx:for="{{packs}}" wx:key="*this">  
26 - <view id="PID{{item.id}}"  
27 - bindtap="touchTab" data-id="{{item.id}}" data-index="{{index}}"  
28 - class="view swiper-item {{activityId==item.id?'active':''}} flex align-center">  
29 - <view class="txt-32-h swiper-item-txt">  
30 - {{item.nameSub}} 22 +<block wx:if="{{!hasNoSets}}">
  23 + <scroll-view class="view margin-left-lg header text-black"
  24 + scroll-x="true" bindscroll="scroll" scroll-into-view="PID{{activityId}}"
  25 + style="width: 100%;white-space: nowrap;height:80rpx;padding-top: 16rpx;">
  26 + <block wx:for="{{packs}}" wx:key="*this">
  27 + <view id="PID{{item.id}}"
  28 + bindtap="touchTab" data-id="{{item.id}}" data-index="{{index}}"
  29 + class="view swiper-item {{activityId==item.id?'active':''}} flex align-center">
  30 + <view class="txt-32-h swiper-item-txt">
  31 + {{item.nameSub}}
  32 + </view>
31 </view> 33 </view>
32 - </view>  
33 - </block>  
34 -</scroll-view>  
35 -<view class="view" style="padding-bottom: 150rpx;padding-top: 80rpx;">  
36 - <view class="view box margin-lr margin-top-lg margin-bottom-sm padding">  
37 - <view class="view txt-40-h text-bold">{{packs[activityId].name}}</view>  
38 - <view class="view flex align-end">  
39 - <view class="text-orange txt-28-h" style="margin-bottom: 4rpx;">¥</view>  
40 - <view class="text-orange txt-44-h margin-right-sm text-bold">{{packs[activityId].sale_price}}</view>  
41 - <view class="huaxian flex align-end">  
42 - <view class="txt-20-h" style="margin-bottom: 8rpx;">¥</view>  
43 - <view class="txt-28-h" style="margin-bottom: 4rpx;">{{packs[activityId].market_price}}</view> 34 + </block>
  35 + </scroll-view>
  36 + <view class="view" style="padding-bottom: 150rpx;padding-top: 80rpx;">
  37 + <view class="view box margin-lr margin-top-lg margin-bottom-sm padding">
  38 + <view class="view txt-40-h text-bold">{{packs[activityId].name}}</view>
  39 + <view class="view flex align-end">
  40 + <view class="text-orange txt-28-h" style="margin-bottom: 4rpx;">¥</view>
  41 + <view class="text-orange txt-44-h margin-right-sm text-bold">{{packs[activityId].sale_price}}</view>
  42 + <view class="huaxian flex align-end">
  43 + <view class="txt-20-h" style="margin-bottom: 8rpx;">¥</view>
  44 + <view class="txt-28-h" style="margin-bottom: 4rpx;">{{packs[activityId].market_price}}</view>
  45 + </view>
  46 + <view class="view flex text-orange align-end margin-left-sm" wx:if="{{packs[activityId].discount>0}}" >
  47 + <view class="view tag" style="margin-bottom: 16rpx;"></view>
  48 + <view class="view margin-left-xs txt-24-h" style="margin-bottom: 10rpx;">{{packs[activityId].discount*10}}折</view>
  49 + </view>
44 </view> 50 </view>
45 - <view class="view flex text-orange align-end margin-left-sm" wx:if="{{packs[activityId].discount>0}}" >  
46 - <view class="view tag" style="margin-bottom: 16rpx;"></view>  
47 - <view class="view margin-left-xs txt-24-h" style="margin-bottom: 10rpx;">{{packs[activityId].discount*10}}折</view> 51 + <view class="view flex align-center txt-28-h margin-bottom labels" style="margin-top: 10rpx;">
  52 + <view class="view margin-right flex align-center" wx:if="{{packs[activityId]['包间可用']}}">
  53 + <view class="view icon icon1"></view>
  54 + <view class="view txt-28-h bg-white">包间可用</view>
  55 + </view>
  56 + <view class="view margin-right flex align-center" wx:if="{{packs[activityId]['免预约']}}">
  57 + <view class="view icon icon2"></view>
  58 + <view class="view txt-28-h bg-white">免预约</view>
  59 + </view>
  60 + <view class="view margin-right flex align-center" wx:if="{{packs[activityId]['随时退']}}">
  61 + <view class="view icon icon3"></view>
  62 + <view class="view txt-28-h bg-white">随时退</view>
  63 + </view>
48 </view> 64 </view>
  65 + <image src="{{packs[activityId].detail_url}}" style="width:100%;border-radius: 10rpx;" mode="widthFix"></image>
49 </view> 66 </view>
50 - <view class="view flex align-center txt-28-h margin-bottom labels" style="margin-top: 10rpx;">  
51 - <view class="view margin-right flex align-center" wx:if="{{packs[activityId]['包间可用']}}">  
52 - <view class="view icon icon1"></view>  
53 - <view class="view txt-28-h bg-white">包间可用</view> 67 + <view class="view box margin-lr margin-top-sm margin-bottom-sm">
  68 + <view class="txt-30-h padding solid-bottom text-bold">购买须知</view>
  69 + <view class="view padding block">
  70 + <view class="flex align-center margin-bottom-sm">
  71 + <view class="dot"></view>
  72 + <view class="txt-30-h text-bold">有效期</view>
  73 + </view>
  74 + <view class="text-df">{{util.unixtoTime(packs[activityId].eff_time_start,'YYYY.MM.DD')}}-{{util.unixtoTime(packs[activityId].eff_time_end,'YYYY.MM.DD HH:II')}}</view>
54 </view> 75 </view>
55 - <view class="view margin-right flex align-center" wx:if="{{packs[activityId]['免预约']}}">  
56 - <view class="view icon icon2"></view>  
57 - <view class="view txt-28-h bg-white">免预约</view> 76 + <view class="view padding block">
  77 + <view class="flex align-center margin-bottom-sm">
  78 + <view class="dot"></view>
  79 + <view class="txt-30-h text-bold">使用时间</view>
  80 + </view>
  81 + <view class="text-df">{{packs[activityId].use_time}}</view>
58 </view> 82 </view>
59 - <view class="view margin-right flex align-center" wx:if="{{packs[activityId]['随时退']}}">  
60 - <view class="view icon icon3"></view>  
61 - <view class="view txt-28-h bg-white">随时退</view> 83 + <view class="view padding block padding-bottom-sm">
  84 + <view class="flex align-center margin-bottom-sm">
  85 + <view class="dot"></view>
  86 + <view class="txt-30-h text-bold">使用规则</view>
  87 + </view>
  88 + <view class="text-df" wx:if="{{hasShowRule}}">
  89 + <text style="line-height: 40rpx;">{{packs[activityId].use_notice}}</text>
  90 + </view>
  91 + <view class="flex justify-center align-center rule margin-top-sm margin-bottom-sm" bindtap="toggleRule">
  92 + <view class="txt-28-h">{{hasShowRule?'收起':'展开更多'}}</view>
  93 + <view class="view icon {{hasShowRule?'show':''}}"></view>
  94 + </view>
62 </view> 95 </view>
63 </view> 96 </view>
64 - <image src="{{packs[activityId].detail_url}}" style="width:100%;border-radius: 10rpx;" mode="widthFix"></image>  
65 </view> 97 </view>
66 - <view class="view box margin-lr margin-top-sm margin-bottom-sm">  
67 - <view class="txt-30-h padding solid-bottom text-bold">购买须知</view>  
68 - <view class="view padding block">  
69 - <view class="flex align-center margin-bottom-sm">  
70 - <view class="dot"></view>  
71 - <view class="txt-30-h text-bold">有效期</view> 98 + <view class="view bottom flex align-center justify-between padding-right">
  99 + <view class="view flex justify-center align-center flex-treble ">
  100 + <view class="view flex align-end">
  101 + <view class="text-orange txt-40-h" style="margin-bottom: 4rpx;">¥</view>
  102 + <view class="text-orange txt-52-h margin-right-sm text-bold">{{packs[activityId].sale_price}}</view>
72 </view> 103 </view>
73 - <view class="text-df">{{util.unixtoTime(packs[activityId].eff_time_start,'YYYY.MM.DD')}}-{{util.unixtoTime(packs[activityId].eff_time_end,'YYYY.MM.DD HH:II')}}</view>  
74 - </view>  
75 - <view class="view padding block">  
76 - <view class="flex align-center margin-bottom-sm">  
77 - <view class="dot"></view>  
78 - <view class="txt-30-h text-bold">使用时间</view> 104 + <view class="view flex flex-direction justify-center align-start">
  105 + <view class="view flex text-orange align-center" wx:if="{{packs[activityId].discount>0}}">
  106 + <view class="view tag"></view>
  107 + <view class="view margin-left-xs txt-24-h">{{packs[activityId].discount*10}}折</view>
  108 + </view>
  109 + <view class="huaxian flex align-end">
  110 + <view class="txt-24-h" style="margin-bottom: 2rpx;">¥</view>
  111 + <view class="txt-32-h">{{packs[activityId].market_price}}</view>
  112 + </view>
79 </view> 113 </view>
80 - <view class="text-df">{{packs[activityId].use_time}}</view>  
81 </view> 114 </view>
82 - <view class="view padding block padding-bottom-sm">  
83 - <view class="flex align-center margin-bottom-sm">  
84 - <view class="dot"></view>  
85 - <view class="txt-30-h text-bold">使用规则</view>  
86 - </view>  
87 - <view class="text-df" wx:if="{{hasShowRule}}">  
88 - <text style="line-height: 40rpx;">{{packs[activityId].use_notice}}</text>  
89 - </view>  
90 - <view class="flex justify-center align-center rule margin-top-sm margin-bottom-sm" bindtap="toggleRule">  
91 - <view class="txt-28-h">{{hasShowRule?'收起':'展开更多'}}</view>  
92 - <view class="view icon {{hasShowRule?'show':''}}"></view>  
93 - </view> 115 + <view class="flex justify-end" bindtap="createSale">
  116 + <view class="buyButton txt-36-h text-bold flex align-center justify-center bg-blue-blue">立即抢购</view>
94 </view> 117 </view>
95 </view> 118 </view>
  119 +</block>
  120 +<view wx:else=""
  121 + style="padding-top: 172rpx;"
  122 + class="flex flex-direction justify-start align-center">
  123 + <image src="http://nosqn.colorcun.com/taocan/1%20%2827%29.png"
  124 + style="width: 520rpx;height: 348rpx;"></image>
  125 + <view class="txt-28-h margin-top-lg">该套餐过期啦</view>
96 </view> 126 </view>
97 -<view class="view bottom flex align-center justify-between padding-right">  
98 - <view class="view flex justify-center align-center flex-treble ">  
99 - <view class="view flex align-end">  
100 - <view class="text-orange txt-40-h" style="margin-bottom: 4rpx;">¥</view>  
101 - <view class="text-orange txt-52-h margin-right-sm text-bold">{{packs[activityId].sale_price}}</view>  
102 - </view>  
103 - <view class="view flex flex-direction justify-center align-start">  
104 - <view class="view flex text-orange align-center" wx:if="{{packs[activityId].discount>0}}">  
105 - <view class="view tag"></view>  
106 - <view class="view margin-left-xs txt-24-h">{{packs[activityId].discount*10}}折</view>  
107 - </view>  
108 - <view class="huaxian flex align-end">  
109 - <view class="txt-24-h" style="margin-bottom: 2rpx;">¥</view>  
110 - <view class="txt-32-h">{{packs[activityId].market_price}}</view>  
111 - </view>  
112 - </view>  
113 - </view>  
114 - <view class="flex justify-end" bindtap="createSale">  
115 - <view class="buyButton txt-36-h text-bold flex align-center justify-center bg-blue-blue">立即抢购</view>  
116 - </view>  
117 -</view> 127 +