优化

src/views/order/refund-return.vue

@@ -15,11 +15,15 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>审核人:</b> {{ refund.reviewUserName }}</el-col>
             <el-col :span="6"><b>审核时间:</b> {{ refund.confirmReturnTime }}</el-col>
-            <el-col :span="6"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
           </el-row>
           <el-row v-if="refund.reviewImage1 || refund.reviewImage2 || refund.reviewImage3 || refund.reviewImage4 || refund.reviewImage5 " :gutter="24" class="box-row">
-            <el-col :span="4"><b>审核凭证:</b></el-col>
-            <el-col :span="20">
+            <el-col :span="2"><b>审核凭证:</b></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
               <img v-if="refund.reviewImage1" :src="refund.reviewImage1" width="65" alt="">
               <img v-if="refund.reviewImage2" :src="refund.reviewImage2" width="65" alt="">
               <img v-if="refund.reviewImage3" :src="refund.reviewImage3" width="65" alt="">
@@ -33,11 +37,15 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
             <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
+          </el-row>
+          <el-row>
             <el-col :span="6"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
           </el-row>
           <el-row v-if="refund.image1 || refund.image2 || refund.image3 || refund.image4 || refund.image5 " :gutter="24" class="box-row">
             <el-col :span="4"><b>申请凭证:</b></el-col>
-            <el-col :span="20">
+          </el-row>
+          <el-row>
+            <el-col :span="24">
               <img v-if="refund.image1" :src="refund.image1" width="65" alt="">
               <img v-if="refund.image2" :src="refund.image2" width="65" alt="">
               <img v-if="refund.image3" :src="refund.image3" width="65" alt="">
@@ -52,10 +60,10 @@
             <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
             <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</template></el-col>
             <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFloatFilter }}</el-col>
-            <el-col :span="6"><b>退款状态:</b>
+            <el-col :span="6"><b>退款审核状态:</b>
               <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
-              <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
-              <el-tag v-if="refund.status*1===3" type="success" size="small">审核通过</el-tag>
+              <el-tag v-if="refund.status*1===2" type="success" size="small">审核通过</el-tag>
+              <el-tag v-if="refund.status*1===3" type="danger" size="small">审核不通过</el-tag>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
@@ -123,11 +131,6 @@
                 <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
                 <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
               </el-col>
-              <el-col :span="6"><b>付款状态:</b>
-                <el-tag v-if="order.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-                <el-tag v-if="order.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-                <el-tag v-if="order.payStatus*1===3" type="success" size="small">已付款</el-tag>
-              </el-col>
               <el-col :span="6"><b>退款状态:</b>
                 <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
                 <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
@@ -152,11 +155,6 @@
             <el-row :gutter="22" class="box-row">
               <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
               <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.productAmount | toThousandFloatFilter }}</el-col>
-              <el-col :span="5"><b>付款状态:</b>
-                <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-                <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-                <el-tag v-if="shopOrder.payStatus*1===3" type="success" size="small">已付款</el-tag>
-              </el-col>
               <el-col :span="5"><b>发货状态:</b>
                 <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
                 <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>

src/views/order/refund.vue

@@ -66,7 +66,7 @@
         </template>
       </el-table-column>
       <el-table-column label="买家" align="center" prop="userName" />
-      <el-table-column label="订单编号(ID)" align="center" prop="orderNo" min-width="70">
+      <el-table-column label="订单编号(ID)" align="center" prop="orderNo">
         <template slot-scope="{row}">{{ row.orderNo + '(' + row.orderID + ')' }}</template>
       </el-table-column>
       <el-table-column label="退款金额" align="center" prop="refundFee">