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

src/pages/activity/detail/assemble.js

@@ -84,8 +84,6 @@ export default class Detail extends Component {
         this.toggleGrantAvatar()
       }
       this.initPageData()
-      // Taro.setStorageSync('router', { query: {} })
-      // console.log(Taro.getStorageSync('router'),"hhhhhhhhhhhhhhhhhhhhhh")
     })
   }
 
@@ -93,7 +91,14 @@ export default class Detail extends Component {
     this.stopTicker()
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
 
-    Taro.setStorageSync('router', { query: {} })
+    const router = Taro.getStorageSync('router')
+    Taro.setStorageSync('router', {
+      ...router,
+      query: {
+        ...router.query,
+        consultant: undefined,
+      }
+    })
   }
 
   componentDidShow() {

src/pages/activity/detail/assistance.js

@@ -93,7 +93,14 @@ export default class Detail extends Component {
     this.stopTicker()
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
 
-    Taro.setStorageSync('router', { query: {} })
+    const router = Taro.getStorageSync('router')
+    Taro.setStorageSync('router', {
+      ...router,
+      query: {
+        ...router.query,
+        consultant: undefined,
+      }
+    })
   }
 
   componentDidShow() {
@@ -480,7 +487,7 @@ export default class Detail extends Component {
 
       },
       complete() {
-        
+
         // 必须授权头像
         if (that.toggleGrantAvatar()) {
           const detail = that.state.detail
@@ -520,7 +527,7 @@ export default class Detail extends Component {
   }
 
   // 请求好友助力
-  askForHelp = () => {    
+  askForHelp = () => {
     // 必须授权头像
     if (this.toggleGrantAvatar()) {
       const initiateDetail = this.state.initiateDetail

src/pages/activity/detail/index.js

@@ -79,7 +79,14 @@ export default class Detail extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
 
-    Taro.setStorageSync('router', { query: {} })
+    const router = Taro.getStorageSync('router')
+    Taro.setStorageSync('router', {
+      ...router,
+      query: {
+        ...router.query,
+        consultant: undefined,
+      }
+    })
   }
 
   componentWillReceiveProps() {

src/pages/news/detail/index.js

@@ -86,7 +86,14 @@ export default class NewsDetail extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
 
-    Taro.setStorageSync('router', { query: {} })
+    const router = Taro.getStorageSync('router')
+    Taro.setStorageSync('router', {
+      ...router,
+      query: {
+        ...router.query,
+        consultant: undefined,
+      }
+    })
   }
   
   // 报备客户
@@ -221,7 +228,7 @@ export default class NewsDetail extends Component {
         })
         console.info('资讯详情')
       })
-    
+
       this.setState({
         detail: res,
         loaded: true,
@@ -308,72 +315,68 @@ export default class NewsDetail extends Component {
       console.info('生成资讯详情海报')
     })
   }
-  renderNews() {
+
+  render() {
     const { detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     return (
-      <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>
+      <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>
+                  </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">
-                  <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>
-    );
-  }
-  
-  render(){
-  	return (
-  		<authorizationComponent>
-  			{this.renderNews()}
-  		</authorizationComponent>
-  	)
+                </View>
+              </Block>
+            )
+          }
+        </Block>
+      </authorizationComponent>
+    )
   }
 }

src/pages/project/detail/index.js

@@ -105,7 +105,14 @@ export default class Index extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
 
-    Taro.setStorageSync('router', { query: {} })
+    const router = Taro.getStorageSync('router')
+    Taro.setStorageSync('router', {
+      ...router,
+      query: {
+        ...router.query,
+        consultant: undefined,
+      }
+    })
   }
 
   componentWillReceiveProps() {