updated

src/views/finance/payfinance-remit-record.vue

@@ -15,20 +15,13 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="5">
               <b>订单状态：</b>
-              <template
-                v-if="
-                  ['11', '12', '13', '21', '22', '23', '31', '32', '33'].indexOf(
-                    dataOrder.order.status
-                  ) >= 0
-                "
-              >
-                <el-tag type="success" size="small">交易中</el-tag>
+              <template v-if="dataOrder.order.newShopOrders[0].shopStatus < 10">
+                <el-tag type="success" size="small">
+                  {{ orderStatus(dataOrder.order.newShopOrders[0].shopStatus) }}
+                </el-tag>
               </template>
               <template v-else>
-                <el-tag
-                  :type="dataOrder.order.status * 1 === 6 ? 'info' : ''"
-                  size="small"
-                >{{ dataOrder.order.status | orderStatusFilter }}</el-tag>
+                <el-tag type="success" size="small"> 交易中 </el-tag>
               </template>
             </el-col>
             <el-col v-if="dataOrder.order.newShopOrders.length > 0" :span="4">
@@ -89,7 +82,7 @@
             <el-col
               :span="4"
             ><b>应收金额：</b> ¥{{
-              dataOrder.order.newShopOrders[0].shouldPayShopAmount | amountfilters
+              dataOrder.order.newShopOrders[0].needPayAmount | amountfilters
             }}</el-col>
             <!-- <el-col :span="5">
               <b>运费：</b>
@@ -182,6 +175,18 @@ export default {
     this.organizeReceiptRecord()
   },
   methods: {
+    // 订单状态更新
+    orderStatus(state) {
+      const status = {
+        0: '待确认',
+        1: '已确认',
+        2: '交易完成',
+        3: '订单完成',
+        4: '已关闭',
+        5: '交易全退'
+      }
+      return status[state]
+    },
     async organizeReceiptRecord() {
       try {
         const res = await organizeReceiptRecord({

src/views/order/detail.vue

@@ -221,12 +221,12 @@
             <el-col
               :span="6"
             ><b>应收金额：</b> ¥{{
-              shopOrder.shouldPayShopAmount | toThousandFloatFilter
+              shopOrder.needPayAmount | toThousandFloatFilter
             }}</el-col>
             <el-col
               :span="6"
             ><b>已收金额：</b> ¥{{
-              shopOrder.payedShopAmount | toThousandFloatFilter
+              shopOrder.receiptAmount | toThousandFloatFilter
             }}</el-col>
             <el-col
               :span="6"