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'

This commit is contained in:
Apple 2022-07-25 10:36:33 +08:00
parent d4565c1920 e6ddbfa168
commit 3ea63de86b
7 changed files with 8153 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/webpack.config.js
View File

@ -261,7 +261,9 @@ module.exports = function (webpackEnv) {
// https://github.com/facebook/create-react-app/issues/5250 // https://github.com/facebook/create-react-app/issues/5250
// Pending further investigation: // Pending further investigation:
// https://github.com/terser-js/terser/issues/120 // https://github.com/terser-js/terser/issues/120
inline: 2 inline: 2,
drop_console: true,
drop_debugger: true
}, },
mangle: { mangle: {
safari10: true safari10: true

2235
public/goods_new_v3.js Normal file
View File

File diff suppressed because it is too large Load Diff

5883
public/goods_new_v4.js Normal file
View File

File diff suppressed because it is too large Load Diff

16
public/index.html
View File

@ -1,3 +1,11 @@
<!--
* @Author: Wind
* @Date: 2022-07-15 17:48:05
* @LastEditors: Wind
* @LastEditTime: 2022-07-25 09:55:19
* @Description:
* @FilePath: \frontend\public\index.html
-->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -12,11 +20,9 @@
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/
--> -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/goods_new_v2.js?v4"> <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/goods_new_v3.js?v3"></script>
<!--
</script>
<!--
Notice the use of %PUBLIC_URL% in the tags above. Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build. It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML. Only files inside the `public` folder can be referenced from the HTML.

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

@ -257,22 +257,25 @@ export default class adduserinfo extends React.Component {
let picItem = window.goods.find((item) => { let picItem = window.goods.find((item) => {
return item.id == cur_product.product_category_id return item.id == cur_product.product_category_id
}) })
console.log(picItem)
const productItem = picItem?.products.find(
(item) => item.id == cur_product.id
)
const obj1 = [] const obj1 = []
const obj2 = [] const obj2 = []
productItem?.pic.map((item, index) => {
picItem?.describe_url.map((item, index) => {
obj1.push({ obj1.push({
src: item, src: item,
id: item, id: item + index,
type: 'add', type: 'add',
name: picItem.name + index name: productItem.title + index
}) })
obj2.push({ obj2.push({
url: item, url: item,
id: item, id: item + index,
type: 'add', type: 'add',
name: picItem.name + index name: productItem.title + index
}) })
}) })
console.log(' picItem =>', picItem) console.log(' picItem =>', picItem)
@ -633,7 +636,7 @@ export default class adduserinfo extends React.Component {
}} }}
fileList={ fileList={
this.state.model.show_url this.state.model.show_url
? [{ src: this.state.model.show_url }] ? [{ src: this.state.model.show_url, id: 1 }]
: null : null
} }
value={this.state.model.show_url} value={this.state.model.show_url}

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

@ -256,16 +256,20 @@ export default class adduserinfo extends React.Component {
const obj1 = [] const obj1 = []
const obj2 = [] const obj2 = []
picItem?.describe_url.map((item, index) => { const productItem = picItem?.products.find(
(item) => item.id == cur_product.id
)
productItem?.pic.map((item, index) => {
obj1.push({ obj1.push({
src: item, src: item,
name: item + index, id: item + index,
id: item name: productItem.title + index
}) })
obj2.push({ obj2.push({
url: item, url: item,
name: item + index, id: item + index,
id: item name: productItem.title + index
}) })
}) })
model2.describe_url = obj1 model2.describe_url = obj1