Skip to content

B
biz.qingxiao.com
Commit ac1d02d4 authored by baixian's avatar baixian
Browse files
Options

积分管理bug修改

parent 31a0ea7f
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 8 deletions
index.html
View file @ ac1d02d4
<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>轻校</title><link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png"><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0;" name="viewport"><meta http-equiv="X-UA-Compatible" content="IE=edge"><!-- Polyfills --><!--[if lt IE 10]>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>轻校</title>
<link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png">
<meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0;" name="viewport">
<meta http-equiv="X-UA-Compatible" content="IE=edge"><!-- Polyfills --><!--[if lt IE 10]>
<script src="js/console-polyfill.js"></script>
<![endif]--><script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script><link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1567578508350" rel="stylesheet"><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?3" charset="utf-8"></script></head><body><div id="root"></div><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.js?1567578508350" charset="utf-8"></script></body></html>
\ No newline at end of file
<![endif]-->
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script>
<link href="/dist/index.css?1567675570101" rel="stylesheet">
<script src="/lib/vendor.dll.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?3" charset="utf-8"></script>
</head>
<body>
<div id="root"></div>
<script src="/dist/index.js?1567675570101" charset="utf-8"></script>
</body>
</html>
src/models/integral.js
View file @ ac1d02d4
......@@ -598,6 +598,17 @@ export default {
},
},
});
} else if (key == 'daily_limit') {
yield put({
type: 'updateState',
payload: {
[`type${index}`]: {
...state[`type${index}`],
unlimited: false,
[`${key}`]: value,
},
},
});
} else {
yield put({
type: 'updateState',
......
src/pages/integralmanage/integralsetting/index.less
View file @ ac1d02d4
.container {
background-color: #fff;
padding: 24px 0 0;
padding: 10px 0 0;
position: relative;
overflow-y: hidden;
}
......
src/pages/integralmanage/operationlog/index.js
View file @ ac1d02d4
import { connect } from 'dva';
import React from 'react';
import { Form, Icon, Button, Tabs, Modal, Row, Col, Tag, Divider, Table, Pagination, message } from 'antd';
import { Form, Icon, Button, Tabs, Modal, Row, Col, Tag, Divider, Table, Pagination, message, Tooltip } from 'antd';
import pageStyle from './index.less';
import { hasBtnPower, imagify } from '../../../utils';
const { TabPane } = Tabs;
......@@ -64,6 +64,20 @@ class StoreMgt extends React.Component {
title: '操作人',
dataIndex: 'operator.nickname',
},
{
title: '备注',
dataIndex: 'remark',
render: (text) => {
return (
<Tooltip title={text}>
<a href="javascript:;">
{text.substr(0, 10)}
</a>
</Tooltip>
);
},
},
];
return (
<div className={pageStyle.container}>
......
src/pages/integralmanage/operationlog/index.less
View file @ ac1d02d4
.container {
background-color: #fff;
padding: 0;
padding: 10px 0 0 ;
position: relative;
overflow-y: hidden;
}
......
src/pages/integralmanage/storesetting/CouponAddModal.js
View file @ ac1d02d4
......@@ -177,7 +177,7 @@ class CouponAddModal extends React.Component {
],
})(<TextArea
autosize={{ minRows: 3, maxRows: 5 }}
placeholder="请输入"
placeholder="请输入其他说明"
/>)}
</FormItem>
</Form>
......
src/pages/integralmanage/storesetting/index.js
View file @ ac1d02d4
......@@ -256,7 +256,7 @@ class StoreMgt extends React.Component {
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
}}
> {text}
> <span>{text}</span>
</div>
);
},
......
src/pages/integralmanage/storesetting/index.less
View file @ ac1d02d4
.container {
background-color: #fff;
padding: 24px 0 0;
padding: 10px 0 0;
position: relative;
overflow-y: hidden;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment