clp пре 3 година
родитељ
комит
fcc562f771
2 измењених фајлова са 11 додато и 4 уклоњено
  1. 4 4
      pages/welfareMall/historical/historical.wxml
  2. 7 0
      project.private.config.json

+ 4 - 4
pages/welfareMall/historical/historical.wxml

@@ -35,15 +35,15 @@
               <view class="order_goods flex-row">
                 <view class="order_goods_left flex-row" wx:if="{{item.orderGoodsList.length == 1}}">
                   <view style="margin-left: 38rpx;">
-                    <image style="width: 132rpx; height: 132rpx;" src="/images/groupmeallist/order_good.png"></image>
+                    <image style="width: 132rpx; height: 132rpx;" src="{{item.orderGoodsList[0].fullFigure}}"></image>
                   </view>
                   <view style="font-size: 24rpx;font-weight: 400;text-align: left;color: #000000;margin-left:21rpx">{{item.orderGoodsList[0].productName}}</view>
                 </view>
                 <view class="flex-row" style="height:162rpx ;width: 500rpx;justify-content: flex-start;overflow-x: hidden;" wx:if="{{item.orderGoodsList.length > 1}}">
                   <view class="order_goods_left flex-row"  wx:for="{{item.orderGoodsList}}" wx:for-item="good" wx:key="index">
                     <view style="margin-left: 38rpx;" class="flex-column">
-                      <image style="width: 112rpx; height: 112rpx;" src="/images/groupmeallist/order_good.png"></image>
-                      <view style="width:112rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; font-size: 24rpx;font-weight: 400;text-align: left;color: #000000;margin-top: 5rpx;">{{item.orderGoodsList[0].productName}}</view>
+                      <image style="width: 112rpx; height: 112rpx;" src="{{good.fullFigure}}"></image>
+                      <view style="width:112rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; font-size: 24rpx;font-weight: 400;text-align: left;color: #000000;margin-top: 5rpx;">{{good.productName}}</view>
                     </view>
                   </view>
                 </view>
@@ -70,7 +70,7 @@
                 </view>
 
 
-                <view class="Request_a_refund" wx:if="{{item.state == 2}}"  data-sn="{{item.orderSn}}"  catchtap="goTorefund">申请退款</view>
+                <view class="Request_a_refund" wx:if="{{item.state == 2 && item.orderRefund == null}}"  data-sn="{{item.orderSn}}"  catchtap="goTorefund">申请退款</view>
                 <view class="Request_a_refund" wx:if="{{item.state == 4}}"  catchtap="goTorefundList">退款记录</view>
 
               </view>

+ 7 - 0
project.private.config.json

@@ -744,6 +744,13 @@
                     "name": "",
                     "pathName": "pages/groupmeallist/myOrder/myOrder",
                     "query": "sn=654499421493156",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/welfareMall/historical/historical",
+                    "query": "",
                     "scene": null,
                     "launchMode": "default"
                 }