newsDetail

src/pages/news/detail/index.js

@@ -62,7 +62,7 @@ export default class NewsDetail extends Component {
 
       if (this.$router.params.scene) {
         getQrCodeParams(this.$router.params.scene).then(res => {
-          console.log(res,"扫码参数")
+          console.log(res, "扫码参数")
           this.setState({ newsId: res.id, qrcodeParams: res }, () => {
             this.loadDetail()
             addNewsUv(res.id)
@@ -368,58 +368,61 @@ export default class NewsDetail extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
-
         {
           loaded && (
-            <Block>
-              <ScrollView className="detail" scrollY>
-                <View class="detail-title">{detail.newsName}</View>
-                <View className="detail-stat">
-                  <View className='left-icon'>
-                    <View className='eye-num'><Text className="iconfont icon-eye"></Text>{detail.pvNum || 0}</View>
-                    {/* <View><Text className="iconfont icon-fenxiang1"></Text>{detail.shareNum || 0}</View> */}
-                    <View className='fenx'><Image src={require('@/assets/person/fenxiang.png')} className='fenxiang1-img'></Image>{detail.shareNum || 0}</View>
+            detail.newsDetailType == 0 ? <WebView src={detail.newsDetail} /> :
+              <Block>
+                <ScrollView className="detail" scrollY>
+                  <View class="detail-title">{detail.newsName}</View>
+                  <View className="detail-stat">
+                    <View className='left-icon'>
+                      <View className='eye-num'><Text className="iconfont icon-eye"></Text>{detail.pvNum || 0}</View>
+                      {/* <View><Text className="iconfont icon-fenxiang1"></Text>{detail.shareNum || 0}</View> */}
+                      <View className='fenx'><Image src={require('@/assets/person/fenxiang.png')} className='fenxiang1-img'></Image>{detail.shareNum || 0}</View>
+                    </View>
+                    <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
+                  </View>
+                  {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={transferImage(detail.newsImg)}></Image> */}
+                  <View className="detail-con">
+                    {/* <richText nodes={detail.newsDetail} ></richText> */}
+                    <import src='../../../components/wxParse/wxParse.wxml' />
+                    <template is='wxParse' data='{{wxParseData:article.nodes}}' />
+                  </View>
+                </ScrollView>
+                <Notice></Notice>
+                <BackHomeBtn style={consultShow ? "bottom:310rpx" : ''}></BackHomeBtn>
+                {
+                  consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>
+                }
+                <View className="bot-nav flex">
+                  <View className='btn poster-btn' style={{ display: posterShow }} onClick={() => { this.handleTogglePoster(true) }}>
+                    {/* <Text className="iconfont icon-xiazai"></Text> */}
+                    <Image src={require('@/assets/news/tupian.png')} className='poster-img'></Image>
+                    <Text className="txt">海报</Text>
+                  </View>
+                  <Button className="btn share-btn" open-type="share">
+                    {/* <Text className="icon-fenxiang iconfont"></Text> */}
+                    <Image src={require('@/assets/news/fasong.png')} className='fenxiang-img'></Image>
+                    <Text className="txt">分享</Text>
+                  </Button>
+                  <View className="btn collection-btn" onClick={this.handleFavor}>
+                    {
+                      isSaved ? (
+                        <Text className="iconfont icon-shoucang saved"></Text>
+                      ) : (
+                          <Text className="iconfont icon-shoucang1"></Text>
+                        )
+                    }
+                    <Text className="txt">收藏</Text>
                   </View>
-                  <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
-                </View>
-                {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={transferImage(detail.newsImg)}></Image> */}
-                <View className="detail-con">
-                  {/* <richText nodes={detail.newsDetail} ></richText> */}
-                  <import src='../../../components/wxParse/wxParse.wxml' />
-                  <template is='wxParse' data='{{wxParseData:article.nodes}}' />
-                </View>
-              </ScrollView>
-              <Notice></Notice>
-              <BackHomeBtn style={consultShow ? "bottom:310rpx" : ''}></BackHomeBtn>
-              {
-                consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>
-              }
-              <View className="bot-nav flex">
-                <View className='btn poster-btn' style={{ display: posterShow }} onClick={() => { this.handleTogglePoster(true) }}>
-                  {/* <Text className="iconfont icon-xiazai"></Text> */}
-                  <Image src={require('@/assets/news/tupian.png')} className='poster-img'></Image>
-                  <Text className="txt">海报</Text>
-                </View>
-                <Button className="btn share-btn" open-type="share">
-                  {/* <Text className="icon-fenxiang iconfont"></Text> */}
-                  <Image src={require('@/assets/news/fasong.png')} className='fenxiang-img'></Image>
-                  <Text className="txt">分享</Text>
-                </Button>
-                <View className="btn collection-btn" onClick={this.handleFavor}>
-                  {
-                    isSaved ? (
-                      <Text className="iconfont icon-shoucang saved"></Text>
-                    ) : (
-                        <Text className="iconfont icon-shoucang1"></Text>
-                      )
-                  }
-                  <Text className="txt">收藏</Text>
-                </View>
 
-              </View>
-            </Block>
+                </View>
+              </Block>
           )
         }
+
+
+
       </Block>
     )
   }

src/pages/project/list/filter/index.js

@@ -25,19 +25,19 @@ export default class Index extends Component {
       {
         name: '价格',
         id: 'price',
-        list: ['不限', '10000元/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
-        // list: [
-        //   {
-        //     name: '总价',
-        //     id: 'totalPrice',
-        //     list: ['不限', '100万以下', '100-150万', '150-200万', '200-500万', '500-1000万', '1000万以上']
-        //   },
-        //   {
-        //     name: '单价',
-        //     id: 'unitPrice ',
-        //     list: ['不限', '10000/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
-        //   }
-        // ]
+        // list: ['不限', '10000元/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
+        list: [
+          {
+            name: '单价',
+            id: 'unitPrice ',
+            list: ['不限', '10000/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
+          },
+          {
+            name: '总价',
+            id: 'totalPrice',
+            list: ['不限', '100万以下', '100-150万', '150-200万','200-250万', '250-500万', '500-1000万', '1000万以上']
+          },
+        ]
       },
       {
         name: '面积',
@@ -47,9 +47,7 @@ export default class Index extends Component {
       {
         name: '类型',
         id: 'type',
-        list: [
-
-        ]
+        list: []
       }
     ]
   }
@@ -215,13 +213,13 @@ export default class Index extends Component {
     })
   }
 
-  // renderPanel() {
-  //   const { tabIndex } = this.state
-  //   return (
-  //     <Block>
-  //       {tabIndex === 1 ? this.renderPrice() : this.renderList()}
-  //     </Block>)
-  // }
+  renderPanel() {
+    const { tabIndex } = this.state
+    return (
+      <Block>
+        {tabIndex === 1 ? this.renderPrice() : this.renderList()}
+      </Block>)
+  }
 
   renderList() {
     const { tabs, tabIndex, selectedIndex } = this.state
@@ -251,7 +249,7 @@ export default class Index extends Component {
     const priceArr = tabs[1].list
     const list = priceArr[priceTypeIndex].list
     return (
-      <View className="price">
+      <View className="price" >
         <View className="menu">
           {
             priceArr.map((item, index) => (
@@ -263,7 +261,7 @@ export default class Index extends Component {
             ))
           }
         </View>
-        <ScrollView scrollY className="content">
+        <ScrollView scrollY className="content" style="padding-left:0">
           {
             list.map((text, index) => (
               <View
@@ -326,7 +324,8 @@ export default class Index extends Component {
               <ScrollView
                 scrollY
                 className="panel">
-                {this.renderList()}
+                {this.renderPanel()}
+                {/* {this.renderList()} */}
               </ScrollView>
 
               <View className="confirm">