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

This commit is contained in:
zhangds 2022-08-09 09:58:24 +08:00
parent bbf3444e2a 6545da20dd
commit bc1d38d195
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/input/main.js
View File

@ -184,7 +184,7 @@ import classNames from 'classnames'
{kind=="text"?<Icon type="eye-o" className="pwdShow"/>:<Icon className="pwdShow" type="closed-eye" />} {kind=="text"?<Icon type="eye-o" className="pwdShow"/>:<Icon className="pwdShow" type="closed-eye" />}
</span>:null} </span>:null}
{disabled==false&&clearShow==true&&this.state.iptVal?<svg onClick={this.clearItem.bind(this)} viewBox="0 0 16 16" width="16px" height="16px"><circle fill="#AAAFBA" fillRule="evenodd" cx="8" cy="8" r="8"></circle><path d="M5.333 5.333l5.334 5.334M10.667 5.333l-5.334 5.334" stroke="#FFF" strokeLinecap="square"></path></svg>:null} {disabled==false&&clearShow==true&&this.state.iptVal?<svg onClick={this.clearItem.bind(this)} viewBox="0 0 16 16" width="16px" height="16px"><circle fill="#AAAFBA" fillRule="evenodd" cx="8" cy="8" r="8"></circle><path d="M5.333 5.333l5.334 5.334M10.667 5.333l-5.334 5.334" stroke="#FFF" strokeLinecap="square"></path></svg>:null}
{disabled==false&&countShow==true?<span className="countTip">{this.props.value.length}/{maxLength}</span>:null} {disabled==false&&countShow==true?<span className="countTip">{String(this.props.value).length}/{maxLength}</span>:null}
{unit?<font className="unit">{unit}</font>:null} {unit?<font className="unit">{unit}</font>:null}
</div> </div>

16
src/pages/exchangecode/copyCode/index.jsx
View File

@ -210,14 +210,13 @@ export default class acclist extends React.Component {
pr.quantity = item.quantity pr.quantity = item.quantity
pr.describe = item.describe pr.describe = item.describe
pr.product = item.product pr.product = item.product
pr.checked = true
/* 不是复制得兑换码 无法编辑 */ /* 不是复制得兑换码 无法编辑 */
if (copy_code_id !== item.id) { if (copy_code_id === item.id) {
pr.checked = true pr.title = `${item.title}_${item.copy_count + 1}`
pr.disabled = true
pr.title = item.title
} else { } else {
pr.checked = true pr.title = item.title
pr.title = item.title + '_' + ++req.copy_count pr.disabled = true
} }
return pr return pr
}) })
@ -706,6 +705,7 @@ export default class acclist extends React.Component {
dataCopy.map((item) => dataCopy.map((item) =>
item.products.map(() => { item.products.map(() => {
item.copy_code_batch_id = copy_code_batch_id
item.product = { item.product = {
legal: item.products.filter((item2) => item2.type == 1), legal: item.products.filter((item2) => item2.type == 1),
reduce: item.products reduce: item.products
@ -742,7 +742,6 @@ export default class acclist extends React.Component {
reseller_name: this.state.reseller.name, reseller_name: this.state.reseller.name,
company_name: this.state.reseller.company_name, company_name: this.state.reseller.company_name,
receive_email: this.state.reseller.contact_email[0], receive_email: this.state.reseller.contact_email[0],
copy_code_batch_id,
payment_direction: payment_direction:
this.state.payment_direction[this.state.paytype - 1] this.state.payment_direction[this.state.paytype - 1]
} }
@ -777,7 +776,6 @@ export default class acclist extends React.Component {
reseller_name: this.state.reseller?.name, reseller_name: this.state.reseller?.name,
company_name: this.state.reseller?.company_name, company_name: this.state.reseller?.company_name,
receive_email: this.state.reseller?.contact_email[0], receive_email: this.state.reseller?.contact_email[0],
copy_code_batch_id,
payment_direction: payment_direction:
this.state.payment_direction[this.state.paytype - 1] this.state.payment_direction[this.state.paytype - 1]
} }
@ -812,7 +810,6 @@ export default class acclist extends React.Component {
reseller_name: this.state.reseller.name, reseller_name: this.state.reseller.name,
company_name: this.state.reseller.company_name, company_name: this.state.reseller.company_name,
receive_email: this.state.reseller.contact_email[0], receive_email: this.state.reseller.contact_email[0],
copy_code_batch_id,
payment_direction: payment_direction:
this.state.payment_direction[this.state.paytype - 1] this.state.payment_direction[this.state.paytype - 1]
} }
@ -857,7 +854,6 @@ export default class acclist extends React.Component {
mobile_excel: this.state.mobile_excel, mobile_excel: this.state.mobile_excel,
mobile_repeat: this.state.mobile_repeat, mobile_repeat: this.state.mobile_repeat,
code_batch: dataCopy, code_batch: dataCopy,
copy_code_batch_id,
reseller_id: this.state.reseller.id, reseller_id: this.state.reseller.id,
reseller_name: this.state.reseller.name, reseller_name: this.state.reseller.name,
company_name: this.state.reseller.company_name, company_name: this.state.reseller.company_name,