订单修改

src/components/order/detail.vue

@@ -41,7 +41,7 @@
       <el-col :span="8">{{detail.desc}}</el-col>
     </el-row>
     <el-row>
-      <el-col :span="4"><label>收获地址</label></el-col>
+      <el-col :span="4"><label>收货地址</label></el-col>
       <el-col :span="20">
         <template v-if="detail.user_address_id">
           收货人：{{detail.receive_name}}<br>

src/components/order/index.vue

@@ -108,6 +108,13 @@
         prop="goods_name"
         label="商品名称">
       </el-table-column>
+      <el-table-column
+        label="付款状态"
+        width="100">
+        <template slot-scope="scope">
+          {{scope.row.status|status}}
+        </template>
+      </el-table-column>
       <el-table-column
         label="实付金额"
         width="100">
@@ -116,10 +123,13 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="付款状态"
-        width="100">
+        label="收货地址">
         <template slot-scope="scope">
-          {{scope.row.status|status}}
+          <div v-if="scope.row.user_address_id">
+            {{scope.row.receive_name}}<br>
+            {{scope.row.receive_mobile}}<br>
+            {{scope.row.province_name}}{{scope.row.city}}{{scope.row.area}}{{scope.row.address}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column

src/components/refund/index.vue

@@ -24,7 +24,7 @@
       style="width: 100%">
       <el-table-column
         prop="out_trade_no"
-        label="out_trade_no">
+        label="订单号">
       </el-table-column>
       <el-table-column
         prop="refund_no"