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 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu

This commit is contained in:
zhangds 2022-06-24 16:10:36 +08:00
parent e0779faaa9 b6256fd0c7
commit 8b19c1e484
2 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/index.html
View File

@ -1,14 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta <meta name="description" content="Web site created using create-react-app" />
name="description"
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
@ -29,7 +27,9 @@
--> -->
<title>营销管理系统</title> <title>营销管理系统</title>
<style> <style>
html,body,#root{ html,
body,
#root {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 0; padding: 0;
@ -37,11 +37,11 @@
font-size: 14px; font-size: 14px;
overflow: hidden; overflow: hidden;
} }
#root{
} #root {}
</style> </style>
</head> </head>
<body> <body>
<script type="text/javascript"> <script type="text/javascript">
window.goods = product; window.goods = product;
@ -59,4 +59,5 @@
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>

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

@ -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
}) })
@ -361,13 +361,13 @@ export default class adduserinfo extends React.Component {
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,16 +407,16 @@ 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}