Commit 87786663 by chenshu

fix:修复部分报错

parent d1cdc1d8
......@@ -67,7 +67,7 @@ class CollegeInfoPage extends React.Component {
setTimeout(() => {
const okBtnDom = document.querySelector("#headPicModal");
const options = {
size: [500, 282],
size: [500, 128],
ok: okBtnDom,
maxZoom: 3,
style: {
......@@ -290,7 +290,7 @@ class CollegeInfoPage extends React.Component {
<div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div>
<div className="preview-img">
<div className="title">效果预览</div>
<div id="preview-url-box" style={{width:500,height:282}}>
<div id="preview-url-box" style={{width:500,height:128}}>
<img src={this.state.dataUrl} style={{ width: '100%' }} alt="" />
</div>
<div className="tip-box">
......
......@@ -17,7 +17,7 @@
.logo-con{
.logo-img-con{
width: 258px;
height: 60px;
height: 66px;
margin-right:8px;
.logo-box{
width: 258px;
......
......@@ -281,7 +281,7 @@ function EmployeeManage() {
}}
>
<div>
搜索员工:
搜索员工:
<Search
style={{
width: 300,
......
......@@ -149,7 +149,7 @@ export default class CollegeManagePage extends React.Component {
<div className="title">{item.storeName}</div>
<div className="time">{moment(item.createTime).format('YYYY-MM-DD HH:mm')}</div>
<div className="control-box">
{item.userRole === 'StoreManager' && item.state === 'VALID' &&
{item.userRole === 'StoreManager' && item.state === 'VALID' && !item.mainStore &&
<span
className="control-button"
onClick={(e) => {
......@@ -160,7 +160,7 @@ export default class CollegeManagePage extends React.Component {
}}
>编辑</span>
}
{(item.userRole === 'StoreManager' || item.state !== 'VALID') &&
{((item.userRole === 'StoreManager' && !item.mainStore) || item.state !== 'VALID') &&
<span
className="control-button"
onClick={(e) => {
......
......@@ -75,10 +75,10 @@
}
}
.college-list {
display: flex;
flex-wrap: wrap;
.college-item,.college-create {
position: relative;
display: inline-block;
overflow: hidden;
width: 376px;
height: 133px;
border: 1px solid #E8E8E8;
......
......@@ -61,7 +61,7 @@ export default class CreateCollege extends React.Component {
setTimeout(() => {
const okBtnDom = document.querySelector("#headPicModal");
const options = {
size: [500, 282],
size: [500, 128],
ok: okBtnDom,
maxZoom: 3,
style: {
......@@ -291,7 +291,7 @@ export default class CreateCollege extends React.Component {
<div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div>
<div className="preview-img">
<div className="title">效果预览</div>
<div id="preview-url-box" style={{width:500,height:282}}>
<div id="preview-url-box" style={{width:500,height:128}}>
<img src={this.state.dataUrl} style={{ width: '100%' }} alt="" />
</div>
<div className="tip-box">
......
......@@ -8,7 +8,7 @@
display: block;
border: 1px dashed #E9E9E9;
width: 312px;
height: 73px;
height: 82px;
margin: 0 auto 16px;
.image {
width: 100%;
......
......@@ -79,7 +79,7 @@ function Header(props) {
</div>
</div>
<div className="menu">
{User.getIsAdmin() === 'true' &&
{User.getEnterpriseId() &&
<div
className="menu-item"
key="1"
......
......@@ -89,7 +89,7 @@ class StoreInfo extends React.Component {
setTimeout(() => {
const okBtnDom = document.querySelector("#headPicModal");
const options = {
size: [500, 282],
size: [500, 128],
ok: okBtnDom,
maxZoom: 3,
style: {
......@@ -378,7 +378,7 @@ class StoreInfo extends React.Component {
<div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div>
<div className="preview-img">
<div className="title">效果预览</div>
<div id="preview-url-box" style={{width:500,height:282}}>
<div id="preview-url-box" style={{width:500,height:128}}>
<img src={this.state.dataUrl} style={{ width: '100%' }} alt="" />
</div>
<div className="tip-box">
......
......@@ -18,7 +18,7 @@
display: flex;
.logo-img-con{
width: 258px;
height: 60px;
height: 66px;
margin-right:8px;
.logo-box{
width: 258px;
......
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