bug fix

src/components/taro-plugin-canvas/index.js

@@ -158,7 +158,7 @@ export default class CanvasDrawer extends Component {
       })
       .catch((err) => {
         Taro.hideLoading();
-        Taro.showToast({ icon: 'none', title: err.errMsg || '下载图片失败' });
+        Taro.showToast({ icon: 'none', title: err.message || err.errMsg || '下载图片失败' });
         console.error(err);
         if (!onCreateFail) {
           console.warn('您必须实现 taro-plugin-canvas 组件的 onCreateFail 方法，详见文档 https://github.com/chuyun/taro-plugin-canvas#fail');

src/components/taro-plugin-canvas/utils/tools.js

@@ -150,48 +150,53 @@ export function downloadImageAndInfo(image, index, toRpxFunc) {
   return new Promise((resolve, reject) => {
     const { x, y, url, zIndex } = image;
     const imageUrl = url;
-    // 下载图片
-    downImage(imageUrl, index)
-      // 获取图片信息
-      .then(imgPath => getImageInfo(imgPath, index))
-      .then(({ imgPath, imgInfo }) => {
-        // 根据画布的宽高计算出图片绘制的大小，这里会保证图片绘制不变形
-        let sx;
-        let sy;
-        const borderRadius = image.borderRadius || 0;
-        const setWidth = image.width;
-        const setHeight = image.height;
-        const width = toRpxFunc(imgInfo.width);
-        const height = toRpxFunc(imgInfo.height);
 
-        if (width / height <= setWidth / setHeight) {
-          sx = 0;
-          sy = (height - ((width / setWidth) * setHeight)) / 2;
-        } else {
-          sy = 0;
-          sx = (width - ((height / setHeight) * setWidth)) / 2;
-        }
-        let result = {
-          type: 'image',
-          borderRadius,
-          borderWidth: image.borderWidth,
-          borderColor: image.borderColor,
-          zIndex: typeof zIndex !== 'undefined' ? zIndex : index,
-          imgPath,
-          sx,
-          sy,
-          sw: (width - (sx * 2)),
-          sh: (height - (sy * 2)),
-          x,
-          y,
-          w: setWidth,
-          h: setHeight,
-        }
-        resolve(result);
-      })
-      .catch(err => {
-        console.log(err);
-        reject(err)
-      });
+    if (!url) {
+      reject(new Error('未找到图片信息'))
+    } else {
+      // 下载图片
+      downImage(imageUrl, index)
+        // 获取图片信息
+        .then(imgPath => getImageInfo(imgPath, index))
+        .then(({ imgPath, imgInfo }) => {
+          // 根据画布的宽高计算出图片绘制的大小，这里会保证图片绘制不变形
+          let sx;
+          let sy;
+          const borderRadius = image.borderRadius || 0;
+          const setWidth = image.width;
+          const setHeight = image.height;
+          const width = toRpxFunc(imgInfo.width);
+          const height = toRpxFunc(imgInfo.height);
+
+          if (width / height <= setWidth / setHeight) {
+            sx = 0;
+            sy = (height - ((width / setWidth) * setHeight)) / 2;
+          } else {
+            sy = 0;
+            sx = (width - ((height / setHeight) * setWidth)) / 2;
+          }
+          let result = {
+            type: 'image',
+            borderRadius,
+            borderWidth: image.borderWidth,
+            borderColor: image.borderColor,
+            zIndex: typeof zIndex !== 'undefined' ? zIndex : index,
+            imgPath,
+            sx,
+            sy,
+            sw: (width - (sx * 2)),
+            sh: (height - (sy * 2)),
+            x,
+            y,
+            w: setWidth,
+            h: setHeight,
+          }
+          resolve(result);
+        })
+        .catch(err => {
+          console.log(err);
+          reject(err)
+        });
+    }
   });
 }

src/pages/activity/activity.js

@@ -23,24 +23,20 @@ export default class active extends Component {
     current: 0,
   }
 
-
   handleClick(value) {
     this.setState({
       current: value
     })
-  }  
+  }
 
   renderLogin() {
     return <Authorize></Authorize>
   }
 
   render() {
-    const { user } = this.state
-    // if (!user || !user.phone) {
-    //   return this.renderLogin()
-    // }
+    const { person: { phone } } = this.props.user.userInfo
 
-    return (!user || !user.phone) ? this.renderLogin() : (
+    return !phone ? this.renderLogin() : (
       <View style="height:100vh">
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >

src/pages/activity/assemblePage.js

@@ -6,8 +6,6 @@ import AssembleItem from './assembleItem'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 
-let pageIndex = 1
-
 @connect(state => state.city)
 export default class Index extends Component {
 
@@ -19,7 +17,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId: null
+    recordId: null,
+    pageIndex: 1,
   }
 
   componentWillMount() {
@@ -44,7 +43,6 @@ export default class Index extends Component {
   loadList(pageNumber) {
     const { curCity: { id: cityId } } = this.props
     const payload = { pageSize: 10, pageNumber }
-    console.log(payload)
 
     const { params: { buildingId, from } } = this.$router
     if (cityId) {
@@ -65,31 +63,34 @@ export default class Index extends Component {
     console.log(item, "data")
 
     Taro.navigateTo({
-      url: '/pages/activity/detail/assemble?id=' + item.groupActivityId+'&initiateId='+item.recordId
+      url: '/pages/activity/detail/assemble?id=' + item.groupActivityId+'&recordId='+item.recordId
     })
-
-
   }
 
   onPullDownRefresh = async (rest) => {
-    const { records, list, total } = await this.loadList(1);
+    const { records, list, total, current } = await this.loadList(1);
     const _list = records || list || []
     this.setState({
       list: _list,
       isEmpty: total == 0,
+      pageIndex: current,
       hasMore: _list.length >= total ? false : true
     })
     rest && rest()
   }
 
   onScrollToLower = async (fn) => {
-    const { list } = this.state;
-    pageIndex++
-    const { records, list: list1, total } = await this.loadList(pageIndex);
+    const { list, pageIndex } = this.state;
+    
+    const { records, list: list1, total, current } = await this.loadList(pageIndex + 1);
     const _list = records || list1 || []
+
+    console.log('---list-->', list, _list)
+
     const newList = list.concat(_list)
     this.setState({
       list: newList,
+      pageIndex: current,
       hasMore: newList.length >= total ? false : true
     });
     fn && fn();

src/pages/activity/assistancePage.js

@@ -6,8 +6,6 @@ import AssistanceItem from './assistanceItem'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 
-let pageIndex = 1
-
 @connect(state => state.city)
 export default class Index extends Component {
 
@@ -19,7 +17,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId: null
+    recordId: null,
+    pageIndex: 1,
   }
 
   componentWillMount() {
@@ -72,24 +71,26 @@ export default class Index extends Component {
   }
 
   onPullDownRefresh = async (rest) => {
-    const { records, list, total } = await this.loadList(1);
+    const { records, list, total, current } = await this.loadList(1);
     const _list = records || list || []
     this.setState({
       list: _list,
       isEmpty: total == 0,
+      pageIndex: current,
       hasMore: _list.length >= total ? false : true
     })
     rest && rest()
   }
 
   onScrollToLower = async (fn) => {
-    const { list } = this.state;
-    pageIndex++
-    const { records, list: list1, total } = await this.loadList(pageIndex);
+    const { list, pageIndex } = this.state;
+
+    const { records, list: list1, total, current } = await this.loadList(pageIndex + 1);
     const _list = records || list1 || []
     const newList = list.concat(_list)
     this.setState({
       list: newList,
+      pageIndex: current,
       hasMore: newList.length >= total ? false : true
     });
     fn && fn();

src/pages/activity/detail/assemble.js

@@ -211,18 +211,14 @@ export default class Detail extends Component {
 
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
-      // savePoint({
-      //   event: 'detail',
-      //   eventType: 'group',
-      //   propertyName: '拼团详情',
-      //   buildingId: res.buildingId,
-      //   targetId: res.groupActivityId,
-      //   data: '{}'
-      // }).then(res1 => {
-      //   this.setState({
-      //     recordId: res1.recordId
-      //   })
-      // })
+      savePoint({
+        event: 'detail',
+        eventType: 'group',
+        propertyName: '拼团详情',
+        buildingId: res.taShareActivity.buildingId,
+        targetId: id,
+        data: '{"recordId":"'+recordId+'"}'
+      }).then(() => {})
     })
   }
 

src/pages/activity/detail/assistance.js

@@ -213,18 +213,14 @@ export default class Detail extends Component {
 
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
-      // savePoint({
-      //   event: 'detail',
-      //   eventType: 'help',
-      //   propertyName: '助力详情',
-      //   buildingId: res.buildingId,
-      //   targetId: res.helpActivityId,
-      //   data: '{}'
-      // }).then(res1 => {
-      //   this.setState({
-      //     recordId: res1.recordId
-      //   })
-      // })
+      savePoint({
+        event: 'detail',
+        eventType: 'help',
+        propertyName: '助力详情',
+        buildingId: res.helpActivity.buildingId,
+        targetId: id,
+        data: '{"initiateId":"'+initiateId+'"}'
+      }).then(() => {})
     })
   }
 

src/pages/activity/detail/index.js

@@ -71,9 +71,9 @@ export default class Detail extends Component {
         loaded: true,
         selector: times(res.maxEnlistByPerson || 1).map((_, i) => `${i+1}`),
       }, () => {
-        console.log('-----state-->', this.state)
+
         const { detail } = this.state
-        if (detail.posters[0].posterImg) {
+        if (detail.posters && detail.posters.length && detail.posters[0].posterImg) {
           this.setState({
             posterShow: true
           })

src/pages/activity/index.js

@@ -6,8 +6,6 @@ import ActivityItem from './item'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 
-let pageIndex = 1
-
 @connect(state => state.city)
 export default class Index extends Component {
 
@@ -23,6 +21,8 @@ export default class Index extends Component {
     pageIndex: 1
   }
 
+  refreshing = false
+
   componentWillMount() {
     // App.zhuge.track('查看活动列表页面')
     savePoint({
@@ -37,15 +37,14 @@ export default class Index extends Component {
       console.log('活动列表')
     })
   }
-  componentDidMount() {
-    console.log(this.$router, "9999999999999999")
+ 
+  componentDidShow () {
+    this.onPullDownRefresh()
   }
+  
   componentWillUnmount() {
     const { recordId } = this.state
     updatePoint(recordId)
-
-    this.loadList(1)
-
   }
 
   loadList(pageNumber) {
@@ -90,6 +89,9 @@ export default class Index extends Component {
   }
 
   onPullDownRefresh = async (rest) => {
+    if (this.refreshing) return
+    this.refreshing = true
+
     const { records, list, total } = await this.loadList(1);
     const _list = records || list || []
     this.setState({
@@ -99,18 +101,20 @@ export default class Index extends Component {
       pageIndex: 1
     })
     rest && rest()
+    
+    this.refreshing = false
   }
 
   onScrollToLower = async (fn) => {
     const { list } = this.state;
-    pageIndex++
-    const { records, list: list1, total } = await this.loadList(this.state.pageIndex + 1);
+
+    const { records, list: list1, total, current } = await this.loadList(this.state.pageIndex + 1);
     const _list = records || list1 || []
     const newList = list.concat(_list)
     this.setState({
       list: newList,
       hasMore: newList.length >= total ? false : true,
-      pageIndex: this.state.pageIndex + 1
+      pageIndex: current,
     });
     fn && fn();
   }

src/pages/news/detail/index.js

@@ -123,7 +123,7 @@ export default class NewsDetail extends Component {
         isSaved: res.isSave
       }, () => {
         const { detail } = this.state
-        if (detail.posters[0].posterImg) {
+        if (detail.posters && detail.posters.length && detail.posters[0].posterImg) {
           this.setState({
             posterShow: 'flex'
           })
@@ -162,6 +162,7 @@ export default class NewsDetail extends Component {
         "page": 'pages/news/detail/index',
       }
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
+
       getMiniQrcode(payload).then(qrcode => {
         let data = {
           qrcode,//小程序二维码

src/pages/person/index.js

@@ -214,7 +214,7 @@ export default class Person extends Component {
     return (
       <View className='wrap'>
         {phone && this.renderDetail()}
-        {/* {!phone && this.renderLogin()} */}
+        {!phone && this.renderLogin()}
       </View>
     )
   }

src/pages/project/detail/index.js

@@ -152,7 +152,7 @@ export default class Index extends Component {
         circumOpts,
         isSaved: res.isSave
       }, () => {
-        if (res.poster) {
+        if (res.posters && res.posters.length) {
           this.setState({
             posterShow: 'flex'
           })
@@ -327,6 +327,15 @@ export default class Index extends Component {
       // App.zhuge.track('生成海报')
 
       this.getPosterData().then(posterData => {
+        const { poster, qrcode } = posterData || {}
+        if (!poster || !qrcode) {
+          Taro.showToast({
+            title: '没有海报背景或二维码',
+            icon: 'none'
+          })
+          return
+        }
+
         this.setState({
           posterStatus: !!flag,
           posterData

src/pages/project/index.js

@@ -252,10 +252,54 @@ export default class Index extends Component {
   }
 
   handleBannerClick(item) {
-    Taro.navigateTo({
-      url: `/pages/project/detail/index?id=${item.buildingId}`
-    })
+    this.redirectTo(item)
   }
+
+  redirectTo({contentId, contentType, buildingId} = {}) {
+    switch (contentType) {
+      // 项目
+      case 'project':
+        Taro.navigateTo({
+          url: '/pages/project/detail/index?id=' + buildingId
+        })
+        return;
+
+      // 活动
+      case 'activity':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/index?id=' + contentId
+        })
+        return;
+
+      // 助力
+      case 'help':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assistance?id=' + contentId
+        })
+        return;
+      
+      // 拼团
+      case 'group':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assemble?id=' + contentId
+        })
+        return;
+      
+      // 资讯
+      case 'news':
+        Taro.navigateTo({
+          url: 'pages/news/detail/index?id=' + contentId
+        })
+        return;
+      
+      // 其他
+      case 'others':
+      default:
+        this.handleMaskClose()
+        return;
+    }
+  }
+
   handleHelpGroupClick(item) {
     if (item.type == 1) {
       Taro.navigateTo({
@@ -294,12 +338,9 @@ export default class Index extends Component {
   }
 
   handleMaskBannerClick(data) {
-    Taro.navigateTo({
-      url: '/pages/project/detail/index?id=' + data.buildingId
-    })
+    this.redirectTo(data)
   }
 
-
   handleLocationClick() {
     Taro.navigateTo({
       url: `/pages/city/index`

src/pages/shop/index.js

@@ -212,9 +212,6 @@ export default class Shop extends Component {
     const { goodsList, goodsBuilding, current } = this.state
 
     return (
-
-
-
       <View className="list__wrap">
         {
 
@@ -331,13 +328,11 @@ export default class Shop extends Component {
   }
 
   render() {
-    const { person: { personType } } = this.props.userInfo
-    //const { person: { phone } } = this.props.userInfo
-    const isDrift = personType === ROLE_CODE['DRIFT']
+    const { person: { phone } } = this.props.userInfo
 
     return (
       <View className='wrap'>
-        {isDrift ? this.renderLogin() : this.renderDetail()}
+        {!phone ? this.renderLogin() : this.renderDetail()}
       </View>
     )
   }

src/utils/login.js

@@ -24,11 +24,13 @@ export default function (params, callback) {
         const { dispatch } = getStore()
         Taro.setStorageSync('token', token)
         Taro.setStorageSync('sessionKey', sessionKey)
-        
+
+        dispatch({ type: USER_INFO, payload: { extraInfo, person } })
+
         // 用户信息已授权获取成功
         if (miniAuthorized) {
           // 保存用户信息
-          dispatch({ type: USER_INFO, payload: { extraInfo, person } })
+          // dispatch({ type: USER_INFO, payload: { extraInfo, person } })
           callback && callback(data)
 
         } else {