xt / xcx-book · Commits

Go to a project

Commit e81e96e9f9ed9f9cdecf27e3f4aa5a56ac658b98

Authored by vking
1 parent a47e844e
build: skipped

taocan ui fix

Inline Side-by-side
Showing 9 changed files with 28 additions and 22 deletions
<!--components/2.0/taocan/lists.wxml-->
<block wx:if="{{lists.length>0}}">
<view class="view padding-lg bg-white padding-bottom-sm">
<view class="view padding-lg bg-white padding-bottom-sm text-black">
<view class="view text-bold text-xxl margin-bottom">超值套餐</view>
<block wx:for="{{lists}}" wx:key="lists">
<card detail="{{item}}" wx:if="{{index<rowLimit}}"></card>
... ...
... ... @@ -4,7 +4,7 @@
<view class="header view flex align-center" bindtap="clickSeller">
<view class="view avatar margin-right-sm" style="background-image: url('{{order_info.seller_image}}?imageView2/2/w/320')"></view>
<view class="flex-treble">
<view class="txt-32-h text-cut" style="margin-bottom: 2rpx;">{{order_info.sellername}}</view>
<view class="txt-32-h text-cut text-bold" style="margin-bottom: 2rpx;">{{order_info.sellername}}</view>
<view class="txt-24-h text-gray text-cut">{{order_info.real_address||order_info.map_address}}</view>
</view>
<view class="view txt-28-h {{order_info.status==2?'text-blue':'bg-white'}}" wx:if="{{hasTopStatus}}">{{order_info.status_tips.status}}</view>
... ... @@ -14,20 +14,20 @@
<view class="thumb margin-right-lg" style="background-image: url('{{foods_info.main_url}}?imageView2/2/w/320')"></view>
<view class="flex flex-direction justify-between">
<view class="flex align-center">
<view class="bg-white label txt-20-h">套餐名称</view>
<view class="txt-28-h margin-left-lg">{{foods_info.name}}</view>
<view class="view bg-white label txt-20-h flex align-center justify-center">套餐名称</view>
<view class="view txt-28-h margin-left-lg">{{foods_info.name}}</view>
</view>
<view class="flex align-center">
<view class="bg-white label txt-20-h">套餐数量</view>
<view class="txt-28-h margin-left-lg">1份</view>
<view class="view bg-white label txt-20-h flex align-center justify-center">套餐数量</view>
<view class="view txt-28-h margin-left-lg">1份</view>
</view>
<view class="flex align-center" wx:if="{{order_info.status==2}}">
<view class="bg-white label txt-20-h">有效期限</view>
<view class="txt-28-h margin-left-lg">{{util.unixtoTime(foods_info.eff_time_end,'YYYY-MM-DD')}}</view>
<view class="view bg-white label txt-20-h flex align-center justify-center">有效期限</view>
<view class="view txt-28-h margin-left-lg">{{util.unixtoTime(foods_info.eff_time_end,'YYYY-MM-DD')}}</view>
</view>
<view class="flex align-center">
<view class="bg-white label txt-20-h">套餐价格</view>
<view class="txt-28-h margin-left-lg">¥{{foods_info.sale_price}}</view>
<view class="view bg-white label txt-20-h flex align-center justify-center">套餐价格</view>
<view class="view txt-28-h margin-left-lg">¥{{foods_info.sale_price}}</view>
</view>
</view>
</view>
... ...
... ... @@ -12,8 +12,8 @@
border-radius: 50%;
}
.phone{
width: 28rpx;
height: 35rpx;
width: 40rpx;
height: 40rpx;
background-image: url("http://nosqn.colorcun.com/taocan/1%20%2810%29.png");
}
.thumb{
... ...
... ... @@ -19,7 +19,7 @@
height: 50rpx;
font-size: 36rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
font-weight: bold;
color: #333333;
line-height: 50rpx;
}
... ... @@ -56,6 +56,7 @@
color:#42A5FF;
background-color: #E6F3FF;
border-color: #E6F3FF;
font-weight: bold;
}
.empry{
... ...
... ... @@ -203,7 +203,7 @@
</view>
<view class="reserve reserve-click flex-vc">
<formids class="flex-vc" bindclick="reserveEvent" id="reserve-button">
<view class="text">订包间</view>
<view class="text Semibold">订包间</view>
</formids>
</view>
... ...
... ... @@ -3,7 +3,7 @@
<nav hasHome>套餐详情</nav>
<swiper
display-multiple-items="3"
class="view margin-left-lg header"
class="view margin-left-lg header text-black"
bindchange="swiperChange"
current="{{current}}"
style="height: 80rpx;">
... ... @@ -11,13 +11,13 @@
<swiper-item
bindtap="touchTab" data-id="{{item.id}}" data-index="{{index}}"
class="swiper-item {{activityId==item.id?'active':''}} flex align-center">
<view class="txt-28-h text-cut" style="width: 220rpx;height: 50rpx;">
<view class="txt-32-h text-cut" style="width: 220rpx;height: 56rpx;">
<text class="swiper-item-txt">{{item.name}}</text>
</view>
</swiper-item>
</block>
</swiper>
<view class="view" style="padding-bottom: 150rpx;padding-top: 80rpx;">
<view class="view" style="padding-bottom: 150rpx;padding-top: 70rpx;">
<view class="view box margin-lr margin-top-lg margin-bottom-sm padding">
<view class="view txt-40-h text-bold">{{packs[activityId].name}}</view>
<view class="view flex align-end">
... ... @@ -49,7 +49,7 @@
<image src="{{packs[activityId].detail_url}}" style="width:100%;border-radius: 10rpx;" mode="widthFix"></image>
</view>
<view class="view box margin-lr margin-top-sm margin-bottom-sm">
<view class="txt-30-h padding solid-bottom">购买须知</view>
<view class="txt-30-h padding solid-bottom text-bold">购买须知</view>
<view class="view padding block">
<view class="flex align-center margin-bottom-sm">
<view class="dot"></view>
... ...
... ... @@ -25,6 +25,7 @@
}
.huaxian{
position: relative;
color:#cccccc;
}
.huaxian:after{
position: absolute;
... ...
... ... @@ -4,17 +4,20 @@
<nav backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
<view class="view padding-lr padding-bottom-lg" style="position: relative">
<view class="text-white txt-40-h text-bold margin-top-sm">{{order_tips.status}}</view>
<view class="text-white txt-28-h text-bold margin-bottom-lg" style="margin-top: 6rpx;">{{order_tips.info}}</view>
<view class="text-white txt-28-h margin-bottom-lg" style="margin-top: 6rpx;">{{order_tips.info}}</view>
<subject foods_info="{{foods_info}}" order_info="{{order_info}}" wx:if="{{order_info}}">
<view class="view flex flex-direction justify-center align-center margin-top-lg">
<view class="Medium txt-28-h {{order_info.status==2?'':'overline'}}">券码：{{order_info.id}}</view>
<image src="{{qrcode?qrcode:'http://nosqn.colorcun.com/taocan/1%20%2813%29.png'}}" mode="heightFix" style="height: 340rpx;max-width: 365rpx;"></image>
<view class="text-bold txt-28-h {{order_info.status==2?'':'overline'}}">券码：{{order_info.id}}</view>
<image src="{{qrcode?qrcode:'http://nosqn.colorcun.com/taocan/1%20%2813%29.png'}}"
class="margin-tb-lg"
mode="heightFix" style="height: 340rpx;max-width: 365rpx;" ></image>
<view wx:if="{{order_info.status==2}}" class="text-bold txt-30-h text-blue">请将此码出示给店员</view>
</view>
</subject>
<navigator url="/pages/reserve/detail?id={{order_info.sid}}&activeTab=reserve">
<view class="view card flex margin-tb-sm padding-lg justify-between">
<view class="view text-bold txt-32-h">您还可以预订包间</view>
<view class="view bg-blue-blue round" style="padding: 8rpx 20rpx;">订包间</view>
<view class="view bg-blue-blue round text-bold" style="padding: 8rpx 20rpx;">订包间</view>
</view>
</navigator>
<view class="view card">
... ...
... ... @@ -12,6 +12,7 @@
}
.huaxian{
position: relative;
color:#cccccc;
}
.huaxian:after{
position: absolute;
... ...