Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

src/views/order/refund-return.vue

@@ -151,7 +151,7 @@
           <div v-for="shopOrder in refund.shopOrderReturnedList" :key="shopOrder.shopOrderID" class="order-item">
             <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.needPayAmount | toThousandFloatFilter }}</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>