diff --git a/src/assets/api.js b/src/assets/api.js
index 5bd1f95d..9b9edb54 100644
--- a/src/assets/api.js
+++ b/src/assets/api.js
@@ -2,7 +2,28 @@
export const baseurl = 'http://market.api.system.com'
-
+// const getImg=(url)=>{
+// const xhr = new XMLHttpRequest()
+// xhr.open('GET', url)
+// xhr.responseType = "arraybuffer";
+// xhr.onreadystatechange = function (response) {
+// response.header = {
+// 'Accept': 'application/json',
+// 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
+// }
+
+// var byteArray = new Uint8Array(response.target.response);
+// var binary = '';
+// for (var i = 0; i < byteArray.byteLength; i++) {
+// binary += String.fromCharCode(byteArray[i]);
+// }
+// let str = 'data:image/png;base64,' + window.btoa(binary)
+// console.log(func)
+// func(str,xhr);
+
+// }
+// xhr.send()
+// }
@@ -13,6 +34,10 @@ const req = (method, url, params, responseType) => {
var obj = {
method: method,
params: params,
+ headers: new Headers({
+ 'Content-Type': 'image/png; charset=utf-8'
+ })
+
}
}
if(method == "post")
@@ -25,14 +50,24 @@ const req = (method, url, params, responseType) => {
})
}
}
- return fetch(url).then(res => res.json()).catch(error => console.error('Error:', error)).then(response => console.log('Success:', response));
+ let http = fetch(url).then(res => res.json());
+ return http.then(response =>response.data ).catch(error => console.error('Error:', error));
}
+
+
+
//营销计划列表
export const getPlanList = (params) => {
return req('get', baseurl + "/plan", params)
}
+//获取分销商下拉菜单
+export const getReSellerOption = (params) => {
+ return req('get', baseurl + "/reseller/choice", params)
+}
+
+
//新建营销计划
export const getPlanStep = (id,params) => {
return req('get', baseurl + "/plan/step/:"+id, params)
@@ -82,6 +117,8 @@ export const putKeyEmail = (id,params) => {
return req('put', baseurl + "/keys/receive/:"+id, params)
}
+
+
//销售单中的出库
export {
req
diff --git a/src/pages/plan/add/step1.js b/src/pages/plan/add/step1.js
index 698be412..65bbe3a4 100644
--- a/src/pages/plan/add/step1.js
+++ b/src/pages/plan/add/step1.js
@@ -6,6 +6,7 @@ import Ipt from "../../../components/input/main"
import Form from "../../../components/form/main"
import FormItem from "../../../components/form-item/main"
import Bus from "../../../assets/eventBus.js"
+import {getVerify,getReSellerOption} from "../../../assets/api.js"
const TabPanel = Tabs.TabPanel;
export default class acclist extends React.Component{
@@ -18,13 +19,23 @@ export default class acclist extends React.Component{
reseller:null,
return_id:"1",
date_time:""
- }
+ },
+ reseller_option:[]
}
}
componentDidMount(e){
-
+
+
+
+
}
+
+ getReSellerOption()
+ {
+
+ }
+
submit(){
if(this.refs.form1.validator())
@@ -38,7 +49,6 @@ export default class acclist extends React.Component{
}
onTypeChange(e){
- console.log(e.target.value)
let model = this.state.model;
model.type = e.target.value;
this.setState({model:model})
@@ -114,13 +124,6 @@ export default class acclist extends React.Component{
} } />
-
-
- 直接返回
- 卡单
-
-
-