HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

This commit is contained in:
red-deng-deng 2021-11-25 13:42:25 +08:00
parent 70dd51d1cd b3f5b3c041
commit 021d6e9545
7 changed files with 83 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/pages/exchangecode/commodity/goodedit.js
View File

@ -77,32 +77,37 @@ 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 = []
let checked_product= product_data ? product_data : []; if(sessionStorage.getItem("productData"))
{
let arr = []; product_data = JSON.parse( sessionStorage.getItem("productData")) ;
_.map(data,(res)=>{ }
let obj = {};
obj.key = res.id; let checked_product= product_data ? product_data : [];
obj.text= res.title;
obj.disabled = checked_product.findIndex((item)=>{return item.id == res.id}) > -1; let arr = [];
if(obj.disabled) _.map(req.data,(res)=>{
{ let obj = {};
console.log(obj.text) obj.key = res.id;
} obj.text= res.title;
obj.disabled = checked_product.findIndex((item)=>{return item.id == res.id}) > -1;
arr.push(obj) if(obj.disabled)
{
return obj; console.log(obj.text)
}) }
console.log(arr)
this.setState({"productOption":arr}) arr.push(obj)
// },(err)=>{ return obj;
// }) })
// }) console.log(arr)
this.setState({"productOption":arr})
},(err)=>{
})
})
} }
cancel(){ cancel(){

10
src/pages/exchangecode/edit/edit.js
View File

@ -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,8 +107,10 @@ 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");
let checked_product= product_data ? product_data : []; if(productData){
let product_data = JSON.parse( productData) ;
let checked_product= product_data ? product_data : [];
let arr = []; let arr = [];
_.map(data,(res)=>{ _.map(data,(res)=>{
@ -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)=>{
// }) // })
// }) // })

47
src/pages/exchangecode/product/add.js
View File

@ -46,32 +46,37 @@ 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 = []
let checked_product= product_data ? product_data : []; if(sessionStorage.getItem("productData"))
let arr = [];
_.map(data,(res)=>{
let obj = {};
obj.key = res.id;
obj.text= res.title;
obj.disabled = checked_product.findIndex((item)=>{return item.product_id == res.id}) > -1;
if(obj.disabled)
{ {
console.log(obj.text) product_data = JSON.parse( sessionStorage.getItem("productData")) ;
} }
arr.push(obj) let checked_product= product_data ? product_data : [];
return obj; let arr = [];
_.map(req.data,(res)=>{
let obj = {};
obj.key = res.id;
obj.text= res.title;
obj.disabled = checked_product.findIndex((item)=>{return item.id == res.id}) > -1;
if(obj.disabled)
{
console.log(obj.text)
}
arr.push(obj)
return obj;
})
console.log(arr)
this.setState({"productOption":arr})
},(err)=>{
})
}) })
console.log(arr)
this.setState({"productOption":arr})
// },(err)=>{
// })
// })
} }
async submit(){ async submit(){

23
src/pages/exchangepage/edittemplate/main.js
View File

@ -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,
@ -125,14 +125,7 @@ export default class edittemplate extends React.Component{
if(this.state.model.id > 0) if(this.state.model.id > 0)
{ {
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>

1
src/pages/login/loginform.js
View File

@ -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);

2
src/pages/plan/list/list.js
View File

@ -62,6 +62,8 @@ export default class acclist extends React.Component{
let data = { let data = {
page:1, page:1,
limit:10 limit:10

17
src/pages/plan/product/add.js
View File

@ -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())