Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/pages/news/detail/index.js

@@ -13,7 +13,7 @@ import { report as reportCustomer } from '@utils/qrcode'
 import { getCardDetail } from '@services/card'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
-import authorizationComponent from '@components/authorizationComponent'
+// import AuthorizationComponent from '@components/authorizationComponent'
 import { reportClient } from '@services/report'
 import {
   addNewsUv,
@@ -91,7 +91,7 @@ export default class NewsDetail extends Component {
       }
     })
   }
-  
+
   // 报备客户
   reportClientFn() {
     const router = Taro.getStorageSync('router') || { query: {} }
@@ -316,63 +316,63 @@ export default class NewsDetail extends Component {
     const { detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     return (
-      <authorizationComponent>
-        <Block>
-          {/* 生成海报 */}
-          {posterVisible && (<Poster data={posterData} toggle={this.handleTogglePoster}></Poster>)}
-          {
-            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>
-                    </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={personId} name={name || 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>
+      // <AuthorizationComponent>
+      <Block>
+        {/* 生成海报 */}
+        {posterVisible && (<Poster data={posterData} toggle={this.handleTogglePoster}></Poster>)}
+        {
+          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>
                   </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>
-              </Block>
-            )
-          }
-        </Block>
-      </authorizationComponent>
+                {/* <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={personId} name={name || 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>
+          )
+        }
+      </Block>
+      // </AuthorizationComponent>
     )
   }
 }

src/pages/project/h5Page.js

@@ -267,7 +267,7 @@ export default class Index extends Component {
 
   // 授权用户信息
   getUserInfo() {
-    console.log('好哈哈')
+  
     const { dispatchUpdateUserInfo } = this.props
     const sessionKey = Taro.getStorageSync('sessionKey')