Merge branch 'v3.5.1' into dev

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "editor.fontFamily": "'Cascadia Code', Consolas, 'Courier New', monospace"
+}

config/dev.js

@@ -5,12 +5,17 @@ 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"',
+<<<<<<< HEAD
     // HOST: '"http://192.168.2.52:8080"',
     // WSS_HOST: '"ws://192.168.2.52:8080"',
+=======
+    HOST: '"http://127.0.0.1:8080"',
+    WSS_HOST: '"ws://127.0.0.1:8080"',
+>>>>>>> v3.5.1
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -5,10 +5,10 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.0.218:8080"',
     // WSS_HOST: '"ws://192.168.0.218:8080"',
-    HOST: '"https://dev.jinchengjiaye.com"',
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    // HOST: '"https://dev.jinchengjiaye.com"',
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    HOST: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
   },
   weapp: {},
   h5: {}

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行联调",
-	"appid": "wxd9ee3a9480a4e544",
+	"description": "知与行互动",
+	"appid": "wxd6f47a9bb3052175",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

@@ -182,7 +182,7 @@ class App extends Component {
   }
 
   initData () {
-    console.info('app componentDidShow')
+    // console.info('app componentDidShow')
     console.info('router1', this.$router.params)
     console.info('ready status1', ready)
 

src/components/TimeTicker/index.jsx

@@ -1,16 +1,18 @@
 import Taro from '@tarojs/taro'
 import dayjs from 'dayjs'
-
-// 未开始
-const STATUS_READY = -1
-
-// 进行中
-const STATUS_PROCESSING = 0
-
-// 已结束
-const STATUS_OVER = 1
+import {
+  STATUS_READY,
+  STATUS_PROCESSING,
+  STATUS_OVER,
+  getPreText,
+  getTkText,
+  isFunction,
+} from './utils'
 
 export default class TimeTicker extends Taro.Component {
+  static options = {
+    addGlobalClass: true
+  }
 
   state = {
     status: STATUS_READY,
@@ -23,8 +25,17 @@ export default class TimeTicker extends Taro.Component {
   timer = null
 
   componentWillMount() {
+    this.computeProps(this.props)
+  }
 
+  componentWillReceiveProps(nextProps) {
+    this.computeProps(nextProps)
+  }
 
+  componentWillUnmount() {
+    if (this.timer) {
+      clearInterval(this.timer)
+    }
   }
 
   computeProps(props) {
@@ -44,62 +55,113 @@ export default class TimeTicker extends Taro.Component {
 
     if (!t1 || !t2) {
       // 只设置了一个时间
-      targetTime = t1 ? dayjs(t1).valueOf() : dayjs(t2).valueOf()
-
-      if (now > targetTime) {
-        status = STATUS_OVER
-      } else if (now === targetTime) {
-        status = STATUS_PROCESSING
-      } else {
-        status = STATUS_READY
-      }
+      tmEnd = tmStart = t1 ? dayjs(t1).valueOf() : dayjs(t2).valueOf()
     } else {
       // 设置了时间区间
-      const dtStart = dayjs(t1).valueOf()
-      const dtEnd = dayjs(t2).valueOf()
-
-      if (dtStart > now) {
-        status = STATUS_READY
-        targetTime = dtStart
-      } else if (dtStart <= now && now < dtEnd) {
-        status = STATUS_PROCESSING
-        targetTime = dtEnd
-      } else {
-        status = STATUS_OVER
-        targetTime = dtEnd
-      }
+      tmStart = dayjs(t1).valueOf()
+      tmEnd = dayjs(t2).valueOf()
     }
 
-    this.setState({ status, targetTime }, this.startTimer.bind(this))
+    if (tmStart > now) {
+      status = STATUS_READY
+    } else if (tmStart <= now && now < tmEnd) {
+      status = STATUS_PROCESSING
+    } else {
+      status = STATUS_OVER
+    }
+
+    this.setState({ status, tmStart, tmEnd }, () => this.startTimer(props))
   }
 
-  startTimer = (props) => {
+  computeStatus(props) {
     const {
-      status,
-      targetTime,
-      interval = 1000,
       onStart,
       onProcess,
       onEnd,
     } = props || {}
 
-    if (this.timer) {
-      clearInterval(this.timer)
+    let {
+      status,
+      tmStart,
+      tmEnd,
+      preText,
+      tkText,
+    } = this.state
+
+    const now = dayjs().valueOf()
+    const diff = status === STATUS_READY ? tmStart - now : tmEnd - now
+
+    if (diff <= 0) {
+      if (status === STATUS_READY) {
+        status = tmStart === tmEnd ? STATUS_OVER : STATUS_PROCESSING
+        
+        if (isFunction(onStart)) {
+          [preText, tkText] = onStart()
+        }
+      } else {
+        status = STATUS_OVER
+        if (this.timer) {
+          clearInterval(this.timer)
+        }
+
+        if (isFunction(onEnd)) {
+          [preText, tkText] = onEnd()
+        }
+      }
+    } else {
+      if (isFunction(onProcess)) {
+        [preText, tkText] = onProcess(diff, status)
+      }
     }
 
-    this.timer = setInterval(() => {
-      const now = dayjs().valueOf()
-      const diff = targetTime - now
+    if (preText === undefined) {
+      preText = getPreText(diff, status)
+    }
+    
+    if (tkText === undefined) {
+      tkText = getTkText(diff, status)
+    }
 
+    this.setState({ status, preText, tkText })
+  }
 
+  startTimer = (props) => {
+    const { interval = 1000 } = props || {}
 
-    }, interval)
+    if (this.timer) {
+      clearInterval(this.timer)
+    }
 
+    // 立即执行一次
+    this.computeStatus(props);
+    // 再循环执行
+    this.timer = setInterval(() => this.computeStatus(props), interval)
   }
 
-  render() {
-    
 
 
+  classNames = (...args) => {
+    return (args || []).reduce((cls, item) => {
+      return [].concat(cls).concat(item)
+    }, []).filter(x => x).join(' ')
+  }
+
+  render() {
+    const wrapperCls = this.classNames('tk-box', this.props.className)
+    const headerCls = this.classNames('tk-box-header', this.props.headerClass)
+    const bodyCls = this.classNames('tk-box-body', this.props.bodyClass)
+
+    return (
+      <View className={wrapperCls}>
+        {
+          this.state.preText &&
+          (<Text className={headerCls}>{this.state.preText}</Text>)
+        }        
+        {
+          this.state.tkText &&
+          (<Text className={bodyCls}>{this.state.tkText}</Text>)
+        }        
+      </View>
+    );
   }
 }

src/components/TimeTicker/utils.js

@@ -0,0 +1,23 @@
+
+import { formateLeftTime } from '@utils/tools'
+
+// 未开始
+export const STATUS_READY = -1
+
+// 进行中
+export const STATUS_PROCESSING = 0
+
+// 已结束
+export const STATUS_OVER = 1
+
+export function getPreText(tk, status) {
+  return status === STATUS_OVER ? '已结束' : `距离 ${status === STATUS_READY ? '开始' : '结束'} 还有: `
+}
+
+export function getTkText(tk, status) {
+  return status === STATUS_OVER ? '' : formateLeftTime(tk)
+}
+
+export function isFunction(fn) {
+  return typeof fn === 'function'
+}

src/pages/activity/detail/assemble.js

@@ -11,6 +11,7 @@ import dayjs from 'dayjs'
 // import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import {
   getGroupDetail,
   createGroupActivity,
@@ -95,18 +96,26 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.groupActivityId) {
-      let id = this.$router.params.id
-      let recordId = this.$router.params.recordId
+      const router = Taro.getStorageSync('router')
+      let id = this.$router.params.id || router.query.id
+      let recordId = this.$router.params.recordId || router.query.recordId
 
       if (!id) {
-        const router = Taro.getStorageSync('router')
-        id = router.query.id
-        recordId = router.query.recordId
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ id: res.id, recordId: res.recordId }, () => {
+            this.loadDetail()
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到活动',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ id, recordId }, () => {
+          this.loadDetail()
+        })
       }
-
-      this.setState({ id, recordId }, () => {
-        this.loadDetail()
-      })
     }
   }
 
@@ -684,4 +693,4 @@ export default class Detail extends Component {
       </Block>
     )
   }
-}
+}

