Merge branch 'master' of https://github.com/linlinjava/litemall

litemall-wx/config/api.js

 // 以下是业务服务器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', //首页数据接口

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>

litemall-wx/pages/ucenter/address/address.wxss

@@ -90,18 +90,31 @@ page{
 }
 
 .add-address{
-    background: #b4282d;
-    text-align: center;
-    width: 100%;
-    height: 99rpx;
-    line-height: 99rpx;
-    position: fixed;
-    border-radius: 0;
-    border: none;
-    color: #fff;
-    font-size: 29rpx;
-    bottom: 0;
-    left:0;
+  border: none;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 90%;
+  height: 90rpx;
+  line-height: 98rpx;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  border-radius: 0;
+  padding: 0;
+  margin: 0;
+  margin-left: 5%;
+  text-align: center;
+  /* padding-left: -5rpx; */
+  font-size: 25rpx;
+  color: #f4f4f4;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
 }
 
 .empty-view{

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;

litemall-wx/pages/ucenter/order/order.js

@@ -7,7 +7,17 @@ Page({
   showType: 0
  },
  onLoad: function(options) {
-  // 页面初始化 options为页面跳转所带来的参数
+   // 页面初始化 options为页面跳转所带来的参数
+   let that = this
+   try {
+     var tab = wx.getStorageSync('tab');
+
+     this.setData({
+       showType: tab
+     });
+   } catch (e) {
+   }
+
  },
 
  onPullDownRefresh() {

litemall-wx/pages/ucenter/order/order.wxss

@@ -9,7 +9,7 @@ page{
     width: 100%;
     background: #fff;
     height: 84rpx;
-    border-bottom: 1px solid rgba(0,0,0,.15);
+    /* border-bottom: 1px solid rgba(0,0,0,.15); */
 }
 
 .orders-switch .item{
@@ -25,14 +25,14 @@ page{
     height: 82rpx;
     padding: 0 20rpx;
     line-height: 82rpx;
-    color: #333;
+    color: #9a9ba1;
     font-size: 30rpx;
     width: 170rpx;
 }
 
 .orders-switch .item.active .txt{
-    color: #ab2b2b;
-    border-bottom: 4rpx solid #ab2b2b;
+    color: #AB956D;
+    border-bottom: 4rpx solid #AB956D;
 }