积分相关修改

packageUser/pages/user/order/order.wxml

@@ -33,8 +33,12 @@
 	        {{item.name}}</h6>
 	        <view class="order-info__title ellipsisLn">{{item.color_name}} {{item.size_name}}</view>
 	<!--         <view class="order-info__type ellipsis">{{item.detail}}</view> -->
-	        <view class="order-info__price">
-	          <currency symbol="￥" value="{{item.robo_balance_price}}" wx:if="{{order.status === 'unpay'}}" />
+	        <view class="order-info__price" wx:if="order.order_type == 3">
+	          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{order.status === 'unpay'}}">{{item.robo_balance_price / 100}} 积分</text>
+	          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{order.status !== 'unpay'}}">{{item.robo_balance_price / 100}} 积分</text>
+	        </view>
+	        <view wx:else>
+	        	<currency symbol="￥" value="{{item.robo_balance_price}}" wx:if="{{order.status === 'unpay'}}" />
 	          <currency symbol="￥" value="{{item.robo_balance_price}}" wx:if="{{order.status !== 'unpay'}}" />
 	        </view>
 	        

packageUser/pages/user/orders/orders.wxml

@@ -22,11 +22,15 @@
           <view class="order-main__right">
             <view class="order-info__title ellipsisLn"><b style="color:#F00" wx:if="{{nitem.is_zeng}}">[赠品]</b>{{nitem.name}} <span wx:if="{{nitem.color_name || nitem.size_name}}">|</span> {{nitem.color_name}} {{nitem.size_name}}</view>
             <!-- <view class="order-info__type ellipsis">{{nitem.detail}}</view> -->
-            <view class="order-info__price">
-              <currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status === 'unpay'}}" />
+              <view class="order-info__price" wx:if="item.order_type == 3">
+			          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{item.status === 'unpay'}}" >{{nitem.price / 100}} 积分</text>
+			          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{item.status !== 'unpay'}}" >{{nitem.price / 100}} 积分</text>
+			        </view>
+			        <view wx:else>
+			        	<currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status === 'unpay'}}" />
               <currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status !== 'unpay'}}" />
+			        </view>
               <!-- <currency wx:if="{{item.status == 'unpay' || item.pay_way == 'weixinpay'}}" symbol="￥" value="{{nitem.price}}"></currency><text style="color:#bbb"> <text wx:if="{{item.status == 'unpay' || item.pay_way == 'balance'}}"> <text wx:if="{{item.status == 'unpay'}}"> 或</text> {{nitem.price}}提货券</text></text><currency symbol="￥" value="{{nitem.price}}" ></currency><text class="order-info__point">（或{{nitem.price}}提货券）</text> -->
-            </view>
             <view class="order-info__count">x{{nitem.order_count}}</view>
           </view>
           <view class="clean"></view>
@@ -46,9 +50,9 @@
       <view class="order-allprice" wx:if="{{item.status !== 'unpay'}}">共{{item.count}}件商品 合计：
         <view style="float: right;" wx:if="{{item.pay_way == 'integral' && item.product.mall_balance_price}}">{{(item.total_price+item.freight) / 100}}提货券
         </view>
-        <text style="float: right;" wx:elif="{{item.pay_way == 'cent'}}">{{(item.total_price+item.freight) / 100}} 积分
+        <text style="float: right;" wx:if="{{item.order_type == 3 || item.pay_way == 'cent'}}">{{(item.total_price+item.freight) / 100}} 积分
         </text>
-        <text style="float: right;" wx:elif="{{item.pay_way == 'balance'}}">{{(item.total_price+item.freight) / 100}}
+        <text style="float: right;" wx:if="{{item.pay_way == 'balance'}}">{{(item.total_price+item.freight) / 100}}
         </text>
         <currency style="float: right;" wx:if="{{item.pay_way == 'weixinpay'}}" symbol="￥" value="{{item.total_price+item.freight}}"></currency>
         <view class="clean"></view>

pages/centcart/centcart.wxml

@@ -109,7 +109,8 @@
         <view style="float: right;padding-right: 10px;">
       	<!--共 <text class="red">{{cartCount}}</text> 件商品-->
       	
-      	应付：<currency symbol="￥" value="{{cartTotal}}" class="red"></currency>
+      	应付：<!--<currency symbol="￥" value="{{cartTotal}}" class="red"></currency>-->
+      	<text style="font-size: 34rpx;color:#eab86a">{{cartTotal / 100}} 积分</text>
       	</view>
       </view>
       

pages/pay/pay.wxml

@@ -28,7 +28,8 @@
         <text class="pay-project-spec" wx:if="{{item.color_name || item.size_name}}">规格:{{item.color_name}} {{item.size_name}}</text>
         <view class="product-info">
           <view class="pay-project-price fl">
-            <currency symbol="￥" value="{{item.price}}"/>
+            <!--<currency symbol="￥" value="{{item.price}}"/>-->
+            <text style="    color: #eab86a;font-size: 24rpx;">{{item.price / 100}} 积分</text>
             <!-- <text wx:if="{{balanceInfo.total}}"> 或 {{item.price}}提货券</text>
             <text wx:if="{{balanceInfo.dc_total && item.mall_balance_price}}"> 或 {{item.mall_balance_price}}提货券</text> -->
             <!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{curPayway==='weixinpay'}}"></currency>