调整赠品金额显示

packageUser/pages/user/comment/comment.wxml

@@ -9,7 +9,7 @@
 	        {{order.name}}</h6>
 	        <view class="order-info__title ellipsisLn">{{order.color_name}} {{order.size_name}}</view>
 	        <view class="order-info__price">
-	        	<currency symbol="￥" value="{{order.price}}" />
+	        	<currency symbol="￥" value="{{order.price && order.is_zeng}}" />
 	        </view>
 	        
 	      </view>

packageUser/pages/user/order/order.wxml

@@ -40,13 +40,13 @@
 			</view>
 	
 	        <view class="order-info__price" wx:if="{{order.order_type == 3}}">
-	          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{order.status === 'unpay'}}">{{item.price / 100}} 积分</text>
-	          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{order.status !== 'unpay'}}">{{item.price / 100}} 积分</text>
+	          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{order.status === 'unpay' && !nitem.send}}">{{item.price / 100}} 积分</text>
+	          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{order.status !== 'unpay' && !nitem.send}}">{{item.price / 100}} 积分</text>
 			  <view class="order-info__count">x{{item.count}}</view>
 	        </view>
 	        <view class="order-info__price" wx:else>
-	        	<currency symbol="￥" value="{{item.price}}" wx:if="{{order.status === 'unpay'}}" />
-	          <currency symbol="￥" value="{{item.price}}" wx:if="{{order.status !== 'unpay'}}" />
+	        	<currency symbol="￥" value="{{item.price}}" wx:if="{{order.status === 'unpay' && !nitem.send}}" />
+	          <currency symbol="￥" value="{{item.price}}" wx:if="{{order.status !== 'unpay' && !nitem.send}}" />
 			  <view class="order-info__count">x{{item.count}}</view>
 	        </view>
 	        

packageUser/pages/user/orders/orders.wxml

@@ -29,14 +29,14 @@
 				</view>
 			</view>
               <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>
+			          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{item.status === 'unpay' && !nitem.send}}" >{{nitem.price / 100}} 积分</text>
+			          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{item.status !== 'unpay' && !nitem.send}}" >{{nitem.price / 100}} 积分</text>
 					  
 					  <view class="order-info__count">x{{nitem.count}}</view>
 			        </view>
 			        <view class="order-info__price" wx:else>
-			        	<currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status === 'unpay'}}" />
-              	<currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status !== 'unpay'}}" />
+			        	<currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status === 'unpay' && !nitem.send}}" />
+              	<currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status !== 'unpay' && !nitem.send}}" />
 				
 				<view class="order-info__count">x{{nitem.count}}</view>
 			        </view>