Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
This commit is contained in:
commit
8b19c1e484
|
@ -1,16 +1,14 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
<head>
|
||||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
<meta charset="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||||
<meta name="theme-color" content="#000000" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<meta
|
<meta name="theme-color" content="#000000" />
|
||||||
name="description"
|
<meta name="description" content="Web site created using create-react-app" />
|
||||||
content="Web site created using create-react-app"
|
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||||
/>
|
<!--
|
||||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
|
||||||
<!--
|
|
||||||
manifest.json provides metadata used when your web app is installed on a
|
manifest.json provides metadata used when your web app is installed on a
|
||||||
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
||||||
-->
|
-->
|
||||||
|
@ -27,28 +25,30 @@
|
||||||
work correctly both with client-side routing and a non-root public URL.
|
work correctly both with client-side routing and a non-root public URL.
|
||||||
Learn how to configure a non-root public URL by running `npm run build`.
|
Learn how to configure a non-root public URL by running `npm run build`.
|
||||||
-->
|
-->
|
||||||
<title>营销管理系统</title>
|
<title>营销管理系统</title>
|
||||||
<style>
|
<style>
|
||||||
html,body,#root{
|
html,
|
||||||
width: 100%;
|
body,
|
||||||
height: 100%;
|
#root {
|
||||||
padding: 0;
|
width: 100%;
|
||||||
margin: 0;
|
height: 100%;
|
||||||
font-size: 14px;
|
padding: 0;
|
||||||
overflow: hidden;
|
margin: 0;
|
||||||
}
|
font-size: 14px;
|
||||||
#root{
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
#root {}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
|
||||||
<script type="text/javascript">
|
<body>
|
||||||
window.goods = product;
|
<script type="text/javascript">
|
||||||
</script>
|
window.goods = product;
|
||||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
</script>
|
||||||
<div id="root"></div>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
<!--
|
<div id="root"></div>
|
||||||
|
<!--
|
||||||
This HTML file is a template.
|
This HTML file is a template.
|
||||||
If you open it directly in the browser, you will see an empty page.
|
If you open it directly in the browser, you will see an empty page.
|
||||||
|
|
||||||
|
@ -58,5 +58,6 @@
|
||||||
To begin the development, run `npm start` or `yarn start`.
|
To begin the development, run `npm start` or `yarn start`.
|
||||||
To create a production bundle, use `npm run build` or `yarn build`.
|
To create a production bundle, use `npm run build` or `yarn build`.
|
||||||
-->
|
-->
|
||||||
</body>
|
</body>
|
||||||
</html>
|
|
||||||
|
</html>
|
|
@ -126,7 +126,7 @@ export default class adduserinfo extends React.Component {
|
||||||
model.stock = model_temp.stock
|
model.stock = model_temp.stock
|
||||||
model.usage = model_temp.usage
|
model.usage = model_temp.usage
|
||||||
model.map_product_name = model_temp.map_product_name
|
model.map_product_name = model_temp.map_product_name
|
||||||
console.log("model => 编辑", model);
|
console.log('model => 编辑', model)
|
||||||
this.setState({ model: model })
|
this.setState({ model: model })
|
||||||
}
|
}
|
||||||
this.getProductInfo()
|
this.getProductInfo()
|
||||||
|
@ -286,7 +286,7 @@ export default class adduserinfo extends React.Component {
|
||||||
map_product_name: cur_product.title,
|
map_product_name: cur_product.title,
|
||||||
account_type: cur_product.account_type
|
account_type: cur_product.account_type
|
||||||
}
|
}
|
||||||
console.log("model2 =>111", model2);
|
console.log('model2 =>111', model2)
|
||||||
this.setState({ model: model2, productpic: obj2 })
|
this.setState({ model: model2, productpic: obj2 })
|
||||||
}
|
}
|
||||||
onTypeChange(e) {
|
onTypeChange(e) {
|
||||||
|
@ -323,7 +323,7 @@ export default class adduserinfo extends React.Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
onUploadChange1(files, e) {
|
onUploadChange1(files, e) {
|
||||||
console.log("编辑 ==>files", files)
|
console.log('编辑 ==>files', files)
|
||||||
let arr = _.map(files, (o) => {
|
let arr = _.map(files, (o) => {
|
||||||
return o.id
|
return o.id
|
||||||
})
|
})
|
||||||
|
@ -358,16 +358,16 @@ export default class adduserinfo extends React.Component {
|
||||||
(req, msg) => {
|
(req, msg) => {
|
||||||
path = req.path
|
path = req.path
|
||||||
let obj = {
|
let obj = {
|
||||||
id:files[i].id,
|
id: files[i].id,
|
||||||
name: files[i].name,
|
name: files[i].name,
|
||||||
url: path,
|
url: path,
|
||||||
type:"add"
|
type: 'add'
|
||||||
}
|
}
|
||||||
let obj1 = {
|
let obj1 = {
|
||||||
id:files[i].id,
|
id: files[i].id,
|
||||||
name: files[i].name,
|
name: files[i].name,
|
||||||
src: path,
|
src: path,
|
||||||
type:"add"
|
type: 'add'
|
||||||
}
|
}
|
||||||
const model = this.state.model
|
const model = this.state.model
|
||||||
model.describe_url.push(obj1)
|
model.describe_url.push(obj1)
|
||||||
|
@ -407,17 +407,17 @@ export default class adduserinfo extends React.Component {
|
||||||
}
|
}
|
||||||
this.setState({ productpic: temp_arr })
|
this.setState({ productpic: temp_arr })
|
||||||
console.log(this.state.model)
|
console.log(this.state.model)
|
||||||
console.log("temp_arr =>", temp_arr);
|
console.log('temp_arr =>', temp_arr)
|
||||||
|
|
||||||
let left_temp_arr = temp_arr.map(item =>{
|
let left_temp_arr = temp_arr.map((item) => {
|
||||||
return {
|
return {
|
||||||
...item,
|
...item,
|
||||||
src:item.url
|
src: item.url
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
let models = this.state.model;
|
let models = this.state.model
|
||||||
models.describe_url = left_temp_arr;
|
models.describe_url = left_temp_arr
|
||||||
this.setState({model:models})
|
this.setState({ model: models })
|
||||||
}
|
}
|
||||||
}, 500)
|
}, 500)
|
||||||
}
|
}
|
||||||
|
@ -631,7 +631,10 @@ export default class adduserinfo extends React.Component {
|
||||||
value={this.state.model.show_url}
|
value={this.state.model.show_url}
|
||||||
/>
|
/>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
<FormItem prop='describe_url' labelname='商品图2222' id='describe_url'>
|
<FormItem
|
||||||
|
prop='describe_url'
|
||||||
|
labelname='商品图2222'
|
||||||
|
id='describe_url'>
|
||||||
<ImageUpload
|
<ImageUpload
|
||||||
className='good-image-upload-demo'
|
className='good-image-upload-demo'
|
||||||
maxSize={2 * 1024 * 1024}
|
maxSize={2 * 1024 * 1024}
|
||||||
|
|
Loading…
Reference in New Issue