Commit 92a0d63a9ad0f1ad3155bd555edb85ed0c9f9129
1 parent
c5fab05d
1.处理企业微信移动端上传,与App上传
Showing
2 changed files
with
7 additions
and
4 deletions
src/mobile/common/CommobileToolBar.js
| @@ -514,11 +514,14 @@ class CommobileToolBar extends Component { | @@ -514,11 +514,14 @@ class CommobileToolBar extends Component { | ||
| 514 | btnStyle, | 514 | btnStyle, |
| 515 | }; | 515 | }; |
| 516 | 516 | ||
| 517 | + | ||
| 518 | + const isWeiXin = location.host.includes('ebc.km5c.com.cn'); | ||
| 519 | + console.log('weibxin', isWeiXin, commonConfig.isWeiXin); | ||
| 517 | return ( | 520 | return ( |
| 518 | <div style={divStyle}> | 521 | <div style={divStyle}> |
| 519 | {commonUtils.isEmptyArr(buttonConfig) ? '' : | 522 | {commonUtils.isEmptyArr(buttonConfig) ? '' : |
| 520 | buttonConfig.map((item) => { | 523 | buttonConfig.map((item) => { |
| 521 | - if (!commonConfig.isWeiXin && item.sControlName.includes('BtnUpdPic')) { | 524 | + if (!isWeiXin && item.sControlName.includes('BtnUpdPic')) { |
| 522 | return ( | 525 | return ( |
| 523 | <FileManageMobile {...filemanageType} /> | 526 | <FileManageMobile {...filemanageType} /> |
| 524 | ); | 527 | ); |
src/mobile/components/FileManageMobile.js
| @@ -240,14 +240,14 @@ class FileManageMobile extends React.Component { | @@ -240,14 +240,14 @@ class FileManageMobile extends React.Component { | ||
| 240 | const bPad = location.pathname.toLowerCase()?.indexOf('pad') > -1; | 240 | const bPad = location.pathname.toLowerCase()?.indexOf('pad') > -1; |
| 241 | 241 | ||
| 242 | /* 上传照片样式定位 */ | 242 | /* 上传照片样式定位 */ |
| 243 | - let imgDivTop = '500'; | 243 | + let imgDivTop = '400'; |
| 244 | const mobileBarStyle = document.getElementsByClassName('am-list-view-scrollview-content'); | 244 | const mobileBarStyle = document.getElementsByClassName('am-list-view-scrollview-content'); |
| 245 | if (commonUtils.isNotEmptyArr(mobileBarStyle) && mobileBarStyle.length > 0) { | 245 | if (commonUtils.isNotEmptyArr(mobileBarStyle) && mobileBarStyle.length > 0) { |
| 246 | const obj = mobileBarStyle[0].getBoundingClientRect(); | 246 | const obj = mobileBarStyle[0].getBoundingClientRect(); |
| 247 | const objHeight = mobileBarStyle[0].clientHeight; | 247 | const objHeight = mobileBarStyle[0].clientHeight; |
| 248 | if (commonUtils.isEmptyObject(obj)) { | 248 | if (commonUtils.isEmptyObject(obj)) { |
| 249 | if (obj.top < dHeight) { | 249 | if (obj.top < dHeight) { |
| 250 | - imgDivTop = Math.floor(obj.top + objHeight); | 250 | + imgDivTop = Math.floor(obj.top + objHeight - 100); |
| 251 | } | 251 | } |
| 252 | } | 252 | } |
| 253 | } | 253 | } |
| @@ -286,7 +286,7 @@ class FileManageMobile extends React.Component { | @@ -286,7 +286,7 @@ class FileManageMobile extends React.Component { | ||
| 286 | window.dispatchEvent(event); | 286 | window.dispatchEvent(event); |
| 287 | }} | 287 | }} |
| 288 | /> | 288 | /> |
| 289 | - <div className={styles.commonImage} id="imgDiv" key="imgDivKey" style={{ top: imgDivTop, left: bPad ? '20%' : null }} > | 289 | + <div className={styles.commonImage} id="imgDiv" key="imgDivKey" style={{ top: '70vh', left: bPad ? '20%' : null }} > |
| 290 | { | 290 | { |
| 291 | commonUtils.isNotEmptyArr(files) && files.length > 0 ? | 291 | commonUtils.isNotEmptyArr(files) && files.length > 0 ? |
| 292 | files.map((child) => { | 292 | files.map((child) => { |