Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
This commit is contained in:
commit
021d6e9545
|
@ -77,13 +77,18 @@ export default class adduserinfo extends React.Component{
|
||||||
}
|
}
|
||||||
//获取直连天下商品映射信息
|
//获取直连天下商品映射信息
|
||||||
getProductInfo(){
|
getProductInfo(){
|
||||||
// getProductInfoSelect().then((res)=>{
|
getProductInfoSelect().then((res)=>{
|
||||||
// handelResponse(res,(req,msg)=>{
|
handelResponse(res,(req,msg)=>{
|
||||||
let product_data = JSON.parse( sessionStorage.getItem("productData")) ;
|
let product_data = []
|
||||||
|
if(sessionStorage.getItem("productData"))
|
||||||
|
{
|
||||||
|
product_data = JSON.parse( sessionStorage.getItem("productData")) ;
|
||||||
|
}
|
||||||
|
|
||||||
let checked_product= product_data ? product_data : [];
|
let checked_product= product_data ? product_data : [];
|
||||||
|
|
||||||
let arr = [];
|
let arr = [];
|
||||||
_.map(data,(res)=>{
|
_.map(req.data,(res)=>{
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.key = res.id;
|
obj.key = res.id;
|
||||||
obj.text= res.title;
|
obj.text= res.title;
|
||||||
|
@ -100,9 +105,9 @@ export default class adduserinfo extends React.Component{
|
||||||
console.log(arr)
|
console.log(arr)
|
||||||
this.setState({"productOption":arr})
|
this.setState({"productOption":arr})
|
||||||
|
|
||||||
// },(err)=>{
|
},(err)=>{
|
||||||
// })
|
})
|
||||||
// })
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
cancel(){
|
cancel(){
|
||||||
|
|
|
@ -14,7 +14,7 @@ const data = [{"id":21,"title":"爱奇艺周卡组合商品测试专用","type":
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export default class adduserinfo extends React.Component{
|
export default class exchangedit extends React.Component{
|
||||||
constructor(props){
|
constructor(props){
|
||||||
super(props)
|
super(props)
|
||||||
this.state={
|
this.state={
|
||||||
|
@ -107,7 +107,9 @@ export default class adduserinfo extends React.Component{
|
||||||
getProductInfo(){
|
getProductInfo(){
|
||||||
// getProductInfoSelect().then((res)=>{
|
// getProductInfoSelect().then((res)=>{
|
||||||
// handelResponse(res,(req,msg)=>{
|
// handelResponse(res,(req,msg)=>{
|
||||||
let product_data = JSON.parse( sessionStorage.getItem("productData")) ;
|
let productData = sessionStorage.getItem("productData");
|
||||||
|
if(productData){
|
||||||
|
let product_data = JSON.parse( productData) ;
|
||||||
let checked_product= product_data ? product_data : [];
|
let checked_product= product_data ? product_data : [];
|
||||||
|
|
||||||
let arr = [];
|
let arr = [];
|
||||||
|
@ -127,7 +129,7 @@ export default class adduserinfo extends React.Component{
|
||||||
})
|
})
|
||||||
console.log(arr)
|
console.log(arr)
|
||||||
this.setState({"productOption":arr})
|
this.setState({"productOption":arr})
|
||||||
|
}
|
||||||
// },(err)=>{
|
// },(err)=>{
|
||||||
// })
|
// })
|
||||||
// })
|
// })
|
||||||
|
|
|
@ -46,17 +46,22 @@ export default class adduserinfo extends React.Component{
|
||||||
}
|
}
|
||||||
//获取直连天下商品映射信息
|
//获取直连天下商品映射信息
|
||||||
getProductInfo(){
|
getProductInfo(){
|
||||||
// getProductInfoSelect().then((res)=>{
|
getProductInfoSelect().then((res)=>{
|
||||||
// handelResponse(res,(req,msg)=>{
|
handelResponse(res,(req,msg)=>{
|
||||||
let product_data = JSON.parse( sessionStorage.getItem("productData")) ;
|
let product_data = []
|
||||||
|
if(sessionStorage.getItem("productData"))
|
||||||
|
{
|
||||||
|
product_data = JSON.parse( sessionStorage.getItem("productData")) ;
|
||||||
|
}
|
||||||
|
|
||||||
let checked_product= product_data ? product_data : [];
|
let checked_product= product_data ? product_data : [];
|
||||||
|
|
||||||
let arr = [];
|
let arr = [];
|
||||||
_.map(data,(res)=>{
|
_.map(req.data,(res)=>{
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.key = res.id;
|
obj.key = res.id;
|
||||||
obj.text= res.title;
|
obj.text= res.title;
|
||||||
obj.disabled = checked_product.findIndex((item)=>{return item.product_id == res.id}) > -1;
|
obj.disabled = checked_product.findIndex((item)=>{return item.id == res.id}) > -1;
|
||||||
if(obj.disabled)
|
if(obj.disabled)
|
||||||
{
|
{
|
||||||
console.log(obj.text)
|
console.log(obj.text)
|
||||||
|
@ -69,9 +74,9 @@ export default class adduserinfo extends React.Component{
|
||||||
console.log(arr)
|
console.log(arr)
|
||||||
this.setState({"productOption":arr})
|
this.setState({"productOption":arr})
|
||||||
|
|
||||||
// },(err)=>{
|
},(err)=>{
|
||||||
// })
|
})
|
||||||
// })
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async submit(){
|
async submit(){
|
||||||
|
|
|
@ -18,12 +18,12 @@ export default class edittemplate extends React.Component{
|
||||||
model:{
|
model:{
|
||||||
id:"",
|
id:"",
|
||||||
images:["https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/top.png","https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/center.png","https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/bottom.png"],
|
images:["https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/top.png","https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/center.png","https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/bottom.png"],
|
||||||
thumb:"",
|
thumb:null,
|
||||||
title:"标题",
|
title:"标题",
|
||||||
client:1,
|
client:1,
|
||||||
bg_color:"",
|
bg_color:"",
|
||||||
button_color:"",
|
button_color:"",
|
||||||
top_img:"",
|
top_img:null,
|
||||||
|
|
||||||
},
|
},
|
||||||
preview_visible:false,
|
preview_visible:false,
|
||||||
|
@ -126,13 +126,6 @@ export default class edittemplate extends React.Component{
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
putMyTheme(this.state.model.id,formdata).then((res)=>{
|
putMyTheme(this.state.model.id,formdata).then((res)=>{
|
||||||
handelResponse(res,(req,msg)=>{
|
handelResponse(res,(req,msg)=>{
|
||||||
Notify.success("保存成功")
|
Notify.success("保存成功")
|
||||||
|
@ -386,7 +379,7 @@ export default class edittemplate extends React.Component{
|
||||||
onChange={(e)=>{this.onUploadChange(e)} }
|
onChange={(e)=>{this.onUploadChange(e)} }
|
||||||
onUpload={this.onUpload}
|
onUpload={this.onUpload}
|
||||||
onError={this.onUploadError}
|
onError={this.onUploadError}
|
||||||
defaultFileList={ [{src: this.state.model.images[0]}] }
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
</FormItem>
|
</FormItem>
|
||||||
|
@ -403,7 +396,7 @@ export default class edittemplate extends React.Component{
|
||||||
onChange={(e)=>{this.onUploadChange1(e)}}
|
onChange={(e)=>{this.onUploadChange1(e)}}
|
||||||
onUpload={this.onUpload}
|
onUpload={this.onUpload}
|
||||||
onError={this.onUploadError}
|
onError={this.onUploadError}
|
||||||
defaultFileList={ [{src: this.state.model.images[1]}] }
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
</FormItem>
|
</FormItem>
|
||||||
|
@ -418,7 +411,7 @@ export default class edittemplate extends React.Component{
|
||||||
onChange={(e)=>{this.onUploadChange2(e)} }
|
onChange={(e)=>{this.onUploadChange2(e)} }
|
||||||
onUpload={this.onUpload}
|
onUpload={this.onUpload}
|
||||||
onError={this.onUploadError}
|
onError={this.onUploadError}
|
||||||
defaultFileList={ [{src: this.state.model.images[2]}] }
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
</FormItem>
|
</FormItem>
|
||||||
|
@ -433,7 +426,7 @@ export default class edittemplate extends React.Component{
|
||||||
onChange={(e)=>{this.onUploadChange3(e)} }
|
onChange={(e)=>{this.onUploadChange3(e)} }
|
||||||
onUpload={this.onUpload}
|
onUpload={this.onUpload}
|
||||||
onError={this.onUploadError}
|
onError={this.onUploadError}
|
||||||
defaultFileList={ [{src: this.state.model.thumb}] }
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
</FormItem>
|
</FormItem>
|
||||||
|
@ -448,7 +441,7 @@ export default class edittemplate extends React.Component{
|
||||||
onChange={(e)=>{this.onUploadChange4(e)} }
|
onChange={(e)=>{this.onUploadChange4(e)} }
|
||||||
onUpload={this.onUpload}
|
onUpload={this.onUpload}
|
||||||
onError={this.onUploadError}
|
onError={this.onUploadError}
|
||||||
defaultFileList={ [{src: this.state.model.top_img}] }
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
</FormItem>
|
</FormItem>
|
||||||
|
|
|
@ -42,6 +42,7 @@ function FormDom(props) {
|
||||||
let {authorization}=response;
|
let {authorization}=response;
|
||||||
sessionStorage.setItem('authorization',authorization);
|
sessionStorage.setItem('authorization',authorization);
|
||||||
sessionStorage.setItem('linkshowname',"营销计划管理");
|
sessionStorage.setItem('linkshowname',"营销计划管理");
|
||||||
|
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
props.history.push('/home/plan-list')
|
props.history.push('/home/plan-list')
|
||||||
},1000);
|
},1000);
|
||||||
|
|
|
@ -62,6 +62,8 @@ export default class acclist extends React.Component{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
let data = {
|
let data = {
|
||||||
page:1,
|
page:1,
|
||||||
limit:10
|
limit:10
|
||||||
|
|
|
@ -46,8 +46,9 @@ export default class adduserinfo extends React.Component{
|
||||||
}
|
}
|
||||||
//获取直连天下商品映射信息
|
//获取直连天下商品映射信息
|
||||||
getProductInfo(){
|
getProductInfo(){
|
||||||
// getProductInfoSelect().then((res)=>{
|
|
||||||
// handelResponse(res,(req,msg)=>{
|
getProductInfoSelect().then((res)=>{
|
||||||
|
handelResponse(res,(req,msg)=>{
|
||||||
let product_data = []
|
let product_data = []
|
||||||
if(sessionStorage.getItem("productData"))
|
if(sessionStorage.getItem("productData"))
|
||||||
{
|
{
|
||||||
|
@ -57,7 +58,7 @@ export default class adduserinfo extends React.Component{
|
||||||
let checked_product= product_data ? product_data : [];
|
let checked_product= product_data ? product_data : [];
|
||||||
|
|
||||||
let arr = [];
|
let arr = [];
|
||||||
_.map(data,(res)=>{
|
_.map(req.data,(res)=>{
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.key = res.id;
|
obj.key = res.id;
|
||||||
obj.text= res.title;
|
obj.text= res.title;
|
||||||
|
@ -73,11 +74,11 @@ export default class adduserinfo extends React.Component{
|
||||||
})
|
})
|
||||||
console.log(arr)
|
console.log(arr)
|
||||||
this.setState({"productOption":arr})
|
this.setState({"productOption":arr})
|
||||||
}
|
|
||||||
// },(err)=>{
|
|
||||||
// })
|
|
||||||
// })
|
|
||||||
|
|
||||||
|
},(err)=>{
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
async submit(){
|
async submit(){
|
||||||
if(this.refs.form1.validator())
|
if(this.refs.form1.validator())
|
||||||
|
|
Loading…
Reference in New Issue