Merge branch 'master' into dev

pages/Review/Review.wxss

@@ -66,14 +66,14 @@
   border-radius: 0rpx 16rpx 16rpx 0rpx;
 }
 
-.review .item .goods-box .goods-list .total-box .price{
+.review .item .goods-box .total-box .price{
   font-weight: 800;
   font-size: 32rpx;
   color: #FF4D3A;
   margin-bottom: 12rpx;
 }
 
-.review .item .goods-box .goods-list .total-box .num{
+.review .item .goods-box .total-box .num{
   font-size: 28rpx;
   color: #AAAAAA;
 }

pages/orderList/orderList.wxml

@@ -78,11 +78,17 @@
                   </view>
                   <view class='price-nums'>
                     <text class='prodprice'>
-                      <text class='symbol' wx:if="{{item.actualTotal}}">￥</text>
+                      <text class='symbol'>￥</text>
+                      <text class='big-num'>{{wxs.parsePrice(prod.price)[0]}}</text>
+                      <text class='small-num'>.{{wxs.parsePrice(prod.price)[1]}}</text>
+                      <!-- <text class='symbol' wx:if="{{item.actualTotal}}">￥</text>
                       <text class='big-num' wx:if="{{item.actualTotal}}">{{wxs.parsePrice(prod.price)[0]}}</text>
                       <text class='small-num' wx:if="{{item.actualTotal}}">.{{wxs.parsePrice(prod.price)[1]}}</text>
                       <text class='small-num' wx:if="{{item.actualTotal && item.orderType==3}}" decode="{{true}}">&nbsp;+&nbsp;</text>
-                      <text class='big-num' wx:if="{{prod.useScore && item.orderType==3}}">{{prod.useScore}} <text class='small-num'>积分</text></text>
+                      <text class='big-num' wx:if="{{prod.useScore && item.orderType==3}}">
+                      {{prod.useScore}} 
+                      <text class='small-num'>积分</text>
+                      </text> -->
                     </text>
                     <text class="prodcount">x{{prod.prodCount}}</text>
                   </view>

pages/user/user.wxml

@@ -69,6 +69,7 @@
         <view class='items' bindtap='toOrderListPage' data-sts="80">
           <image src='../../images/icon/toComment.png'></image>
           <text>已完成</text>
+          <text class='num-badge' wx:if="{{orderAmount.success>0}}">{{orderAmount.success}}</text>
         </view>
         <view class='items' bindtap='toAfterSalesPage'>
           <image src='../../images/icon/refund.png'></image>

pages/user/user.wxss

@@ -243,11 +243,11 @@ page {
 .list-cont .total-order .procedure .items .num-badge {
   position: absolute;
   top: -15rpx;
-  right: -12rpx;
-  color: #e43130;
+  left: calc(50% + 15rpx) ;
+  color: #FFF;
   border: 3rpx solid #e43130;
   border-radius: 50rpx;
-  background: #fff;
+  background: #FF4D3A;
   min-width: 30rpx;
   height: 30rpx;
   line-height: 30rpx;