Merge remote-tracking branch 'origin/dev' into dev

c7ac5734 · Marcus · 8b5d1375 · 457d8c36 · c7ac5734 · c7ac5734
Commit c7ac5734 authored Jul 19, 2022 by Marcus
Expand all Show whitespace changes
Inline Side-by-side

Showing with 213 additions and 267 deletions

dict.js src/utils/dict.js +1 -1

index.vue src/views/ecw/currencyEcash/index.vue +212 -266

No files found.
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -142,7 +142,7 @@ export const DICT_TYPE = {
  BEGINTIME_TYPE_ENDTIME: 'begintime_type_endtime',//订单日期筛选类别
  ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
  ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态
-  ECASH_INIT:'ecash_init',//e-cash
+  ECASH_INIT:'ecash_init', //e-cash
 }

 /**

--- a/src/views/ecw/currencyEcash/index.vue
+++ b/src/views/ecw/currencyEcash/index.vue