浏览代码

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

xujing 4 年前
父节点
当前提交
1a1e03ef58

+ 1
- 1
src/pages/fundManagement/ConsumeOrder.jsx 查看文件

148
             submitValue.startDate = null
148
             submitValue.startDate = null
149
             submitValue.endDate = null
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
             if (!data) {
152
             if (!data) {
153
                 return
153
                 return
154
             }
154
             }

+ 1
- 1
src/pages/fundManagement/RechargeOrder.jsx 查看文件

141
             submitValue.startDate = null
141
             submitValue.startDate = null
142
             submitValue.endDate = null
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
             if (!data) {
145
             if (!data) {
146
                 return
146
                 return
147
             }
147
             }

+ 1
- 1
src/pages/fundManagement/RefundOrder.jsx 查看文件

244
             submitValue.startDate = null
244
             submitValue.startDate = null
245
             submitValue.endDate = null
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
             if (!data) {
248
             if (!data) {
249
                 return
249
                 return
250
             }
250
             }

+ 12
- 3
src/services/apis.js 查看文件

253
       method: 'GET',
253
       method: 'GET',
254
       action: 'channel',
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
       method: 'GET',
268
       method: 'GET',
259
       action: 'channel',
269
       action: 'channel',
260
     },
270
     },
261
-
262
   },
271
   },
263
   relatedOrganization: {
272
   relatedOrganization: {
264
     get: {
273
     get: {