Преглед на файлове

fix:“修改流水号为商户单号,显示商户单号”

soobin преди 1 година
родител
ревизия
93b59262fc
променени са 2 файла, в които са добавени 10 реда и са изтрити 5 реда
  1. 3 2
      src/assets/language/zh.json
  2. 7 3
      src/views/orderCenter/index.vue

+ 3 - 2
src/assets/language/zh.json

@@ -905,6 +905,7 @@
     "paymentMethod": "支付方式",
     "creationTime": "创建时间",
     "paymentTime": "支付时间",
+    "refundTime": "退款时间",
     "initiateRefund": "发起退款",
     "toBePaid": "待支付",
     "onlinePayment": "线上支付",
@@ -929,8 +930,8 @@
     "userNameLabel": "用户名",
     "userNamePlaceholder": "请输入用户名",
     "orderNoPlaceholder": "请输入订单编号",
-    "orderSerialNumberLabel": "订单流水号",
-    "orderSerialNumberPlaceholder": "请输入订单流水号",
+    "orderSerialNumberLabel": "商户单号",
+    "orderSerialNumberPlaceholder": "请输入商户单号",
     "equipmentNoPlaceholder": "请输入设备编号",
     "orderDate": "订单日期",
     "startTime": "开始时间",

+ 7 - 3
src/views/orderCenter/index.vue

@@ -162,6 +162,10 @@
               <span class="word2">{{ $t('orderCenter.orderNo') }}</span>
               <span class="info3">{{ refundObject.sn }}</span>
             </div>
+            <div v-if="refundObject.status != 0 && user.ifForeign === '0'" class="layer3 flex-row justify-between">
+              <span class="word2">{{ $t('orderCenter.orderSerialNumberLabel') }}</span>
+              <span class="info3">{{ refundObject.trxNo }}</span>
+            </div>
             <div class="layer3 flex-row justify-between">
               <span class="word2">{{ $t('orderCenter.commodity') }}</span>
               <span class="info3">{{ refundObject.productName }}</span>
@@ -183,14 +187,14 @@
               <span class="word7">{{ showPayType(refundObject) }}</span>
             </div>
             <div class="layer6 flex-row justify-between">
-              <span class="word6">{{ $t('orderCenter.creationTime') }}</span>
-              <span class="word7">{{ showOrderTime(refundObject, 2) }}</span>
+              <span class="word6">{{ refundObject.status === 1? $t('orderCenter.paymentTime') : refundObject.status === 3? $t('orderCenter.refundTime') : $t('orderCenter.creationTime') }}</span>
+              <span class="word7">{{ showOrderTime(refundObject, 1) }}</span>
             </div>
             <div v-if="refundObject.status === 3" class="layer7 flex-row justify-between">
               <span class="word8">{{ $t('orderCenter.refunded') }}</span>
               <span class="info4">{{ refundObject.refundAmount }}</span>
             </div>
-            <div v-if="refundObject.status === 3" class="layer7 flex-row justify-between">
+            <div v-if="refundObject.status === 3 && orderType == '3'" class="layer7 flex-row justify-between">
               <span class="word8">退款原因</span>
               <span class="info4">{{ refundObject.refundReason }}</span>
             </div>