Bladeren bron

修复物流样式错误

junyuanz 4 jaren geleden
bovenliggende
commit
ac854cf76c

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

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

@@ -76,11 +76,11 @@
           <view class="order-btn__red" wx:if="{{item.status === 'unpay'}}">支付</view>
         </navigator>
         <view class="order-btn__red" bindtap="confirmPopup" data-val="{{item.order_id}}" wx:if="{{item.status === 'dispatch'}}">确认收货</view>
-        <view class="order-btn__black" bindtap="CancelPopup" data-val="{{item.order_id}}" wx:if="{{item.status === 'unpay'}}">取消订单</view>
+        <view class="order-btn__black_wl" bindtap="CancelPopup" data-val="{{item.order_id}}" wx:if="{{item.status === 'unpay'}}">取消订单</view>
         
 <!--         <view class="order-btn__black" wx:if="{{item.status === 'dispatch' && item.status === 'dispatch'}}">查看物流</view> -->
         <!-- <view class="order-btn__black">删除订单</view> -->
-        <view wx:if="{{item.sign && item.express_order_no && item.express_code}}" class="order-btn__black">
+        <view wx:if="{{item.sign && item.express_order_no && item.express_code}}" class="order-btn__black_wl">
 			<navigator url="/packageUser/pages/user/logistics/logistics?id={{item.order_id}}" open-type="navigate">查看物流 </navigator>
 		</view>
       </view>

+ 13 - 0
packageUser/pages/user/orders/orders.wxss

@@ -127,6 +127,19 @@ bottom: 16rpx;
      font-size: 26rpx;
      padding: 0rpx 25rpx;
 }
+.order-btn__black_wl {
+     border: 1rpx solid #999;
+     text-align: center;
+     line-height: 58rpx;
+     z-index: 999;
+     /* border-radius: 45px; */
+     color: #999;
+     font-size: 28rpx;
+     padding: 0rpx 25rpx;
+	 display: inline-block;
+	 float: right;
+	 margin-top: 20rpx;
+}
 .order-btn__red {
   float: right;
   width: 158rpx;