冲突修改

src/api/school-center/salesOrder.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 智能平台账号实名
+let salesOrderInfo = (params) => postAction(prefix + "/salesList/salesOrderInfo" , params);
+let ysmUserNotThrough = (id,params) => postAction(prefix + "/ysmUser/notThrough/"+id,params);
+let ysmUserInsert = (params) => postAction(prefix + "/ysmUser/insert" , params);
+let ysmUserUpdate = (params) => postAction(prefix + "/ysmUser/update",params);
+
+export {
+    salesOrderInfo,
+    ysmUserNotThrough,
+    ysmUserInsert,
+    ysmUserUpdate
+
+}

src/api/school-center/salesOrdersAPI.js

+import {postAction,getAotion,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 获取县分下拉列表
+let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params);
+
+// 获取学校下拉列表
+let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params);
+// 获取活动列表
+let getList = (params) => postAction(prefix + "/salesOrders/list" , params);
+
+// 删除
+let deleteOrder = (params) => postAction(prefix + "/salesOrders/deleteOrder" , params);
+
+// 下载放号上传模板
+let downloadTemplateFH = (params) => downFilePost(prefix + "/salesOrders/downloadTemplateFH" , params);
+
+// 下载充值审核模板
+let downloadTemplateCZ = (params) => downFilePost(prefix + "/salesOrders/downloadTemplateCZ" , params);
+
+// 上传图片
+// let uploadImg = (params) => postAction(prefix + "/salesOrders/uploadImg" , params);
+
+// 下载导入结果清单
+let downloadResult = (params) => downFilePost(prefix + "/salesOrders/exportResult" , params);
+
+// 导出订单
+let exportList = (params) => downFilePost(prefix + "/salesOrders/exportOrderList" , params);
+
+export {
+    getList,deleteOrder,getSubstList,getSchoolList,downloadTemplateFH,downloadTemplateCZ,
+    downloadResult,exportList
+}