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

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    // HOST: '"http://192.168.0.84:8080"',
+    // WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行联调",
-	"appid": "wxd9ee3a9480a4e544",
+	"appid": "wxda1f84b79b3edeb3",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

@@ -144,12 +144,41 @@ class App extends Component {
       ]
     },
   }
+
   componentDidHide() {
-    ready.close()
+    // ready.close()
     // socket.closeSocket()
   }
 
   componentDidShow() {
+    const updateManager = wx.getUpdateManager()
+    updateManager.onCheckForUpdate(function (res) {
+      // 请求完新版本信息的回调
+      console.info('新版本是否更新:', res.hasUpdate)
+    })
+
+    updateManager.onUpdateReady(function () {
+      wx.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，是否重启应用？',
+        success(res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate()
+          }
+        }
+      })
+    })
+  }
+  componentDidMount() {
+    console.info('app componentDidMount')
+  }
+  componentWillMount(params) {
+    // console.info('app componentWillMount', params)
+    this.initData()
+  }
+
+  initData () {
     console.info('app componentDidShow')
     console.info('router1', this.$router.params)
     console.info('ready status1', ready)
@@ -190,31 +219,6 @@ class App extends Component {
         })
       })
     })
-
-    const updateManager = wx.getUpdateManager()
-    updateManager.onCheckForUpdate(function (res) {
-      // 请求完新版本信息的回调
-      console.info('新版本是否更新:', res.hasUpdate)
-    })
-
-    updateManager.onUpdateReady(function () {
-      wx.showModal({
-        title: '更新提示',
-        content: '新版本已经准备好，是否重启应用？',
-        success(res) {
-          if (res.confirm) {
-            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-            updateManager.applyUpdate()
-          }
-        }
-      })
-    })
-  }
-  componentDidMount() {
-    console.info('app componentDidMount')
-  }
-  componentWillMount(params) {
-    console.info('app componentWillMount', params)
   }
 
   getRouterParams() {

src/components/charts/Line.js

@@ -2,19 +2,96 @@ import Taro, { Component } from '@tarojs/taro'
 import echarts from '../ec-canvas/echarts'
 import './style.scss'
 
-function initChart(callback, options) {
+function initChart(options, callback) {
   return function (canvas, width, height) {
     const chart = echarts.init(canvas, null, {
       width: width,
       height: height
     });
     canvas.setChart(chart);
-    chart.setOption(options);
+    chart.setOption(options);    
     callback && callback(chart);
     return chart;
   }
 }
 
+function createLineOptions(source = []) {
+  const colorWithOpacity = op => `rgba(187,156,121, ${op})`
+
+  const defaultOpt = {
+    color: [colorWithOpacity(1)],
+    xAxis: {
+      type: 'category',
+      boundaryGap: false,
+      axisLabel: {
+        textStyle: {
+          color: '#666'
+        }
+      }
+
+    },
+    yAxis: {
+      type: 'value',
+      axisLabel: {
+        textStyle: {
+          color: '#666'
+        }
+      }
+    },
+    grid: {
+      left: '10%',
+      right: '8%',
+      bottom: '12%',
+      top: '15%',
+    },
+    series: [],
+  }
+
+  // 数据展示只展示 5 个
+  const endValue = source.length - 1 > 0 ? source.length - 1 : 0
+  const startValue = endValue - 5 > 0 ? endValue - 5 : 0
+
+  return {
+    ...defaultOpt,
+    dataset: { source },
+    dataZoom: [{
+      type: 'inside',
+      startValue, endValue,
+      show: true,
+    }],
+    series: [{
+      type: 'line',
+      dimensions: ['name', 'value'],
+      symbolSize: 6,
+      smooth: true,
+      label: {
+        show: true,
+        formatter: '{@value}人'
+      },
+      lineStyle: {
+        shadowColor: colorWithOpacity(0.5),
+        shadowBlur: 5,
+        shadowOffsetY: 7
+      },
+      areaStyle: {
+        color: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [{
+            offset: 0, color: colorWithOpacity(0.2) // 0% 处的颜色
+          }, {
+            offset: 1, color: colorWithOpacity(0) // 100% 处的颜色
+          }],
+          global: false,
+        }
+      },
+    }],
+  }
+}
+
 /**
  * 传入 source 的格式为 [{ name: xxx, value: xxx }, {}]
  */
@@ -25,148 +102,55 @@ export default class LineChart extends Component {
     }
   }
 
