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 'master' of https://gitee.com/red-deng-deng/marketing-system

This commit is contained in:
北海一刀 2021-11-16 09:34:10 +08:00
parent 78fa8777cd d0fcc78cd4
commit 482367c814
6 changed files with 78 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/exchangecode/addruleform/addruleform.js
View File

@ -65,7 +65,7 @@ function Addruleform(){
];
const distdata=[{id:123321,goodsname:'爱奇艺月卡',price:134,contract:45,official:'30.00',stock:111},{id:123321,goodsname:'爱奇艺月卡',price:134,contract:45,official:'30.00',stock:111},{id:123321,goodsname:'爱奇艺月卡',price:134,contract:45,official:'30.00',stock:111},{id:123321,goodsname:'爱奇艺月卡',price:134,contract:45,official:'30.00',stock:111},{id:123321,goodsname:'爱奇艺月卡',price:134,contract:45,official:'30.00',stock:111},{id:123321,goodsname:'爱奇艺月卡',price:134,contract:45,official:'30.00',stock:111}]
return(
<div>
<div className="addruleForm">
<Form
form={form}

7
src/pages/exchangecode/addruleform/addruleform.less
View File

@ -1,3 +1,10 @@
.addruleForm{
.zent-datepicker-trigger{
background: none!important;
width: 320px;
border-bottom: 1px solid #ccc!important;
}
}
.goodstable{
width: 800px;
margin-left: 175px;

24
src/pages/order/list/list.js
View File

@ -16,12 +16,12 @@ const Column = [
prop:'username',
className: 'name',
type: "normal",
width:'200px'
width:'120px'
}, {
title: '商品名称',
prop:'phone',
name: 'uv',
width:'200px',
width:'120px',
type: "normal",
}, {
title: '官方价格',
@ -121,13 +121,29 @@ export default class orderlist extends React.Component{
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'1'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'2'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'3'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'0'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'0'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'1'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'2'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'3'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'0'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'0'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'1'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'2'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'3'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'0'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'0'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'1'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'2'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'},{username:'红噔噔',phone:'13541778893',role:'管理员',name:'红噔噔',status:'3'
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'}],
filterList:[{id:0,label:"订单状态",menuList:[{id:0,name:"待支付"},{id:1,name:"充值中"},{id:3,name:"已完成"},{id:4,name:"充值失败"}]},{id:1,label:"订单类型",menuList:[{id:0,name:"兑换码"},{id:1,name:"优惠券"},{id:2,name:"立减金"},{id:3,name:"正常"}]}],
selectiondata:[],
menuList:[{id:0,name:"订单状态",check:false},{id:1,name:"订单类型",check:false}]
,allcheck:false,
itemcheck:false,
combinedValue:[]
combinedValue:[],
tableHeight:500
}
}
//选中表格的选框
@ -179,6 +195,7 @@ export default class orderlist extends React.Component{
}
componentWillMount(){
window.time='2021-11-14 15:02:02'
this.setState({tableHeight:window.innerHeight-430});
}
//作废
@ -270,6 +287,7 @@ export default class orderlist extends React.Component{
isMultiple={true}
countbarVisible={false}
isSwitch={false}
maxheight={this.state.tableHeight}
pageChange={(e)=>{
this.pageChange(e)
}}

5
src/pages/order/more/more.less
View File

@ -1,16 +1,19 @@
#more{
.main-body{
padding: 24px;
box-sizing: border-box;
li{
width: 40%;
list-style-type: none;
display: flex;
justify-content: space-between;
line-height: 42px;
font-size: 14px;
span{
color:#626366;
font-size: 14px;
// font-size: 14px;
}
font{
color:#313233;

23
src/pages/order/orderaddform/orderaddform.js
View File

@ -82,6 +82,25 @@ export default class adduserinfo extends React.Component{
key: '2',
text: 'Option 2',
},
{
key: '3',
text: 'Option 3',
disabled: true,
},
{
key: '4',
text: `君不见，黄河之水天上来，奔流到海不复回`,
},
];
const plans = [
{
key: '1',
text: 'Option 1',
},
{
key: '2',
text: 'Option 2',
},
{
key: '3',
text: 'Option 3',
@ -131,7 +150,7 @@ export default class adduserinfo extends React.Component{
<div id="addaccinfo">
<Form model={this.state.model} rules={rules} ref="form1" className="addform">
<FormItem prop="plan" labelname="归属营销计划" id="plan" >
<Select options={options} clearable placeholder="请选择归属营销计划" value={this.state.model.sign} onChange={(e)=>{
<Select options={plans} clearable placeholder="请选择归属营销计划" value={this.state.model.sign} onChange={(e)=>{
this.onsignChange(e)
Bus.emit('change',"plan" ,e);
}} popupWidth="360px" width="520px"/>
@ -250,7 +269,7 @@ export default class adduserinfo extends React.Component{
type="textarea"
value={this.state.model.tip}
onChange={this.handleMaxCharacterChange}
maxCharacterCount={10}
maxCharacterCount={100}
showCount
autoSize
width="520px"

30
src/pages/system/account/list/list.js
View File

@ -8,6 +8,7 @@ import "../../../../assets/comm.css"
import Grid from "../../../../components/gird/main.js"
import Ipt from "../../../../components/input/main"
import Modifypwd from "./modifypwd"
import _ from "lodash";
const Column = [
{
title: '用户名',
@ -144,11 +145,7 @@ export default class acclist extends React.Component{
,time:'2021-00-04 13:48:45',post:'技术',opearo:'红噔噔'}]
}
}
handleChangeSmall(e,rowData) {
// this.setState({ checkedSmall: checked });
console.log(rowData);
rowData.status=!rowData.status;
};
clickFn(){
this.props.history.push('/system/account-add');
sessionStorage.setItem('pathname2','/system/account-add')
@ -174,6 +171,27 @@ export default class acclist extends React.Component{
onCancel = () => {
Notify.error('我真的取消了');
}
onSwitchChange(status,row){
let self = this;
Sweetalert.confirm({
type:'warning',
closeBtn:true,
title:'确认操作',
content: <p>是否改变当前数据状态？</p>,
onConfirm:()=>{ this.changeState(status,row)},
onCancel: this.onCancel,
className:'questModal',
parentComponent: this
});
}
changeState(status,row){
let self = this;
let id = _.findIndex(self.state.accoutdata,(o)=>{return o.id == row.id});
self.state.accoutdata[id].status = status;
self.setState({accoutdata:self.state.accoutdata})
}
//表单删除
delFn(e,row){
Sweetalert.confirm({
@ -250,7 +268,7 @@ export default class acclist extends React.Component{
ComponentHandler={(com,rowData)=>{
if(com == "status")
{
return <Switch size="small" checked={rowData.status} onChange={(e)=>this.handleChangeSmall(e,rowData)}></Switch>;
return <Switch size="small" checked={rowData.status} onChange={(e)=>{this.onSwitchChange(e,rowData)}}></Switch>;
}
if(com == "opearo")