tabbar

src/pages/checkin/index.js

@@ -24,9 +24,24 @@ export default class checkin extends Component {
       const router = Taro.getStorageSync('router')
 
       const { id = router.query.id, type = router.query.type || '' } = parseQueryString(router.query.params)
+     
+      if (!id) {
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ id: res.id, type: res.type }, () => {
+            this.setState({ id, type })
+            this.getcheckinDetails(id, type)
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到活动',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ id, type })
+        this.getcheckinDetails(id, type)
+      }
       console.log(id, 'id-----')
-      this.setState({ id, type })
-      this.getcheckinDetails(id, type)
 
       // const routers = wx.getLaunchOptionsSync()
 
@@ -59,7 +74,7 @@ export default class checkin extends Component {
   // console.log(id, 'id-----')
   // this.setState({ id, type })
   componentDidShow () {
-    const { id, type } = this.state
+    // const { id, type } = this.state
     // this.getcheckinDetails(id, type)
   }
   // dynamicId

src/pages/person/personDetail/editDetail/index.js

@@ -185,8 +185,8 @@ export default class editDetail extends Component {
               </View>
             </Picker>
           </View>)
-        }
-        {
+        } */}
+        {/* {
           (isChannel && user.personType == 'estate agent') && (<View className='col_box'>
             <Input type='text' placeholder='请输入渠道码' className='channelCode' data-id='channelCode' onInput={this.BindInfo.bind(this)} />
           </View>)

src/pages/project/detail/index.js

@@ -65,10 +65,10 @@ export default class Index extends Component {
 
   componentWillMount() {
     ready.queue(() => {
-      // 分享场景需要先授权手机, 再授权头像
-      const options = wx.getLaunchOptionsSync()
-      console.log('-------options----->', options)
-      if (sceneInShare(options.scene)) {
+      // // 分享场景需要先授权手机, 再授权头像
+      // const options = wx.getLaunchOptionsSync()
+      // console.log('-------options----->', options)
+      // if (sceneInShare(options.scene)) {
         const { person = {} } = this.props.userInfo || {}
         console.log('-------person----->', person)
         if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
@@ -79,7 +79,7 @@ export default class Index extends Component {
         this.setState({
           grantPhoneVisible: true,
         })
-      }
+      // }
 
 
       const router = Taro.getStorageSync('router')

src/pages/project/index.js

@@ -84,7 +84,6 @@ export default class Index extends Component {
 
     if (this.props.curCity.id) {
       ready.queue(() => {
-        console.log('我又隐藏啦，哈哈哈哈')
         Taro.hideTabBar()
         this.loadData()
       })
@@ -97,8 +96,6 @@ export default class Index extends Component {
   }
 
   getLocation() {
-    // debugger
-    console.log('-----this.props-->', this.props)
     const { cityList, userInfo: { person: { org } } } = this.props
     let defaultCity = cityList.filter(item => {
       return item.id == org.defaultCityId
@@ -109,8 +106,6 @@ export default class Index extends Component {
       Taro.setStorageSync('lat', location.latitude)
       Taro.setStorageSync('lon', location.longitude)
 
-      console.log(location, 'location')
-
       const payload = { location: `${location.longitude},${location.latitude}` }
 
       getLocationCity(payload).then(res => {
@@ -118,7 +113,6 @@ export default class Index extends Component {
         let curCity = cityList.filter(item => {
           return item.name == res.name || ''
         })
-
         console.log('-----curCity-->', curCity)
         this.updateCity(curCity[0] || defaultCity)
       }).catch(err => {