Merge branch 'dev-td' into 'master-td'

Dev td

See merge request !5

src/api/order/orderActive.js

@@ -4,6 +4,30 @@ export function page(query) {
   return fetch({
     url: '/api/order/order/activity/getAll',
     method: 'get',
-		params:query
+    params: query
   });
 }
+export function page2(query) {
+  return fetch({
+    url: '/api/order/tainde/orderActivity/selectList',
+    method: 'get',
+    params: query
+  });
+}
+
+export function activeAmountTotal(query) {
+  return fetch({
+    url: '/api/order/tainde/orderActivity/selectListStatic',
+    method: 'get',
+    params: query
+  });
+}
+
+export function excelExport(query) {
+  return fetch({
+    url: '/api/order/tainde/orderActivity/export',
+    method: 'post',
+    data: query,
+    responseType: 'blob'
+  })
+}