Browse Source

积分修改

junyuanz 5 years ago
parent
commit
aa49ae79ae

+ 2 - 2
packageUser/pages/user/order/order.wxml

@@ -33,11 +33,11 @@
 	        {{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" wx:if="order.order_type == 3">
+	        <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>
+	        <view class="order-info__price" 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>

+ 4 - 3
packageUser/pages/user/orders/orders.wxml

@@ -22,13 +22,14 @@
           <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" wx:if="item.order_type == 3">
+            {{item.order_type}}
+              <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>
+			        <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'}}" />
 			        </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 class="order-info__count">x{{nitem.order_count}}</view>

+ 3 - 2
pages/pay/pay.wxml

@@ -28,8 +28,9 @@
         <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}}"/>-->
-            <text style="    color: #eab86a;font-size: 24rpx;">{{item.price / 100}} 积分</text>
+           
+            <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{payData.order_type == 3}}">{{item.price / 100}} 积分</text>
+            <currency symbol="¥" value="{{item.price}}" wx:else/>
             <!-- <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>