src/pages/activity/detail/assistance.js

@@ -11,6 +11,7 @@ import dayjs from 'dayjs'
 // import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import {
   getHelpDetail,
   createHelpActivity,
@@ -95,18 +96,27 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.helpActivityId) {
-      let id = this.$router.params.id
-      let initiateId = this.$router.params.initiateId
+      const router = Taro.getStorageSync('router')
+      let id = this.$router.params.id || router.query.id
+      let initiateId = this.$router.params.initiateId || router.query.initiateId
 
       if (!id) {
-        const router = Taro.getStorageSync('router')
-        id = router.query.id
-        initiateId = router.query.initiateId
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ id: res.id, initiateId: res.initiateId }, () => {
+            this.loadDetail()
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到活动',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ id, initiateId }, () => {
+          this.loadDetail()
+        })
       }
 
-      this.setState({ id, initiateId }, () => {
-        this.loadDetail()
-      })
     }
   }
 
@@ -650,4 +660,4 @@ export default class Detail extends Component {
       </View>
     )
   }
-}
+}

src/pages/activity/detail/index.js

@@ -8,6 +8,7 @@ import WxParse from '@components/wxParse/wxParse'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, transferImage } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import {
   addActivityShareNum,
   signupActivity,
@@ -47,10 +48,25 @@ export default class Detail extends Component {
   componentWillMount() {
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id || '2fe920719b8b0db50011441462e647ad'
-      this.setState({ id }, () => {
-        this.loadDetail()
-      })
+      // const id = this.$router.params.id || router.query.id || '2fe920719b8b0db50011441462e647ad'
+
+      const id = this.$router.params.id || router.query.id
+      if (!id) {
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ id: res.id }, () => {
+            this.loadDetail()
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到活动',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ id }, () => {
+          this.loadDetail()
+        })
+      }
     })
   }
   componentWillUnmount() {

src/pages/card/index.js

@@ -36,14 +36,11 @@ export default class Index extends Component {
     recordId: null,
     isSave: false,
     bound: false,
-    modalStatus: false,
     grantPhoneVisible: false, // 授权手机弹框
   }
 
   componentWillMount() {
     ready.queue(() => {
-      // const router = Taro.getStorageSync('router')
-      // const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
       // 分享场景需要先授权手机, 再授权头像
       const options = wx.getLaunchOptionsSync()
       if (sceneInShare(options.scene)) {
@@ -66,19 +63,20 @@ export default class Index extends Component {
     const router = Taro.getStorageSync('router')
     const id = this.$router.params.id || router.query.id
 
-    if (router.query.id) {
-      this.setState({
-        cardId: id,
-        modalStatus: true
-      }, this.loadCardDetail)
+    if (!id) {
+      getQrCodeParams(this.$router.params.scene).then(res => {
+        this.setState({ cardId: res.id }, this.loadCardDetail)
+        addCardUv(res.id)
+      }).catch(err => {
+        Taro.showToast({
+          title: '没有找到卡片',
+          icon: 'none'
+        })
+      })
     } else {
-      this.setState({
-        cardId: id,
-        modalStatus: false
-      }, this.loadCardDetail)
+      this.setState({ cardId: id }, this.loadCardDetail)
+      addCardUv(id)
     }
-
-    addCardUv(id)
   }
 
   componentWillReceiveProps(nextProps) {
@@ -377,7 +375,6 @@ export default class Index extends Component {
       const { cardInfo, userInfo: { person } } = this.props
       if (person.personId != cardInfo.id) {
         reportClient(payload).then(res => {
-          this.hideModal()
           this.setState({ bound: true })
           if (res !== 'bound') {
             Taro.showToast({
@@ -439,11 +436,6 @@ export default class Index extends Component {
     }
   }
 
-  hideModal() {
-    this.setState({
-      modalStatus: false
-    })
-  }
   handleAuthPhoneSuccess = (phone) => {
     const { person = {} } = this.props.userInfo || {}
     if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
@@ -463,7 +455,7 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { makePosterStatus, posterData, modalStatus, grantPhoneVisible } = this.state
+    const { makePosterStatus, posterData, grantPhoneVisible } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
@@ -475,8 +467,6 @@ export default class Index extends Component {
     const isConsultant = personType === ROLE_CODE['CONSULTANT']
     const hadPhone = (phone || tel) ? true : false  // nb
     const visibleChatBtn = !isConsultant && !isSelf
-    // const visibleConfirmModal = modalStatus && !isReport && !isSelf && (personType === ROLE_CODE['DRIFT'] || personType === ROLE_CODE['CUSTOMER'])
-    const visibleConfirmModal = modalStatus && !isReport && !isSelf
     const showAuthPhone = grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone
     return (
       <Block>
@@ -487,23 +477,6 @@ export default class Index extends Component {
           showAuthPhone &&
           <AchievePhone user={userInfo.person} onCancel={this.handeAuthPhoneFail} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
-        {
-          // !showAuthPhone && visibleConfirmModal && (
-          //   <View className="modal">
-          //     <View className="modal-mask" onClick={this.hideModal}></View>
-          //     <View className="modal-body">
-          //       <View className="modal-body__con">请确认是否成为他的客户？</View>
-          //       {
-          //         hadPhone ? (
-          //           <Button onClick={this.handleModalConfirm} className='modal-body__btn'>确认</Button>
-          //         ) : (
-          //             <Button open-type="getPhoneNumber" onGetphonenumber={this.handleGetPhone} className='modal-body__btn'>确认</Button>
-          //           )
-          //       }
-          //     </View>
-          //   </View>
-          // )
-        }
 
         {this.state.loaded && (
           <View className='mycard'>

src/pages/news/detail/index.js

@@ -8,6 +8,7 @@ import BackHomeBtn from '@components/BackHomeBtn'
 import Notice from '@components/Notice'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 import { getDownloadURL, transferImage } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import {
   addNewsUv,
   favorNews,
@@ -41,12 +42,26 @@ export default class NewsDetail extends Component {
       console.info('news-1:', router)
       console.info('news-2:', this.$router)
 
-      const newsId = this.$router.params.id || router.query.id || '16'
+      const newsId = this.$router.params.id || router.query.id
 
-      this.setState({ newsId }, () => {
-        this.loadDetail()
-        addNewsUv(newsId)
-      })
+      if (!newsId) {
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ newsId: res.id }, () => {
+            this.loadDetail()
+            addNewsUv(res.id)
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到资讯',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ newsId }, () => {
+          this.loadDetail()
+          addNewsUv(newsId)
+        })
+      }
     })
   }
 

src/pages/project/detail/index.js

@@ -22,6 +22,7 @@ import 'dayjs/locale/zh-cn' // 按需加载
 import ready from '@utils/ready'
 import Notice from '@components/Notice'
 import { getDownloadURL, transferImage, sceneInShare } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
@@ -79,7 +80,23 @@ export default class Index extends Component {
         })
       }
 
-      this.initPageData()
+      
+      const router = Taro.getStorageSync('router')
+      const id = this.$router.params.id || router.query.id
+
+      // 没有找到 id , 再重新找一次
+      if (!id) {
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.initPageData(res.id)
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到项目',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.initPageData(id)
+      }
     })
   }
 
@@ -88,9 +105,9 @@ export default class Index extends Component {
     recordId && updatePoint(recordId)
   }
 
-  initPageData () {
-    const router = Taro.getStorageSync('router')
-    const id = this.$router.params.id || router.query.id
+  initPageData (id) {
+    console.log('----项目ID---->', id)
+
     // const id='82b54f4a1f5b981df572253792afbfa1' 
     this.setState({
       buildingId: id
@@ -502,7 +519,7 @@ export default class Index extends Component {
       return
     }
 
-    this.initPageData()
+    this.initPageData(this.state.buildingId)
   }
 
   renderBottomMenu () {

src/pages/project/index.js

@@ -57,6 +57,8 @@ export default class Index extends Component {
     ready.queue(() => {
       this.getLocation()
 
+      Taro.setNavigationBarTitle({ title: this.props.userInfo.miniApp.name })
+
       savePoint({
         event: 'index',
         eventType: 'main',