From 13f36197dfd1c510a07e4ddfacf79ba69e6902d6 Mon Sep 17 00:00:00 2001
From: usgeek <940208412@qq.com>
Date: Wed, 29 Aug 2018 19:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-wx/config/api.js                  | 4 ++--
 litemall-wx/pages/cart/cart.wxml           | 9 ++++++---
 litemall-wx/pages/ucenter/index/index.wxss | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js
index bdc0c732..033f8ede 100644
--- a/litemall-wx/config/api.js
+++ b/litemall-wx/config/api.js
@@ -1,12 +1,12 @@
 // 以下是业务服务器API地址
 // 本机开发时使用
- var WxApiRoot = 'http://localhost:8080/wx/';
+ var WxApiRoot = 'http://localhost:8082/wx/';
 // 局域网测试使用
 // var WxApiRoot = 'http://192.168.0.101:8080/wx/';
 // 云平台部署时使用
 // var WxApiRoot = 'http://122.152.206.172:8080/wx/';
 // 云平台上线时使用
-// var WxApiRoot = 'https://www.menethil.com.cn/wx/';
+ //var WxApiRoot = 'https://www.menethil.com.cn/wx/';
 
 module.exports = {
  IndexUrl: WxApiRoot + 'home/index', //首页数据接口
diff --git a/litemall-wx/pages/cart/cart.wxml b/litemall-wx/pages/cart/cart.wxml
index 092ce0ac..ad0c9fa2 100644
--- a/litemall-wx/pages/cart/cart.wxml
+++ b/litemall-wx/pages/cart/cart.wxml
@@ -50,9 +50,12 @@
       <view class="cart-bottom">
         <view class="checkbox {{checkedAllStatus ? 'checked' : ''}}" bindtap="checkedAll">全选({{cartTotal.checkedGoodsCount}})</view>
         <view class="total">{{!isEditCart ? '￥'+cartTotal.checkedGoodsAmount : ''}}</view>
-        <view class="delete" bindtap="editCart">{{!isEditCart ? '编辑' : '完成'}}</view>
-        <view class="checkout" bindtap="deleteCart" wx:if="{{isEditCart}}">删除所选</view>
-        <view class="checkout" bindtap="checkoutOrder" wx:if="{{!isEditCart}}">下单</view>
+        <view class='action_btn_area'>
+          <view class="{{!isEditCart ? 'edit' : 'sure'}}" bindtap="editCart">{{!isEditCart ? '编辑' : '完成'}}</view>
+          <view class="delete" bindtap="deleteCart" wx:if="{{isEditCart}}">删除({{cartTotal.checkedGoodsCount}})</view>
+          <view class="checkout" bindtap="checkoutOrder" wx:if="{{!isEditCart}}">下单</view>
+          <!-- </view>  -->
+        </view>
       </view>
     </view>
   </view>
diff --git a/litemall-wx/pages/ucenter/index/index.wxss b/litemall-wx/pages/ucenter/index/index.wxss
index ae6cb812..d0313f4c 100644
--- a/litemall-wx/pages/ucenter/index/index.wxss
+++ b/litemall-wx/pages/ucenter/index/index.wxss
@@ -13,7 +13,7 @@ page {
 
 .profile-info {
   background-color: #ab956d;
-  color: #fff;
+  color: #f4f4f4;
   display: flex;
   align-items: center;
   padding: 30rpx;