-  // this.echart
-  echart = null
+  // this.ecComponent
+  chart = null;
   ecComponent = null
 
   state = {
     ec: { lazyLoad: true },
+    isDisposed: false,
   }
 
-  // 禁止 props 变更时渲染
-  shouldComponentUpdate(nextProps) {
-    console.log('--nextProps--->', nextProps)
-
-    this.refreshChart(nextProps.source)
-
-    return false
+  componentDidShow() {
+    this.setState({ isDisposed: false })
   }
 
-  handleEcComponent(ref) {
-    this.ecComponent = ref
+  componentDidHide() {
+    this.setState({ isDisposed: true })
   }
 
-  handleChart(chart) {
-    this.echart = chart
+  componentDidMount() {
+    this.ecComponent = this.$scope.selectComponent(`#${this.props.lid}`)
+    this.init(this.props)
   }
 
-  createOptions(source = []) {
-    const colorWithOpacity = op => `rgba(187,156,121, ${op})`
-
-    const defaultOpt = {
-      color: [colorWithOpacity(1)],
-      xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        axisLabel: {
-          textStyle: {
-            color: '#666'
-          }
-        }
-
-      },
-      yAxis: {
-        type: 'value',
-        axisLabel: {
-          textStyle: {
-            color: '#666'
-          }
-        }
-      },
-      grid: {
-        left: '10%',
-        right: '8%',
-        bottom: '12%',
-        top: '10%',
-      },
-      series: [],
-    }
-
-    // 数据展示只展示 5 个
-    const endValue = source.length - 1 > 0 ? source.length - 1 : 0
-    const startValue = endValue - 5 > 0 ? endValue - 5 : 0
+  componentWillReceiveProps(nextProps) {
+    // 简单优化, 不显示的组件不更新
+    // 但是有个 bug 。如果此时有 props 更新, 会导致页面绘制的数据错误
+    if (this.state.isDisposed) return
 
-    return {
-      ...defaultOpt,
-      dataset: { source },
-      dataZoom: [{
-        type: 'slider',
-        startValue, endValue,
-        show: true,
-        xAxisIndex: [0],
-        handleSize: 10,//滑动条的 左右2个滑动条的大小  
-        height: 20,//组件高度  
-        left: 30, //左边的距离  
-        right: 30,//右边的距离  
-        bottom: 0,//下边的距离  
-        handleColor: 'rgba(0,0,0,0.1)',//h滑动图标的颜色  
-        realtime : true,
-        handleStyle: {
-          borderColor: "#999",
-          borderWidth: "1",
-          shadowBlur: 2,
-          background: "rgba(0,0,0,0.1)",
-          shadowColor: "rgba(0,0,0,0.1)",
-        },
-        backgroundColor: 'rgba(0,0,0,0.1)',//两边未选中的滑动条区域的颜色  
-        showDataShadow: false,//是否显示数据阴影 默认auto  
-        showDetail: false,
-
-      }],
-      series: [{
-        type: 'line',
-        dimensions: ['name', 'value'],
-        symbolSize: 6,
-        smooth: true,
-        label: {
-          show: true,
-          formatter: '{@value}人'
-        },
-        lineStyle: {
-          shadowColor: colorWithOpacity(0.5),
-          shadowBlur: 5,
-          shadowOffsetY: 7
-        },
-        areaStyle: {
-          color: {
-            type: 'linear',
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            colorStops: [{
-              offset: 0, color: colorWithOpacity(0.2) // 0% 处的颜色
-            }, {
-              offset: 1, color: colorWithOpacity(0) // 100% 处的颜色
-            }],
-            global: false,
-          }
-        },
-      }],
+    // 简单的性能优化, 只有数据改变了才重新绘图
+    if (JSON.stringify(nextProps.source) != JSON.stringify(this.props.source)) {
+      this.init(nextProps)
     }
   }
 
-  refreshChart(source) {
-    const options = this.createOptions(source)
-
-    if (!this.echart) {
-      if (this.ecComponent) {
-        const initFunc = initChart(this.handleChart.bind(this), options)
-        this.ecComponent.init(initFunc)
-      } else {
-        console.warn('echart componet not ready')
+  init = (props) => {
+    const tk = setTimeout(() => {
+      if (this.ecComponent && props.source && props.source.length) {
+        const options = createLineOptions(props.source)
+        this.ecComponent.init(initChart(options, chart => (this.chart = chart)))
       }
-    } else {
-      this.echart.setOption(options)
-    }
+
+      clearTimeout(tk)
+    }, 500)
   }
 
   render() {
-    // this.refreshChart(this.props.source)
     return (
       <View style="width:100vw;height:480rpx;position: relative;">
         <View className="map-container">
-          <ec-canvas ref={this.handleEcComponent} ec={this.state.ec}></ec-canvas>
+          <ec-canvas id={this.props.lid} ec={this.state.ec}></ec-canvas>
         </View>
       </View>
     )

src/pages/activity/detail/assemble.js

@@ -642,7 +642,7 @@ export default class Detail extends Component {
                         (groupState === GroupInProcess && !isJoin) &&
                         (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></FormIdCollector></View>)
                       }                      
-                      <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"}>
+                      <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} style="border:none">
                         <FormIdCollector>
                           <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
                         </FormIdCollector>

src/pages/activity/detail/index.js

@@ -190,7 +190,7 @@ export default class Detail extends Component {
         return
       }
 
-      const { userInfo: { person } } = this.props
+      const { userInfo: { person, miniApp } } = this.props
       const { avatarurl, nickname, personId } = person
       const { detail: { dynamicId, posters, createDate } } = this.state
       const payload = {
@@ -208,6 +208,7 @@ export default class Detail extends Component {
           title: posters[0].posterTitle,//海报标题
           posterDescription: posters[0].posterDescription,//海报标题
           createDate: createDate,//时间
+          miniAppName: miniApp.name, // 小程序名称
         }
         resolve(data)
       })

src/pages/activity/detail/poster.js

@@ -110,16 +110,16 @@ export default class Index extends Component {
       {
         x: 100,
         y: 1065,
-        text: '橙蕉',
+        text: data.miniAppName,
         fontSize: 34,
         color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 120,
+        width: (data.miniAppName || '').length * 30 + 60,
         zIndex: 11
       },
       {
-        x: 190,
+        x: (data.miniAppName || '').length * 30 + 130,
         y: 1065,
         text: '热门活动',
         fontSize: 26,

src/pages/card/index.js

@@ -293,7 +293,7 @@ export default class Index extends Component {
         resolve(posterData)
         return
       }
-      const { userInfo: { person }, projectDetail: { buildingId }, cardInfo } = this.props
+      const { userInfo: { person, miniApp }, projectDetail: { buildingId }, cardInfo } = this.props
       const { id } = cardInfo
       const { personId } = person
       const payload = {
@@ -301,7 +301,7 @@ export default class Index extends Component {
         "page": 'pages/card/index',
       }
       getMiniQrcode(payload).then(qrcode => {
-        let data = Object.assign({ qrcode }, cardInfo)
+        let data = Object.assign({ qrcode, miniAppName: miniApp.name }, cardInfo)
         resolve(data)
       })
     })

src/pages/card/poster.js

@@ -118,16 +118,16 @@ export default class Index extends Component {
       {
         x: 170,
         y: 755,
-        text: '橙蕉',
+        text: data.miniAppName,
         fontSize: 34,
         color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 120,
+        width: (data.miniAppName || '').length * 30 + 60,
         zIndex: 100
       },
       {
-        x: 260,
+        x: (data.miniAppName || '').length * 30 + 200,
         y: 755,
         text: '查看主页',
         fontSize: 26,
@@ -140,7 +140,7 @@ export default class Index extends Component {
       {
         x: 320,
         y: 1075,
-        text: '橙蕉',
+        text: data.miniAppName,
         fontSize: 32,
         color: '#b5b3b3',
         baseLine: 'middle',

src/pages/news/detail/index.js

@@ -154,7 +154,7 @@ export default class NewsDetail extends Component {
         resolve(posterData)
         return
       }
-      const { userInfo: { person } } = this.props
+      const { userInfo: { person, miniApp } } = this.props
       const { avatarurl, nickname, personId } = person
       const { newsId, detail: { posters, newsName, createDate } } = this.state
       const payload = {
@@ -171,7 +171,8 @@ export default class NewsDetail extends Component {
           title: posters[0].posterTitle,//资讯海报标题
           posterDescription: posters[0].posterDescription,//资讯海报描述
           createDate: createDate,//资讯时间
-          poster: posters[0].posterImg
+          poster: posters[0].posterImg,
+          miniAppName: miniApp.name,
         }
         resolve(data)
       })

src/pages/news/detail/poster.js

@@ -110,16 +110,16 @@ export default class Index extends Component {
       {
         x: 100,
         y: 1065,
-        text: '橙蕉',
+        text: data.miniAppName,
         fontSize: 34,
         color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 120,
+        width: (data.miniAppName || '').length * 30 + 60,
         zIndex: 11
       },
       {
-        x: 190,
+        x: (data.miniAppName || '').length * 30 + 130,
         y: 1065,
         text: '查看资讯',
         fontSize: 26,

src/pages/person/customerAnalysis/analysis.js

@@ -12,6 +12,7 @@ import { connect } from '@tarojs/redux'
 import LineChart from "../../../components/charts/Line";
 const nothing = require('@assets/person/nothing.png')
 
+const rand = n => Math.random().toString(36).substr(2, n)
 
 @connect(({ user, city }) => ({ user, city }))
 export default class analysis extends Taro.Component {
@@ -28,6 +29,7 @@ export default class analysis extends Taro.Component {
     chartInfo: [],
     chartInfo2: [],
     chartInfo3: [],
+    lineIds: [ rand(7), rand(7), rand(7) ],
   }
 
   componentWillUnmount() {
@@ -160,7 +162,7 @@ export default class analysis extends Taro.Component {
 
     const tabList = [{ title: '新增客户' }, { title: '跟进客户' }, { title: '到访客户' }]
     const dailyMonth = ['日', '月']
-    const { sexInfo, chartInfo, chartInfo2, chartInfo3, checkedWhich, current } = this.state
+    const { sexInfo, chartInfo, chartInfo2, chartInfo3, checkedWhich, current, lineIds } = this.state
 
     return (
       <View>
@@ -179,7 +181,7 @@ export default class analysis extends Taro.Component {
               </View>
               {
                 chartInfo.length &&
-                <LineChart source={chartInfo} />
+                <LineChart source={chartInfo} lid={lineIds[0]} />
               }
               {
                 !chartInfo.length &&
@@ -218,7 +220,7 @@ export default class analysis extends Taro.Component {
                 </View>
               </View>
               {chartInfo2.length &&
-                <LineChart source={chartInfo2} />
+                <LineChart source={chartInfo2} lid={lineIds[1]}/>
               }
               {
                 !chartInfo2.length &&
@@ -258,7 +260,7 @@ export default class analysis extends Taro.Component {
               </View>
               {
                 chartInfo3.length &&
-                <LineChart source={chartInfo3} />
+                <LineChart source={chartInfo3} lid={lineIds[2]} />
               }
               {
                 !chartInfo3.length &&

src/pages/project/detail/Around/index.js

@@ -15,7 +15,7 @@ export default function Around(props) {
   // 展示内容数组
   const dataList = poiDatas.map((item) => {
     const key = item.key
-    const manualData = (detail[`building${key}`] === '' ? [] : detail[`building${key}`].split(','))
+    const manualData = (detail[`building${key}`] === '' ? [] : (detail[`building${key}`] || '').split(','))
     
     return {
       ...item,
@@ -28,7 +28,7 @@ export default function Around(props) {
   const markersList = dataList.map((item) => {
     const mapJson = JSON.parse(item.data) 
     return (mapJson || []).map((it) => {
-      const [longitude, latitude] = it.location.split(',')
+      const [longitude, latitude] = (it.location || '').split(',')
 
       return {
         id: it.id,

src/pages/project/detail/index.js

@@ -48,8 +48,8 @@ export default class Index extends Component {
     activityList: [],
     helpList: [],
     groupList: [],
-    statusOpts: ['待定', '售罄', '在售'],
-    statusBgColors: ['#F6B61D', '#BB9C79', '#CECECE'],
+    statusOpts: ['待售', '售罄', '在售'],
+    statusBgColors: ['#BB9C79', '#CECECE', '#F6B61D'],
     // circumOpts: [],
     curTab: 'Transport',
     recordId: null,
@@ -63,7 +63,6 @@ export default class Index extends Component {
 
   componentWillMount() {
     ready.queue(() => {
-    
       // 分享场景需要先授权手机, 再授权头像
       const options = wx.getLaunchOptionsSync()
       if (sceneInShare(options.scene)) {
@@ -80,6 +79,7 @@ export default class Index extends Component {
 
       this.initPageData()
     })
+    console.log('---------------after componentWillMount---------------')
   }
 
   componentWillUnmount() {
@@ -245,10 +245,10 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum (index){
+  toViewAlbum(index) {
     const { buildingId } = this.state
-    console.log('1111111',index)
-    this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}` )
+    console.log('1111111', index)
+    this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}`)
   }
 
   onViewFans() {
@@ -297,7 +297,7 @@ export default class Index extends Component {
         return
       }
       const {
-        userInfo: { person: { avatarurl, nickname, personId } },
+        userInfo: { person: { avatarurl, nickname, personId }, miniApp },
         projectDetail: { posters, buildingId, poster, price, buildingRestaurant, createDate, buildingName, tel, buildingTag, uvList = {} }
       } = this.props
       const { total = 0 } = uvList
@@ -319,7 +319,8 @@ export default class Index extends Component {
           buildingName: posters[0].posterTitle,//标题
           createDate: createDate,//时间
           buildingTag: buildingTag,//标签,
-          total: total//围观人数
+          total: total, //围观人数
+          miniAppName: miniApp.name,
         }
         resolve(data)
       })
@@ -636,21 +637,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)} onClick={()=>this.toViewAlbum(index)}></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>
                       )
                       // }
 
@@ -868,21 +869,21 @@ export default class Index extends Component {
   }
   renderActivities() {
 
- 
+
     const { activityList } = this.state
-   
+
     return (
       <Block>
         {
           activityList.length > 0 && (
             <View className="activity" >
-           
+
               <View className="section-head">
-                 <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>
+                <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
@@ -897,7 +898,7 @@ export default class Index extends Component {
 
               </View>
             </View>
-      
+
           )
         }
       </Block>

src/pages/project/detail/poster.js

@@ -101,16 +101,16 @@ export default class Index extends Component {
       {
         x: 100,
         y: 1070,
-        text: '橙蕉',
+        text: data.miniAppName,
         fontSize: 34,
         color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 120,
+        width: (data.miniAppName || '').length * 30 + 60,
         zIndex: 11
       },
       {
-        x: 190,
+        x: (data.miniAppName || '').length * 30 + 130,
         y: 1070,
         text: '项目详情',
         fontSize: 26,

src/utils/request.js

@@ -94,7 +94,7 @@ export const fetch = async (options) => {
       icon: 'none'
     })
 
-    throw new Error(errMessage)
+    throw new Error(err)
   })
 }