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

Merge branch 'dev' of http://git.ycjcjy.com/estateagents/pc-channel into dev

xujing преди 4 години
родител
ревизия
1a1e03ef58
променени са 4 файла, в които са добавени 15 реда и са изтрити 6 реда
  1. 1
    1
      src/pages/fundManagement/ConsumeOrder.jsx
  2. 1
    1
      src/pages/fundManagement/RechargeOrder.jsx
  3. 1
    1
      src/pages/fundManagement/RefundOrder.jsx
  4. 12
    3
      src/services/apis.js

+ 1
- 1
src/pages/fundManagement/ConsumeOrder.jsx Целия файл

@@ -148,7 +148,7 @@ function header(props) {
148 148
             submitValue.startDate = null
149 149
             submitValue.endDate = null
150 150
         }
151
-        request({ ...apis.fund.orderExport, params: { orderType: 'redPacket', orgId, ...submitValue } }).then(data => {
151
+        request({ ...apis.fund.consumeOrderExport, params: { itemType: 'redPacket', orgId, ...submitValue } }).then(data => {
152 152
             if (!data) {
153 153
                 return
154 154
             }

+ 1
- 1
src/pages/fundManagement/RechargeOrder.jsx Целия файл

@@ -141,7 +141,7 @@ function header(props) {
141 141
             submitValue.startDate = null
142 142
             submitValue.endDate = null
143 143
         }
144
-        request({ ...apis.fund.orderExport, params: { orderType: 'recharge', orgId, ...submitValue } }).then(data => {
144
+        request({ ...apis.fund.rechargeOrderExport, params: { itemType: 'recharge', orgId, ...submitValue } }).then(data => {
145 145
             if (!data) {
146 146
                 return
147 147
             }

+ 1
- 1
src/pages/fundManagement/RefundOrder.jsx Целия файл

@@ -244,7 +244,7 @@ function header(props) {
244 244
             submitValue.startDate = null
245 245
             submitValue.endDate = null
246 246
         }
247
-        request({ ...apis.fund.orderExport, params: { orderType: 'refund', orgId, ...submitValue } }).then(data => {
247
+        request({ ...apis.fund.refundOrderExport, params: { itemType: 'refund', orgId, ...submitValue } }).then(data => {
248 248
             if (!data) {
249 249
                 return
250 250
             }

+ 12
- 3
src/services/apis.js Целия файл

@@ -253,12 +253,21 @@ const apis = {
253 253
       method: 'GET',
254 254
       action: 'channel',
255 255
     },
256
-    orderExport: {
257
-      url: `${prefix}/taOrgOrder/orgOrderExport`,
256
+    rechargeOrderExport: {
257
+      url: `${prefix}/taOrgOrder/rechargeOrderExport`,
258
+      method: 'GET',
259
+      action: 'channel',
260
+    },
261
+    consumeOrderExport: {
262
+      url: `${prefix}/taOrgOrder/consumeOrderExport`,
263
+      method: 'GET',
264
+      action: 'channel',
265
+    },
266
+    refundOrderExport: {
267
+      url: `${prefix}/taOrgOrder/refundOrderExport`,
258 268
       method: 'GET',
259 269
       action: 'channel',
260 270
     },
261
-
262 271
   },
263 272
   relatedOrganization: {
264 273
     get: {