优化：后台订单列表页显示收货地址

src/views/order/Index.vue

@@ -119,14 +119,25 @@
                         <td :rowspan="item.goods.length">
                           <a-tooltip v-if="item.pay_method">
                             <template
+                              v-if="item.trade"
                               slot="title"
-                            >第三方支付订单号: {{ item.trade ? item.trade.out_trade_no : '-' }}</template>
+                            >第三方支付订单号: {{ item.trade.out_trade_no }}</template>
                             <a-tag>{{ PaymentMethodEnum[item.pay_method].name }}</a-tag>
                           </a-tooltip>
                           <span v-else>--</span>
                         </td>
                         <td :rowspan="item.goods.length">
-                          <a-tag>{{ DeliveryTypeEnum[item.delivery_type].name }}</a-tag>
+                          <a-tooltip>
+                            <template
+                              v-if="item.delivery_type == DeliveryTypeEnum.EXPRESS.value && item.address"
+                              slot="title"
+                            >
+                              <p>姓名：{{ item.address.name }}</p>
+                              <p>电话：{{ item.address.phone }}</p>
+                              <p>地址：{{ item.address.region.province }} {{ item.address.region.city }} {{ item.address.region.region }} {{ item.address.detail }}</p>
+                            </template>
+                            <a-tag>{{ DeliveryTypeEnum[item.delivery_type].name }}</a-tag>
+                          </a-tooltip>
                         </td>
                         <td :rowspan="item.goods.length">
                           <p class="mtb-2">

src/views/order/tools/delivery/Record.vue

@@ -21,6 +21,16 @@
                 </a-select>
               </a-input>
             </a-form-item>
+            <a-form-item label="发货方式">
+              <a-select v-decorator="['deliveryMethod', { initialValue: -1 }]">
+                <a-select-option :value="-1">全部</a-select-option>
+                <a-select-option
+                  v-for="(item, index) in DeliveryMethodEnum.data"
+                  :key="index"
+                  :value="item.value"
+                >{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-item>
             <a-form-item label="发货时间">
               <a-range-picker format="YYYY-MM-DD" v-decorator="['betweenTime']" />
             </a-form-item>
@@ -238,9 +248,7 @@ export default {
       const { queryParam, page } = this
       this.isLoading = true
       return Api.list({ ...queryParam, page })
-        .then(response => {
-          this.orderList = response.data.list
-        })
+        .then(response => this.orderList = response.data.list)
         .finally(() => this.isLoading = false)
     },