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

src/app.js

@@ -164,6 +164,10 @@ class App extends Component {
         console.info('router2:', router)
         console.info('-----------')
         const { query: payload } = router
+
+        payload.path = router.path
+        payload.scene = router.scene
+
         // login
         login(payload, res => {
           // 获取未读消息
@@ -209,8 +213,8 @@ class App extends Component {
   componentDidMount() {
     console.info('app componentDidMount')
   }
-  componentWillMount() {
-    console.info('app componentWillMount')
+  componentWillMount(params) {
+    console.info('app componentWillMount', params)
   }
 
   getRouterParams() {

src/pages/activity/detail/poster.js

@@ -67,7 +67,7 @@ export default class Index extends Component {
         fontSize: 30,
         color: 'black',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         // textAlign: 'center',
         width: 560,
@@ -80,7 +80,7 @@ export default class Index extends Component {
         fontSize: 28,
         color: '#999',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         width: 560,
         zIndex: 999

src/pages/card/index.js

@@ -8,6 +8,7 @@ import BackHomeBtn from '@components/BackHomeBtn'
 import getUserPhone from '@utils/getUserPhone'
 import AchievePhone from '@components/achievePhone'
 import ready from '@utils/ready'
+import { sceneInShare } from '@utils/tools'
 
 import { ROLE_CODE } from '@constants/user'
 import { addCardUv, addCardShareNum, favorCard, cancelFavorCard } from '@services/card'
@@ -42,12 +43,27 @@ export default class Index extends Component {
 
   componentWillMount() {
     ready.queue(() => {
+
+      // 分享场景需要先授权手机, 再授权头像
+      const options = wx.getLaunchOptionsSync()
+      if (sceneInShare(options.scene)) {
+        const { person = {} } = this.props.userInfo || {}
+        if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+          Taro.reLaunch({ url: '/pages/auth/index' })
+          return
+        }
+
+        this.setState({
+          grantPhoneVisible: true,
+        })
+      }
+
       this.initPageData()
     })
   }
   initPageData() {
     const router = Taro.getStorageSync('router')
-    const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
+    const id = this.$router.params.id || router.query.id
 
     if (router.query.id) {
       this.setState({
@@ -402,6 +418,17 @@ export default class Index extends Component {
       modalStatus: false
     })
   }
+  
+  handleAuthPhoneSuccess = () => {
+    const { person = {} } = this.props.userInfo || {}
+    if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+      Taro.reLaunch({ url: '/pages/auth/index' })
+      return
+    }
+
+    this.initPageData()
+  }
+
   render() {
     const { makePosterStatus, posterData, modalStatus, grantPhoneVisible } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
@@ -423,7 +450,7 @@ export default class Index extends Component {
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
         {
           (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
-          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {
           visibleConfirmModal && (

src/pages/news/detail/poster.js

@@ -67,7 +67,7 @@ export default class Index extends Component {
         fontSize: 30,
         color: 'black',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         // textAlign: 'center',
         width: 560,
@@ -80,7 +80,7 @@ export default class Index extends Component {
         fontSize: 28,
         color: '#999',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         width: 560,
         zIndex: 999

src/pages/project/album/index.js

@@ -24,9 +24,15 @@ export default class Index extends Component {
 
 
   componentWillMount () {
-    const { id = '369b7d7e5bc6e6b91f2e8f5e775035e2' } = this.$router.params
-    const { projectDetail: { buildingId }, dispatchProjectDetail } = this.props
 
+
+    const { id = '369b7d7e5bc6e6b91f2e8f5e775035e2', current } = this.$router.params
+    const { projectDetail: { buildingId }, dispatchProjectDetail } = this.props
+    if (current) {
+      this.setState({
+        current,
+      })
+    }
     if (!buildingId) {
       dispatchProjectDetail(id)
     }
@@ -59,14 +65,17 @@ export default class Index extends Component {
     const { projectDetail: { buildingApartment = [] } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'photo')
     const listimg = list.filter(item => item.buildingImgList.length > 0)
-    console.log(listimg, '--------------')
+
     const { current } = this.state
     const imgList = (listimg[current] || {}).buildingImgList || []
+
     let _photosImgs = imgList.map(img => img.url)
 
     return (
       <View className='photos'>
         <View className="around-tab">
+          {console.log(listimg, '-----listimg---------')}
+          {console.log(imgList, '-------imgList-------')}
           {listimg.map((item, index) => {
             const { apartmentName } = item || {}
             const buildingImgList = item.buildingImgList || []
@@ -76,15 +85,13 @@ export default class Index extends Component {
             return (
               <View
                 key={current}
-                className={`around-tab__item ${current === index ? 'active' : ''}`}
+                className={`around-tab__item ${current == index ? 'active' : ''}`}
                 onClick={() => this.setState({ current: index })}
               >
                 {buildingImgList.length > 0 && <View className="around-tab-text"> {`${apartmentName}(${buildingImgList.length})`} </View>}
               </View>
             )
 
-
-
           })}
         </View>
         <View className='photos__item'>

src/pages/project/detail/index.js

@@ -21,7 +21,7 @@ import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 按需加载
 import ready from '@utils/ready'
 import Notice from '@components/Notice'
-import { getDownloadURL, getThumbnail } from '@utils/tools'
+import { getDownloadURL, getThumbnail, sceneInShare } from '@utils/tools'
 import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
@@ -62,9 +62,22 @@ export default class Index extends Component {
   }
 
   componentWillMount() {
-    // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
-
     ready.queue(() => {
+    
+      // 分享场景需要先授权手机, 再授权头像
+      const options = wx.getLaunchOptionsSync()
+      if (sceneInShare(options.scene)) {
+        const { person = {} } = this.props.userInfo || {}
+        if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+          Taro.reLaunch({ url: '/pages/auth/index' })
+          return
+        }
+
+        this.setState({
+          grantPhoneVisible: true,
+        })
+      }
+
       this.initPageData()
     })
   }
@@ -102,16 +115,6 @@ export default class Index extends Component {
       })
     })
   }
-  componentDidMount() {
-    const options = wx.getLaunchOptionsSync()
-    const sceneList = [1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048]
-
-    if (sceneList.indexOf(options.scene) != -1) {
-      this.setState({
-        grantPhoneVisible: true,
-      })
-    }
-  }
 
   loadHelpGroupList() {
     const { buildingId } = this.state
@@ -169,7 +172,7 @@ export default class Index extends Component {
     queryActivityList(payload).then(res => {
       console.log(res, 'Activity')
       this.setState({
-        activityList: res || []
+        activityList: res.list || []
       })
     })
   }
@@ -242,9 +245,10 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum() {
+  toViewAlbum (index){
     const { buildingId } = this.state
-    this.navigateTo(`/pages/project/album/index?id=${buildingId}`)
+    console.log('1111111',index)
+    this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}` )
   }
 
   onViewFans() {
@@ -488,6 +492,16 @@ export default class Index extends Component {
     })
   }
 
+  handleAuthPhoneSuccess = () => {
+    const { person = {} } = this.props.userInfo || {}
+    if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+      Taro.reLaunch({ url: '/pages/auth/index' })
+      return
+    }
+
+    this.initPageData()
+  }
+
   renderBottomMenu() {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
@@ -611,7 +625,7 @@ export default class Index extends Component {
             <View className='photos__type'>
               <View className='photos__type__title'>相册</View>
               <ScrollView scrollX>
-                <View className='photos__type__content' onClick={this.toViewAlbum}>
+                <View className='photos__type__content' >
 
                   <View className="around-tab">
                     {listimg.map((item, index) => {
@@ -622,19 +636,21 @@ export default class Index extends Component {
                       console.log(buildingImgUrl, 'buildingImgUrl')
 
                       // if (buildingImgUrl != null) {
-                      return (<View key={index + "listimg"}>
+                      return ( <View key={index + "listimg"}>
                         {buildingImgUrl != null && (<View
                           style={{ marginRight: '8px' }}
+                          
                         >
 
                           <View>
-                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} ></Image>
+                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} onClick={()=>this.toViewAlbum(index)}></Image>
                             <View style={{ width: '218rpx', display: 'flex', justifyContent: 'center' }} >
                               <View style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
                               <View> ({buildingImgList.length})</View>
                             </View>
                           </View>
-                        </View>)}</View>
+                        </View>)}
+                        </View>
                       )
                       // }
 
@@ -851,40 +867,22 @@ export default class Index extends Component {
     )
   }
   renderActivities() {
-    // renderGroup () {
-    //   const { groupList } = this.state
-    //   return (
-    //     <Block>
-    //       {groupList.length > 0 &&
-    //         <View className="activity">
-    //           <View className="title">拼团活动</View>
-    //           <View
-    //             style={{ position: 'relative' }}>
-    //             <HelpGroupBanner
-    //               style={{ height: '250rpx' }}
-    //               indicatorDots={false}
-    //               list={groupList}
-    //               onClick={this.handleGroupClick}>
-    //             </HelpGroupBanner>
-    //           </View>
-    //         </View>
-    //       }
-    //     </Block>
-    //   )
-    // }
+
+ 
     const { activityList } = this.state
+   
     return (
       <Block>
         {
           activityList.length > 0 && (
             <View className="activity" >
-              {console.log(activityList, '----activityList-----')}
+           
               <View className="section-head">
-                <Text className="section-head__title">热门活动</Text>
-                <View className="section-head__more" onClick={this.handleActivityMoreClick}>
-                  更多活动<Text className="iconfont icon-more"></Text>
-                </View>
-              </View>
+                 <Text className="section-head__title" style={{margin: '10rpx 0 40rpx 35rpx'}}>热门活动</Text>
+                 <View className="section-head__more"  style={{marginRight: '20rpx'}} onClick={this.handleActivityMoreClick}>
+                   更多活动<Text className="iconfont icon-more"></Text>
+                 </View>
+               </View>
               <View
                 style={{ position: 'relative' }}>
                 <HelpGroupBanner
@@ -899,26 +897,7 @@ export default class Index extends Component {
 
               </View>
             </View>
-            // <View classN                                                                                                                                                                                                                                                                                                                                                                                                                                                    ame="house-type">
-            //   <View className="section-head">
-            //     <Text className="section-head__title">热门活动</Text>
-            //     <View className="section-head__more" onClick={this.handleActivityMoreClick}>
-            //       更多活动<Text className="iconfont icon-more"></Text>
-            //     </View>
-            //   </View>
-            //   <ScrollView scrollX>
-            //     <View className="house-type__list" style="margin-top:10px">
-            //       {
-            //         activityList.map(item => (
-            //           <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(this, item.dynamicId)}>
-            //             <Image mode="widthFix" src={getThumbnail(item.imgUrl)} className="news-item__pic"></Image>
-            //             <View className="news-item__title">{item.title}</View>
-            //           </View>
-            //         ))
-            //       }
-            //     </View>
-            //   </ScrollView>
-            // </View>
+      
           )
         }
       </Block>
@@ -1045,7 +1024,7 @@ export default class Index extends Component {
       <Block>
         {
           (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
-          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {
           loaded && (

src/pages/project/detail/poster.js

@@ -70,7 +70,7 @@ export default class Index extends Component {
         fontSize: 28,
         color: '#999',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         // textAlign: 'center',
         width: 560,
@@ -117,6 +117,7 @@ export default class Index extends Component {
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
+        lineNum: 1,
         width: 150,
         zIndex: 11
       },

src/pages/shop/record/index.js

@@ -74,7 +74,7 @@ export default class Index extends Component {
 									<Image className="botttom_img" mode="aspectFill" src={item.image} />
 									<View className="bottom-right">
 										<View className="bottom-right-top">
-											<View className="product-name">{item.targetName}</View>
+											<View className="product-name" style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',width:'300rpx' }}>{item.targetName}</View>
 											<View className="product-score">{item.points}积分</View>
 										</View>
 										<View className="bottom-right-down">领取地址:{item.address}</View>

src/pages/shop/record/index.scss

@@ -61,6 +61,7 @@
 					width: 100%;
 					display: flex;
 					justify-content: space-between;
+			
 					.product-score{
 						color:rgba(255,59,51,1);
 					}

src/utils/login.js

@@ -2,9 +2,12 @@ import Taro from '@tarojs/taro';
 import { getStore } from '@tarojs/redux'
 import { USER_INFO } from '@constants/user'
 import { wxLogin } from '@services/login'
+import { sceneInShare } from '@utils/tools'
 import ready from '@utils/ready'
 let loading = false
-export default function (params, callback) {
+export default function (payload, callback) {
+  const { path, scene, ...params } = payload
+
   if (loading) {
     return
   }
@@ -34,9 +37,19 @@ export default function (params, callback) {
           callback && callback(data)
 
         } else {
-          Taro.reLaunch({
-            url: '/pages/auth/index'
-          })
+
+          // 非扫码进入项目详情或者卡片主页, 跳转到授权头像
+          // 否则不跳
+          const noAuthPages = [
+            'pages/project/detail/index',
+            'pages/card/index',
+          ]
+
+          if (noAuthPages.indexOf(path) === -1 || !sceneInShare(scene)) {
+            Taro.reLaunch({
+              url: '/pages/auth/index'
+            })
+          }
         }
         ready.open()
 

src/utils/tools.js

@@ -1,5 +1,17 @@
 import Taro from '@tarojs/taro';
 
+/**
+ * 是否分享场景(含扫码)
+ * @param {*} scene 
+ */
+export function sceneInShare(scene) {
+  return [1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048].indexOf(scene) > -1
+}
+
+/**
+ * 造空数组
+ * @param {int}} n 
+ */
 export function times(n) {
   return n > 0 ? '*'.repeat(n - 1).split('*') : []
 }