修复bug

package.json

@@ -39,6 +39,7 @@
     "echarts-amap": "^1.4.15-rc.1",
     "echarts-for-react": "^2.0.15-beta.0",
     "md5": "^2.2.1",
+    "qrcode.react": "^1.0.0",
     "react": "^16.8.6",
     "react-amap": "^1.2.8",
     "react-dom": "^16.8.6",

src/api/data/CropCount.js

@@ -16,6 +16,7 @@ export default {
                 keyRelated: "集合键关联"
             }
         },
+        scrollTime:"滚动时间",
         list: {
             name: '名称',
             id: "数据ID",
@@ -42,6 +43,7 @@ export default {
                 }
             ]
         },
+        scrollTime:0,
         list: [
             // {
             //     name: '全部',

src/api/data/ParkList.js

@@ -39,6 +39,9 @@ export default {
             params: [
                 {
                     value: "id"
+                },
+                {
+                    value: "key"
                 }
             ],
             dataSource: [

src/api/data/ProductDetailsData.js

@@ -24,11 +24,10 @@ export default {
             icon:"图标链接",
             url:"购买链接"
         },
-        minTitle1:"小标题1",
-        minTitle2:"小标题2",
-        minTitle3:"小标题3",
-        minTitle4:"小标题4",
-        minTitle5:"小标题5",
+        minTitle:{
+            name:"小标题",
+            key:"字段"
+        }
     },
     data : {
         dataInterface:{
@@ -42,6 +41,7 @@ export default {
                 keyRelated:''
             }],
         },
+        QRcode:"https://weiliicimg1.pstatp.com/weili/l/261026036195786793.webp",
         retailPriceTitle:"零售价",
         PurchaseLinkTitle:"点击链接购买",
         priceIcon:"￥",
@@ -51,11 +51,13 @@ export default {
         //     icon:"http://img.qdaily.com/uploads/201904301229232wqMV87xmtnNOKdD.jpg-w600",
         //     url:"https://www.tmall.com/"
         // }
-    ],
-        minTitle1:"产品品牌",
-        minTitle2:"产品规格",
-        minTitle3:"保质期",
-        minTitle4:"生产地",
-        minTitle5:"供应商",
+         ],
+        minTitle:[
+            {name:"产品品牌",key:'brandName'},
+            // {        name:"产品规格",key:'spec'},
+            // {        name:"保质期",key:'qualityGuaranteePeriod'},
+            {        name:"生产地",key:'placeOfProduction'},
+            {        name:"供应商",key:'umsCompanyInfo'},
+        ]
     }
 }

src/components/DistributedList/index.jsx

