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

app.json

@@ -13,7 +13,7 @@
     "example/helper/index",
     "example/form/index",
     "example/steps/index",
-    "example/namecard/index",
+    "example/card/index",
     "example/toast/index",
     "example/vsteps/index",
     "example/icon/index",

dist/card/index.wxss

@@ -1,4 +1,4 @@
-.zui-namecard {
+.zui-card {
   margin-left: 0px;
   width: auto;
   padding: 5px 15px;
@@ -6,7 +6,7 @@
   position: relative;
 }
 
-.zui-namecard__thumb {
+.zui-card__thumb {
   width: 90px;
   height: 90px;
   float: left;
@@ -17,7 +17,7 @@
   background-size: cover;
 }
 
-.zui-namecard__img {
+.zui-card__img {
   position: absolute;
   margin: auto;
   top: 0;
@@ -30,24 +30,24 @@
   max-height: 100%;
 }
 
-.zui-namecard__detail {
+.zui-card__detail {
   margin-left: 100px;
   width: auto;
   position: relative;
 }
 
-.zui-namecard__detail-row {
+.zui-card__detail-row {
   overflow: hidden;
   line-height: 20px;
   min-height: 20px;
   margin-bottom: 3px;
 }
 
-.zui-namecard__right-col {
+.zui-card__right-col {
   float: right;
 }
 
-.zui-namecard__left-col {
+.zui-card__left-col {
   margin-right: 80px;
 }
 

dist/index.wxss

@@ -4,7 +4,7 @@
 @import "panel/index.wxss";
 @import "btn/index.wxss";
 @import "cell/index.wxss";
-@import "namecard/index.wxss";
+@import "card/index.wxss";
 @import "badge/index.wxss";
 @import "dialog/index.wxss";
 @import "form/index.wxss";

dist/steps/index.wxss

@@ -68,9 +68,7 @@
 .zui-steps__step--done .zui-steps__circle {
   width: 5px;
   height: 5px;
-  background: transparent url("https://b.yzcdn.cn/v2/image/wap/trade/steps/icon_green@2x.png") center no-repeat;
-  background-size: 5px 5px;
-  border-radius: 0;
+  background-color: #09bb07;
 }
 
 /* 正在进行中的steps */

example/card/index.wxml

@@ -1,29 +1,29 @@
 <view class="container">
 
   <view class="zui-panel">
-    <view class="zui-namecard">
-      <view class="zui-namecard__thumb">
-        <image class="zui-namecard__img"
+    <view class="zui-card">
+      <view class="zui-card__thumb">
+        <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"
           mode="aspectFit"
         ></image>
       </view>
-      <view class="zui-namecard__detail">
-        <view class="zui-namecard__detail-row">
-          <view class="zui-namecard__right-col">¥ 999.99</view>
+      <view class="zui-card__detail">
+        <view class="zui-card__detail-row">
+          <view class="zui-card__right-col">¥ 999.99</view>
           <view class="goods-card__left-col zui-ellipsis--l2">
             商品名称是什么
           </view>
         </view>
 
-        <view class="zui-namecard__detail-row zui-c-gray-darker">
-          <view class="zui-namecard__right-col">x2</view>
-          <view class="zui-namecard__left-col">
+        <view class="zui-card__detail-row zui-c-gray-darker">
+          <view class="zui-card__right-col">x2</view>
+          <view class="zui-card__left-col">
             商品SKU1
           </view>
         </view>
 
-        <view class="zui-namecard__detail-row zui-c-gray-darker">
+        <view class="zui-card__detail-row zui-c-gray-darker">
           <view class="goods-card__left-col zui-c-red">已发货</view>
         </view>
       </view>

example/dashboard/index.js

@@ -31,8 +31,8 @@ Page({
         name: 'Loadmore',
         path: '/example/loadmore/index'
       }, {
-        name: 'Namecard',
-        path: '/example/namecard/index'
+        name: 'Card',
+        path: '/example/card/index'
       }, {
         name: 'Panel',
         path: '/example/panel/index'