Merge branch 'master' of gitlab.qima-inc.com:weapp/zui

This commit is contained in:
Nino 2017-01-03 20:42:52 +08:00
commit 49a202f2b1
3 changed files with 7 additions and 6 deletions

View File

@ -4,6 +4,7 @@
padding: 5px 15px; padding: 5px 15px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
font-size: 14px;
} }
.zui-card__thumb { .zui-card__thumb {

View File

@ -4,7 +4,7 @@
<view class="zui-card"> <view class="zui-card">
<view class="zui-card__thumb"> <view class="zui-card__thumb">
<image class="zui-card__img" <image class="zui-card__img"
src="https://img.yzcdn.cn/upload_files/2016/12/06/9deca4d6fad5094bc78cb20339eb4264.png?imageView2/2/w/980/h/980/q/75/format/webp" src="https://img.yzcdn.cn/upload_files/2016/11/25/FpqPXlrMRjKwJs8VdTu3ZDJCj4j5.jpeg?imageView2/2/w/200/h/200/q/90/format/jpeg"
mode="aspectFit" mode="aspectFit"
></image> ></image>
</view> </view>
@ -12,14 +12,14 @@
<view class="zui-card__detail-row"> <view class="zui-card__detail-row">
<view class="zui-card__right-col">¥ 999.99</view> <view class="zui-card__right-col">¥ 999.99</view>
<view class="goods-card__left-col zui-ellipsis--l2"> <view class="goods-card__left-col zui-ellipsis--l2">
商品名称是什么 红烧牛肉【虚拟商品】【有库存】【有sku】
</view> </view>
</view> </view>
<view class="zui-card__detail-row zui-c-gray-darker"> <view class="zui-card__detail-row zui-c-gray-darker">
<view class="zui-card__right-col">x2</view> <view class="zui-card__right-col">x2</view>
<view class="zui-card__left-col"> <view class="zui-card__left-col">
商品SKU1 3000克 50%
</view> </view>
</view> </view>

View File

@ -1,21 +1,21 @@
<view class="container"> <view class="container">
<view class="zui-panel"> <view class="zui-panel">
<view class="zui-vsteps zui-vsteps__step--done zui-vsteps--first-child"> <view class="zui-vsteps zui-vsteps__step--done zui-vsteps--first-child">
<view class="zui-vsteps__title">卖家退款(2016-03-23 20:20:20)</view> <view class="zui-vsteps__title">买家退款 (2016-03-21 19:20:20)</view>
<view class="zui-vsteps__icons"> <view class="zui-vsteps__icons">
<view class="zui-vsteps__circle zui-icon zui-icon-checked"></view> <view class="zui-vsteps__circle zui-icon zui-icon-checked"></view>
</view> </view>
<view class="zui-vsteps__line"></view> <view class="zui-vsteps__line"></view>
</view> </view>
<view class="zui-vsteps zui-vsteps__step--done zui-vsteps__step--cur"> <view class="zui-vsteps zui-vsteps__step--done zui-vsteps__step--cur">
<view class="zui-vsteps__title">卖家退款(2016-03-23 20:20:20)</view> <view class="zui-vsteps__title">卖家同意 (2016-03-22 21:20:20)</view>
<view class="zui-vsteps__icons"> <view class="zui-vsteps__icons">
<view class="zui-vsteps__circle zui-icon zui-icon-checked"></view> <view class="zui-vsteps__circle zui-icon zui-icon-checked"></view>
</view> </view>
<view class="zui-vsteps__line"></view> <view class="zui-vsteps__line"></view>
</view> </view>
<view class="zui-vsteps zui-vsteps--last-child"> <view class="zui-vsteps zui-vsteps--last-child">
<view class="zui-vsteps__title">卖家退款(2016-03-23 20:20:20)</view> <view class="zui-vsteps__title">卖家退款 (2016-03-23 20:20:20)</view>
<view class="zui-vsteps__icons"> <view class="zui-vsteps__icons">
<view class="zui-vsteps__circle"></view> <view class="zui-vsteps__circle"></view>
</view> </view>