@@ -20,6 +20,11 @@ export class DistributedList extends React.Component {
     //搜索功能
     searTime = null;
     searchValue = e => {
+        const searchValue = this.props.searchValue;
+        if(typeof searchValue === "function"){
+            searchValue(e.target.value);
+        }
+        return;
         e.persist();
         clearTimeout(this.searTime);
         this.searTime = setTimeout(() => {

src/components/LeveList2/index.css

@@ -33,6 +33,7 @@
 }
 
 .Box > li .minTitle{
+    font-size: 1.4em;
     color: rgba(174,220,244,1);
     background: linear-gradient(180deg, rgba(164,250,253,1) 0%, rgba(8,129,207,1) 100%);
     background-clip: text;

src/components/LeveList2/index.jsx

@@ -26,7 +26,7 @@ class LevelList2 extends React.Component{
             <Scroll reverse={false} {...ohtprops} className={`${styles.Box} ${this.props.className}`} index={activeIndex} active={e=>this.active(e)}>
                 {!!list.length && list.map((x,i)=>{
                     return (
-                        <li key={i} className={activeIndex == i?styles.active:''} onClick={e=>this.active(i)}>
+                        <li style={{width: `calc(${100/list.length}% - 16px)`}} key={i} className={activeIndex == i?styles.active:''} onClick={e=>this.active(i)}>
                             <p className={styles.minTitle}>{x.title}</p>
                             <div className={"level-line"}></div>
                             <p>{x.name}</p>

src/pages/Distributed/index.jsx

@@ -138,6 +138,14 @@ class Distributed extends Component {
         this.addPoint(e);
         this.setState({ activeIndex, item: e });
     }
+    //点击搜索
+    searchValue = (e)=>{
+        const {CropCount:{data:{list}},typeIndex} = this.state,
+        o = list[typeIndex];
+        delete o.id;
+        this.active({...o,
+        key:e},typeIndex);
+    }
     render() {
         const { mapConfig, CropCount, ParkList, activeIndex ,typeIndex} = this.state;
         return (
@@ -147,7 +155,7 @@ class Distributed extends Component {
                 </Amap>
                 <div className={styles.ListBox}>
                     <Box style={{ height: "25%" }}>
-                        <LevelList1 style={{ position: "relative" }} data={CropCount} active={(...e)=>this.active(...e)}></LevelList1>
+                        <LevelList1 activeItem={typeIndex} style={{ position: "relative" }} data={CropCount} active={(...e)=>this.active(...e)}></LevelList1>
                         <div className={styles.Line}></div>
                         <div className={styles.merchantsBody}>
                             <div className={styles.viewName}>
@@ -160,7 +168,7 @@ class Distributed extends Component {
                     </Box>
                     <br />
                     <Box style={{ height: "75%" }}>
-                        <DistributedList {...this.props} style={{ height: "100%" }} activePoint={(e, show, activeIndex) => this.activePoint(e, show, activeIndex)} activeIndex={activeIndex} data={ParkList} />
+                        <DistributedList searchValue={this.searchValue} {...this.props} style={{ height: "100%" }} activePoint={(e, show, activeIndex) => this.activePoint(e, show, activeIndex)} activeIndex={activeIndex} data={ParkList} />
                     </Box>
                 </div>
             </div>

src/pages/Industry/index.css

@@ -44,10 +44,11 @@
 
 /*列表*/
 .ulList{
+    flex: 1;
     display:flex;
     flex-wrap: wrap;
     flex-direction: row;
-    flex: 1;
+    width:530px;
     margin-top: 10px;
     overflow: hidden;
     overflow-y: auto;
@@ -58,7 +59,7 @@
 .ulList li{
     box-sizing: border-box;
     padding: 0 12px 12px 0;
-    height: 33.33%;
+    min-height: 33.33%;
     width: 50%;
     display: flex;
 }
@@ -123,7 +124,7 @@
 .productHref .NumTostring{
     white-space: nowrap;
     font-size: 26px;
-    margin: 20px 0;
+    margin: 0;
 }
 .productHref .BuyLink{
     display: flex;

src/pages/Industry/index.jsx

@@ -8,7 +8,7 @@ import EditTpl from "../../components/edit/index";
 
 import { LevelList1 } from '../../components/LevelList1/index.jsx';
 import { NumTostring } from '../../components/numTostring';
-
+var QRCode = require('qrcode.react');
 
 class Industry extends React.Component {
     state = {
@@ -65,7 +65,7 @@ class Industry extends React.Component {
             ...params,
             params: {
                 pageNum: 1,
-                pageSize: 50,
+                pageSize: 5000,
                 ...e
             }
         }).then(res => {
@@ -117,6 +117,8 @@ class Industry extends React.Component {
             }
         }).then(res => {
             const { config } = res;
+            const {data:{id = ''}} = config;
+            config.data.qrcode = id?`http://wxh5.gzqlyx.com/#/pages/product/product?id=${id}`:'';
             this.setState({ ProductDetailsData: config, productSubscript });
         });
     }
@@ -147,12 +149,49 @@ class Industry extends React.Component {
         //组件销毁
         clearTimeout(this.carouselTime);
     }
+    //进入内页
+    goLink = (e,i)=>{
+        //处理path  替换 页面 与 pId
+        let {match:{
+            path,
+            url
+        }} = this.props;
+        url = url.split("/");
+        path = path.split("/").map((x,i)=>{
+            const iu = url[i];
+            if(i == 1){
+                return "detail";
+            }
+            const k = x.indexOf(":"),
+                    j = x.indexOf("?");
+                if (k != -1) {
+                    x = x.substring(k + 1, j);
+                }
+                if (x == 'pId') {
+                   return iu+"-"+e.id;
+                }
+                return iu;
+        }).join("/");
+        return path;  
+    }
+    LevelList2Click(e){
+        const {data:{minTitle = [],firmId}} = this.state.ProductDetailsData;
+        if((minTitle[e] || {}).key === 'umsCompanyInfo'){
+            this.props.history.push(this.goLink({id:firmId}));
+        }
+    }
     render() {
         const { productSubscript, classificationListData, productListData, inputValue, ProductDetailsData, ProductDetailsData: { data: DetailsData } ,activeItem=0} = this.state,
             p_list = (((productListData || {}).data || {}).list || []);
         const PovertyAlleviationArticle = {
             data: {
-                list: ['brandName', 'spec', 'qualityGuaranteePeriod', 'placeOfProduction', 'umsCompanyInfo'].map((x, i) => {
+                list: (DetailsData.minTitle || []).map(x=>{
+                    return {
+                        title:x.name,
+                        name:DetailsData[x.key]
+                    }
+                }),
+                a:['brandName', 'spec', 'qualityGuaranteePeriod', 'placeOfProduction', 'umsCompanyInfo'].map((x, i) => {
                     const name = DetailsData[x];
                     if (name) {
                         return {
@@ -184,15 +223,15 @@ class Industry extends React.Component {
                             {p_list.map((x, i) => {
                                 return (<li key={i} onClick={e => this.getProductDetails(x, i)}>
                                     <div className={`${styles.ulListItem} ${productSubscript == i ? styles.hover : ''}`}>
-                                        <div className={styles.img} style={{ backgroundImage: `url(${x.pic})` }}></div>
+                                        <div className={styles.img} style={{ backgroundImage: `url(${x.pic}?imageMogr2/quality/60/thumbnail/100x100)` }}></div>
                                         <h3>{x.name}</h3>
                                         <div className={"level-line"}></div>
                                         <div className={styles.itemText}>
-                                            {x.brandName ? <span>品牌：{x.brandName}</span> : ''}
-                                            {x.price ? <span>零售价：{x.price}</span> : ''}
+                                            {x.brandName ? <span>品牌：{x.brandName || ''}</span> : ''}
+                                            {x.price ? <span key={x.spec}>规格：{x.spec || ''}</span> : ''}
                                         </div>
                                         {x.umsCompanyInfo ? <div className={styles.itemText}>
-                                            <span>供应商：{x.umsCompanyInfo || ''}</span>
+                                            <span key={x.qualityGuaranteePeriod}>{x.qualityGuaranteePeriod?`保质期：${x.qualityGuaranteePeriod}`:'参考包装'}</span>
                                         </div> : ''}
                                     </div>
                                 </li>)
@@ -206,9 +245,11 @@ class Industry extends React.Component {
                         <Box style={{ height: "58%", display: "flex" }}>
                             <div className={styles.productImges} style={{ backgroundImage: `url(${DetailsData.pic})` }}></div>
                             <div className={styles.productHref}>
+                                {DetailsData.qrcode && <QRCode value={DetailsData.qrcode} style={{width:"10vw",height:"10vw"}} ></QRCode>}
+                                
                                 <div className={styles.retailPrice}>{DetailsData.retailPriceTitle}</div>
-                                <div className={styles.NumTostring}>{DetailsData.priceIcon}<NumTostring>{DetailsData.price || ''}</NumTostring></div>
-                                <div className={styles.retailPrice}>{DetailsData.PurchaseLinkTitle}</div>
+                                <div className={styles.NumTostring}><span style={{fontSize:"40px"}}>{DetailsData.priceIcon}{DetailsData.price || '暂无售价'}</span></div>
+                                <div className={styles.retailPrice}>{(DetailsData.buyUrls || []).length?DetailsData.PurchaseLinkTitle:''}</div>
                                 <div className={styles.BuyLink}>
                                     {(DetailsData.buyUrls || []).map((x, i) => {
                                         return (
@@ -222,13 +263,11 @@ class Industry extends React.Component {
                         <br />
                         <Title>{DetailsData.name}</Title>
                         <br />
-                        <LevelList2 data={PovertyAlleviationArticle}></LevelList2>
+                        <LevelList2 active={(...e)=>this.LevelList2Click(...e)} data={PovertyAlleviationArticle}></LevelList2>
                         <br />
                         <Box no={true} style={{ flex: 1 }}>
                             <Title>{DetailsData.IntroductionTitle}</Title>
-                            <div className={styles.IntroductionInfo}>
-                                {DetailsData.description}
-                            </div>
+                            <div className={styles.IntroductionInfo} dangerouslySetInnerHTML={{__html:DetailsData.description}}></div>
                         </Box>
                     </div>
                 </Box>

src/pages/Overview/Details/index.jsx

@@ -53,7 +53,9 @@ export default class index extends React.Component {
             ParkDetailsInfo
         } = this.state,
         {data:{list = []}} = ParkDetailsInfo,
-        [list1,...list2] = list;
+        [list1,...list2] = list,
+        list3 = list2.pop();
+        list3 = list3?[list3]:[];
         list1 = list1?[list1]:[];
         return (
             <div className={styles.box}>
@@ -65,11 +67,13 @@ export default class index extends React.Component {
                         <AutoList row={2}
                             data={list2}
                             style={{ margin: "10px 0" }}></AutoList>
+                        <AutoList row={1}
+                            data={list3}
+                            style={{ margin: "10px 0" }}></AutoList>
                     </div>
                 </Box>
                 <Box className={styles.bottom}>
-                    <div className={styles.introduce}>
-                        {ParkDetailsInfo.data.introduce}
+                    <div className={styles.introduce} dangerouslySetInnerHTML={{__html:ParkDetailsInfo.data.introduce}}>
                     </div>
                 </Box>
             </div>