shish 1 年間 前
コミット
81495104ca
1 ファイル変更11 行追加11 行削除
  1. 11 11
      hdApp/src/admin/order/itemOrder.vue

+ 11 - 11
hdApp/src/admin/order/itemOrder.vue

@@ -2,28 +2,28 @@
   <div class="app-main app-content">
   <div class="app-main app-content">
     <div class="list-wrap">
     <div class="list-wrap">
       <block v-if="!$util.isEmpty(list.data)">
       <block v-if="!$util.isEmpty(list.data)">
-        <div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/admin/order/detail?id='+item.orderInfo.id})">
-          <block v-if="!$util.isEmpty(item.orderInfo)">
+        <div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/admin/order/detail?id='+item.id})">
+          <block v-if="!$util.isEmpty(item)">
             <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
             <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
-              <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.orderInfo.sendNum }}<text v-if="item.orderInfo.bookName!=''" style="margin-left:12upx;">| {{item.orderInfo.bookName}}</text></view>
-              <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.orderInfo.debt == 1">赊账</view>
-              <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.orderInfo.refund == 1">有售后</view>
-              <view style="font-size:28upx;" class='app-price app-green'>{{ item.orderInfo.status | constantfilter('ORDER_STATUS') }}</view>
+              <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.sendNum }}<text v-if="item.bookName!=''" style="margin-left:12upx;">| {{item.bookName}}</text></view>
+              <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">赊账</view>
+              <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.refund == 1">有售后</view>
+              <view style="font-size:28upx;" class='app-price app-green'>{{ item.status | constantfilter('ORDER_STATUS') }}</view>
             </view>
             </view>
 
 
             <view>
             <view>
-              <orderItem :info="item.orderInfo"></orderItem>
+              <orderItem :info="item"></orderItem>
             </view>
             </view>
 
 
             <view class="list-bottom" style="padding-top:0upx;">
             <view class="list-bottom" style="padding-top:0upx;">
               <view style="border-bottom:1upx solid #EEEEEE;padding-bottom:8upx;">
               <view style="border-bottom:1upx solid #EEEEEE;padding-bottom:8upx;">
-                <span v-if="item.orderInfo.sendCost > 0" class="freight-text">运费 ¥{{ item.orderInfo.sendCost ? parseFloat(item.orderInfo.sendCost) : 0 }}</span>
-                <span class="app-size-30 app-bold">¥{{ item.orderInfo.orderPrice ? parseFloat(item.orderInfo.orderPrice) :0 }}</span>
+                <span v-if="item.sendCost > 0" class="freight-text">运费 ¥{{ item.sendCost ? parseFloat(item.sendCost) : 0 }}</span>
+                <span class="app-size-30 app-bold">¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
               </view>
               </view>
               <view class="list-button">
               <view class="list-button">
-                  <view class="admin-button-com middle" v-if="item.orderInfo.status == 2" @click.stop="sendOrderFn(item.orderInfo)">发货</view>
+                  <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">发货</view>
                   <view class="admin-button-com default" v-else>发货</view>
                   <view class="admin-button-com default" v-else>发货</view>
-                  <view class="admin-button-com middle" v-if="item.orderInfo.payStatus == 1" @click.stop="printOrder(item.orderInfo)">打印</view>
+                  <view class="admin-button-com middle" v-if="item.payStatus == 1" @click.stop="printOrder(item)">打印</view>
                   <view class="admin-button-com default" v-else>打印</view>
                   <view class="admin-button-com default" v-else>打印</view>
               </view>
               </view>
             </view>
             </view>