From 861d727d50210b4ee89c5509e1c3669b58947639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=A3=9A?= <849005670@qq.com>
Date: Fri, 21 Jan 2022 18:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BD=E5=90=8D=E5=8D=95?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/api.js | 2 +-
src/pages/exchangecode/add/add.js | 5 +++--
src/pages/plan/add/add.js | 2 +-
src/pages/plan/add/edit.js | 4 ++--
src/pages/plan/add/step2.js | 23 ++++++++++++++++++-----
src/pages/plan/add/step3.js | 11 ++++++++---
src/pages/plan/key/edit.js | 1 +
7 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/src/assets/api.js b/src/assets/api.js
index f5637241..8c55e30f 100644
--- a/src/assets/api.js
+++ b/src/assets/api.js
@@ -800,7 +800,7 @@ export const putMyTheme= (id,data) => {
}
export const getThemeChoice= (data) => {
- return upload('get', baseurl + "/plan/theme/choice",data)
+ return req('get', baseurl + "/plan/theme/choice",data)
}
diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js
index 15bf87c9..545f0790 100644
--- a/src/pages/exchangecode/add/add.js
+++ b/src/pages/exchangecode/add/add.js
@@ -76,7 +76,7 @@ export default class acclist extends React.Component{
payment_direction:["对私账户","对公账户","预付款扣除"],
import_visible:false,
- white_visible:true,
+ white_visible:false,
success_visible:false,
fail_visible:false,
file_loading:false,
@@ -267,7 +267,7 @@ export default class acclist extends React.Component{
model2.style = e.target.value;
model2.quantity = 0
this.setState({model:model2})
- if(e.target.value == 1)
+ if(e.target.value == 6)
{
this.setState({white_visible:true})
}
@@ -1117,6 +1117,7 @@ export default class acclist extends React.Component{
串码
链接
二维码
+ 白名单
diff --git a/src/pages/plan/add/add.js b/src/pages/plan/add/add.js
index d701b1d4..d6eef915 100644
--- a/src/pages/plan/add/add.js
+++ b/src/pages/plan/add/add.js
@@ -161,7 +161,7 @@ export default class add extends React.Component{
{
let obj = {
"info":JSON.parse( sessionStorage.getItem("step1")),
- "key": JSON.parse( sessionStorage.getItem("step2")),
+ "key": JSON.parse( sessionStorage.getItem("step2")),
"theme": data,
"complete":true
}
diff --git a/src/pages/plan/add/edit.js b/src/pages/plan/add/edit.js
index a09b373a..ec1c63b1 100644
--- a/src/pages/plan/add/edit.js
+++ b/src/pages/plan/add/edit.js
@@ -527,10 +527,10 @@ export default class add extends React.Component{
}
onStyleChange(e){
console.log("状态",e.target.value)
- if(e.target.value == 5)
+ if(e.target.value == 6)
{
this.setState({whiteStyle:true})
- this.setState({keyStyle:5})
+ this.setState({keyStyle:6})
}
else{
this.setState({keyStyle:e.target.value})
diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js
index e38ccce1..49a9bfad 100644
--- a/src/pages/plan/add/step2.js
+++ b/src/pages/plan/add/step2.js
@@ -94,7 +94,7 @@ export default class acclist extends React.Component{
{
this.setState({whiteStyle:this.props.whiteStyle})
- if(this.props.keyStyle == 5)
+ if(this.props.keyStyle == 6)
{
this.setState({white_visible:this.props.whiteStyle})
}
@@ -111,7 +111,7 @@ export default class acclist extends React.Component{
{
let data = {};
data.batch_name = this.state.model.batch_name;
- data.style = this.state.model.style == 5 ? 1 : this.state.model.style;
+ data.style = this.state.model.style;
data.quantity = this.state.model.quantity;
data.bind_object = this.state.checkedList;
data.allow_repetition = this.state.model.allow_repetition;
@@ -120,6 +120,14 @@ export default class acclist extends React.Component{
data.code_batch = this.refs.tempdata.getSelectData();
data.mobile_excel = this.state.mobile_excel
data.mobile_repeat = this.state.mobile_repeat
+
+ console.log("key样式",data.style)
+ if(data.style == 6)
+ {
+
+ sessionStorage.setItem("white",1)
+ }
+
return data;
}
return valide
@@ -140,7 +148,7 @@ export default class acclist extends React.Component{
model2.style = e.target.value;
model2.quantity = 0
this.setState({model:model2})
- if(e.target.value == 5)
+ if(e.target.value == 6)
{
this.setState({white_visible:true})
}
@@ -252,7 +260,7 @@ export default class acclist extends React.Component{
model.style = nextProps.keyStyle
this.setState({model:model})
- if(model.style == 5)
+ if(model.style == 6)
{
this.setState({white_visible:true})
}
@@ -430,6 +438,11 @@ export default class acclist extends React.Component{
draw_title:data.draw_title,
}
+
+ if(model.style == 6)
+ {
+ this.setState({white_visible:true})
+ }
this.setState({model:model})
this.setState({checkedList:data.bind_object.map(Number)})
@@ -936,7 +949,7 @@ export default class acclist extends React.Component{
0 && this.state.model.style !=1} >串码
0 && this.state.model.style !=2} >链接
0 && this.state.model.style !=4} >二维码
- 0 && this.state.model.style !=5} >白名单
+ 0 && this.state.model.style !=6} >白名单
diff --git a/src/pages/plan/add/step3.js b/src/pages/plan/add/step3.js
index 9d3a7d12..ed51a27c 100644
--- a/src/pages/plan/add/step3.js
+++ b/src/pages/plan/add/step3.js
@@ -36,8 +36,14 @@ export default class acclist extends React.Component{
getThemeData(){
+ let params = {}
+ if(sessionStorage.getItem("white") == 1)
+ {
+ params.page = 1
+ }
- getThemeChoice().then((res)=>{
+
+ getThemeChoice(params).then((res)=>{
handelResponse(res,(req,msg)=>{
let arr = _.map(req,(o)=>{
let obj = {};
@@ -100,7 +106,6 @@ export default class acclist extends React.Component{
onThemeChange(e)
{
let model2 = this.state.model;
-
model2.theme_id = e;
this.setState({model:model2})
}
@@ -116,7 +121,7 @@ export default class acclist extends React.Component{
edit(data)
{
let model={ //数据模型不可少
- "theme_id":192 ,
+ "theme_id":192 ,
"use": data.use,
"link": data.link
}
diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js
index 44105613..3cc5bd3a 100644
--- a/src/pages/plan/key/edit.js
+++ b/src/pages/plan/key/edit.js
@@ -993,6 +993,7 @@ export default class acclist extends React.Component{
串码
链接
二维码
+ 白名单