From d37401faf7e8149675bc292f8f04940c1ac0c234 Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Wed, 16 Nov 2016 14:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/cart.wxss       |  8 ++++----
 pages/category/category.js |  8 ++++----
 pages/mine/mine.wxml       |  4 +++-
 pages/mine/mine.wxss       | 20 +++++++++++---------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/pages/cart/cart.wxss b/pages/cart/cart.wxss
index 3ff9513..681606c 100644
--- a/pages/cart/cart.wxss
+++ b/pages/cart/cart.wxss
@@ -19,6 +19,7 @@
 
 .items-container {
   margin-bottom: 180rpx;
+  min-height: 900rpx;
 }
 
 .item {
@@ -28,7 +29,7 @@
   border-bottom: 1px solid #e4e4e4;
   color: #333;
   display:flex;
-  align-items:center;
+  justify-content: space-between;
 }
 
 .item text {
@@ -42,12 +43,11 @@
 }
 
 .item-right {
-  margin-left: 20rpx;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  width: 100%;
   height: 100%;
+  max-width: 410rpx;
 }
 
 .title {
@@ -57,7 +57,7 @@
 .title text {
   font-size: 28rpx;
   color: #333;
-  white-space: pre-wrap;
+  white-space: no-wrap;
   line-height: 34rpx;
 }
 
diff --git a/pages/category/category.js b/pages/category/category.js
index d8eaf98..88377ed 100644
--- a/pages/category/category.js
+++ b/pages/category/category.js
@@ -55,10 +55,10 @@ Page({
       key: 'cartItems',
       data: cartItems
     })
-
-    wx.navigateTo({
-      url: '../cart/cart'
+    wx.showToast({
+      title: '成功加入购物车',
+      icon: 'success',
+      duration: 1000
     })
-
   }
 })
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index daa546b..80624a3 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -40,7 +40,9 @@
         <view class="long-view">
           <block wx:for="{{zichan_slides}}" wx:for-item="slide" wx:key="id">
             <view class="item">
-              <image class="slide-img" src="{{slide.image}}"/>
+              <view class="image">
+                <image class="slide-img" src="{{slide.image}}"/>
+              </view>
               <view class="desc">
                 <view class="desc-line"><text>{{slide.name}}</text></view>
                 <view class="desc-line asset-count"><text>{{slide['asset-count']}}</text></view>
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 0febb44..bc5f072 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -20,8 +20,8 @@
 
 .xunzhang .rank {
   position: relative;
-  top: -88rpx;
-  left: 29rpx;
+  top: -47px;
+  left: 30rpx;
   font-size: 25rpx;
   width: 50rpx;
   text-align: center;
@@ -81,25 +81,27 @@
 
 .zichan .second-line .item {
   width: 560rpx;
-  height: 250rpx;
+  height: 137px;
   margin-left: 20rpx;
 }
 
+.zichan .second-line .item .image{
+  height: 137px;
+}
+
 .zichan .second-line .desc {
   position: relative;
-  top: -255rpx;
+  top: -137px;
   left: 0;
-  width: 100%;
-  height: 100%;
+  width: 560rpx;
+  height: 137px;
   background-color: rgba(0,0,0,0.3);
   border-radius: 5px;
   text-align: center;
   color: #fff;
-
   display: flex;
   flex-direction: column;
   justify-content: center;
-
   font-size: 25rpx;
 }
 
@@ -116,7 +118,7 @@
 .slide-img {
   border-radius: 5px;
   width: 560rpx;
-  height: 250rpx;
+  height: 137px;
 }
 
 /*.zichan .third-line {