合并

one_stop_public/config.js

@@ -35,8 +35,7 @@ const config = {
   //mobileHost:"http://zyd.cdzhiyong.com:51335",
   mobileUrl:prefix+"/mobile/GHHome",
   mobileHost:"http://localhost:33333",
-
-  request:request
+  request:request,
 }
 
 

one_stop_public/filePreview/index.jsx

@@ -3,7 +3,7 @@
  */
 import React, { Component } from 'react';
 import { Modal,Popconfirm } from 'antd';
-// import FileViewer from 'react-file-viewer';
+import FileViewer from 'react-file-viewer';
 export default class index extends Component {
     constructor(props){
         super(props)
@@ -123,13 +123,13 @@ export default class index extends Component {
                                     height:600,
                                 }}
                                 >
-                                {/* <FileViewer
+                                <FileViewer
                                     fileType={type}
                                     filePath={path}
                                     // onError={this.onError}
                                     // errorComponent={Error}
                                     // unsupportedComponent={Error}
-                                /> */}
+                                />
                             </div>
                     }
 

one_stop_public/tableCompon/index.jsx

@@ -73,7 +73,6 @@ function getBase64(value) {
   return value ? base64.encode(new Buffer(value)) : null;
 
 }
-
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -1966,6 +1965,12 @@ export default class tableCom extends Component {
                     if (f.path.indexOf('.png') != -1 || f.path.indexOf('.jpg') != -1) {
                       return <img key={index2} style={{ width: 100, height: 100 }} src={queryApiActionPath() + f.path} />
                     }
+                    // if(!config.babelMobile &&get === 'web'){
+                    //   return <li key={index2}><FilePreview.default
+                    //   path={queryApiActionPath() + f.path}
+                    //   pathName={f.name}
+                    //   /></li>
+                    // }
                     return <li key={index2}><a target="_blank" key={f.path} href={queryApiActionPath() + f.path}>
                       {f.name}
 
@@ -1981,6 +1986,12 @@ export default class tableCom extends Component {
                     if (f.filePath.indexOf('.png') != -1 || f.filePath.indexOf('.jpg') != -1) {
                       return <img key={index2} style={{ width: 100, height: 100 }} src={queryApiActionPath() + f.filePath} />
                     }
+                    // if(get === 'web'){
+                    //   return <li key={index2}><FilePreview
+                    //                 path={queryApiActionPath() + f.path}
+                    //                 pathName={f.name}
+                    //                 /></li>
+                    // }
                     return <li key={index2}><a target="_blank" key={f.filePath} href={queryApiActionPath() + f.filePath}>
                       {f.fileName}
                     </a></li>