bug fix

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.2.52:8080"',
-    WSS_HOST: '"ws://192.168.2.52:8080"',
+    // HOST: '"http://192.168.2.52:8080"',
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
   },
   weapp: {},
   h5: {}

src/app.js

@@ -42,8 +42,8 @@ class App extends Component {
     pages: [
       'pages/project/index',
       'pages/project/h5Page',
-      'pages/person/customerAnalysis/followUpCustomer/index',
-      'pages/person/customerAnalysis/transactionCustomer/index',
+      // 'pages/person/customerAnalysis/followUpCustomer/index',
+      // 'pages/person/customerAnalysis/transactionCustomer/index',
       'pages/person/customerAnalysis/myCustomer',
       'pages/person/accessRecord',
       'pages/shop/index',

src/pages/person/customerAnalysis/index.js

@@ -6,8 +6,9 @@ import "taro-ui/dist/style/components/tabs.scss"
 import { savePoint, updatePoint } from '@services/common'
 import { queryMyCustomer } from '@services/person'
 import { connect } from '@tarojs/redux'
-import Analysis from './analysis'
-
+// import Analysis from './analysis'
+import Followup from './followUpCustomer'
+import TransactionCustomer from './transactionCustomer'
 @connect(({ user, city }) => ({ user, city }))
 export default class customer extends Taro.Component {
 
@@ -45,7 +46,7 @@ export default class customer extends Taro.Component {
   handleClick(value) {
     this.setState({
       current: value
-    }, )
+    })
   }
   toTransactionCustomer() {
     Taro.navigateTo({
@@ -59,12 +60,14 @@ export default class customer extends Taro.Component {
   }
 
   render() {
-  
+
+    const tabList = [{ title: '跟进客户' }, { title: '成交客户' }]
     const { customerNum, current } = this.state
     return (
-      // <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
-      //    <AtTabsPane current={current} index={0}>
-          <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
+      <AtTabs className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
+        <AtTabsPane current={current} index={0}>
+          <Followup />
+          {/* <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>
               <View className="name">跟进客户</View>
@@ -75,17 +78,15 @@ export default class customer extends Taro.Component {
               <View className="name">成交客户</View>
               <View className="name">{customerNum.clinchSum || 0}人</View>
             </View>
+          </View> */}
+        </AtTabsPane>
+        <AtTabsPane current={current} index={1} >
+          <View >
+            <TransactionCustomer />
           </View>
-      //   </AtTabsPane>
-      //   <AtTabsPane current={current} index={1} >
-      //     <View >
-      //       {
-      //         current != 0 && <Analysis></Analysis>
-      //       }
-      //     </View>
-      //   </AtTabsPane>
-       
-      // </AtTabs>
+        </AtTabsPane>
+
+      </AtTabs>
     )
   }
 }

src/pages/project/h5Page.js

@@ -1,17 +1,16 @@
 import Taro, { Component } from '@tarojs/taro'
-import { connect } from '@tarojs/redux'
 import * as actions from '@actions/user'
 import getUserPhone from '@utils/getUserPhone'
 import './index.scss'
 import { getHFiveDetail } from '@services/user'
 import ready from '@utils/ready'
 import { reportClient } from '@services/report'
+import { connect, getStore } from '@tarojs/redux'
 import { ROLE_CODE } from '@constants/user'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 const bgImg = require('@assets/helpgroup/bg.png')
 
 @connect(state => state.user, { ...actions })
-
 export default class Index extends Component {
 
   state = {
@@ -91,10 +90,13 @@ export default class Index extends Component {
           pageInfo: res
         })
       })
-      const { userInfo: { person } } = this.props
-      if (person.avatarurl) {
+      const { userInfo: { person, miniAuthorized } } = this.props
+      console.log(this.props, "this.props")
+      // if(person.avatarurl)
+      if (miniAuthorized) {
         // 头像手机号都有
         if (person.phone) {
+          this.onAvatarSuccess();
           this.success()
           this.setState({
             avatarVisible: false,
@@ -124,8 +126,12 @@ export default class Index extends Component {
   }
   // 授权用户信息
   getUserInfo() {
-    const { dispatchUpdateUserInfo } = this.props
+    const { dispatchUpdateUserInfo, extraInfo, miniApp, person, miniAuthorized } = this.props
     const sessionKey = Taro.getStorageSync('sessionKey')
+
+    const { dispatch } = getStore()
+
+    dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp, miniAuthorized } })
     Taro.showLoading()
     Taro.getUserInfo({
       lang: 'zh_CN',
@@ -193,7 +199,6 @@ export default class Index extends Component {
 
   renderMaskBanner() {
     const { avatarVisible, phoneVisible, pageInfo } = this.state
-
     return (
       <View>
         <Image src={pageInfo.middleImg || bgImg} mode='widthFix' className='bg_img'></Image>
@@ -201,8 +206,8 @@ export default class Index extends Component {
           {avatarVisible &&
             <View className="content">
               <View className="title">授权头像，围观活动</View>
-              <Image className="touxiang" src={require('@assets/default-avatar.png')}></Image>
-              <View className="name">用户昵称</View>
+              <View className="touxiang"><open-data type="userAvatarUrl"></open-data></View>
+              <View className="name"><open-data type="userNickName"></open-data></View>
               <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
             </View>
           }

src/pages/project/index.js

@@ -300,8 +300,12 @@ export default class Index extends Component {
   }
 
   handleBannerClick = (item) => {
-    console.log(this, "this")
-    this.redirectTo(item)
+    if (item.contentType != "nothing") {
+      this.redirectTo(item)
+      console.log(item.targetId, "item.targetId")
+    } else {
+      console.log(item, "item")
+    }
   }
 
   redirectTo({ targetId, contentType, buildingId } = {}) {
@@ -457,7 +461,7 @@ export default class Index extends Component {
     })
   }
   toNewsList() {
-    Taro.reLaunch({
+    Taro.switchTab({
       url: `/pages/activity/activity?projectIndex=1`
     })
   }
@@ -627,7 +631,7 @@ export default class Index extends Component {
                           newsList.map((list, inx) => {
                             return (
                               <SwiperItem key={`img-${inx}`}>
-                                <View className="notice-text" onClick={this.handleNoticeClick.bind(this,list)}>
+                                <View className="notice-text" onClick={this.handleNoticeClick.bind(this, list)}>
                                   {list.newsName}
                                 </View>
                               </SwiperItem>

src/pages/project/index.scss

@@ -529,10 +529,12 @@ height:172px;
       color: #333;
     }
     .touxiang{
+      overflow: hidden;
+      display: block;
       width: 108px;
       height: 108px;
+      margin: 24px auto 10px ;
       border-radius: 50%;
-      margin: 24px 0 10px 0;
     }
     .name{
       font-size: 28px;

src/pages/project/swiper/index.scss

@@ -11,6 +11,7 @@
   // @extend .flex;
   // align-items: flex-start;
   height: 100%;
+  position: relative;
   &-item {
     width: 100%;
     display: flex;

src/pages/shop/index.js

@@ -40,7 +40,7 @@ export default class Shop extends Component {
     points: 0
   }
 
-  componentDidShow () {
+  componentDidShow() {
 
     Taro.showLoading()
     ready.queue(() => {
@@ -53,7 +53,7 @@ export default class Shop extends Component {
     Taro.hideLoading()
   }
 
-  loadBannerList () {
+  loadBannerList() {
     const payload = {
       showPosition: 'mall',
       cityId: this.props.curCity.id
@@ -65,7 +65,7 @@ export default class Shop extends Component {
     })
   }
 
-  loadList () {
+  loadList() {
 
 
     Taro.showLoading()
@@ -88,7 +88,7 @@ export default class Shop extends Component {
     })
   }
 
-  loadGoodsBuilding () {
+  loadGoodsBuilding() {
     const payload = {
 
       cityId: this.props.curCity.id
@@ -115,7 +115,7 @@ export default class Shop extends Component {
     })
   }
 
-  handleClick (value) {
+  handleClick(value) {
 
     this.setState({
       current: value
@@ -136,32 +136,32 @@ export default class Shop extends Component {
 
   }
 
-  onViewDetail (item) {
+  onViewDetail(item) {
     Taro.navigateTo({
       url: `/pages/shop/detail/index?id=${item.goodsId}`
     })
   }
 
-  goPointRecords () {
+  goPointRecords() {
     const { person: { points } } = this.props.userInfo
     Taro.navigateTo({
       url: `/pages/shop/integralDetail/index?points=` + points
     })
   }
 
-  goPointRule () {
+  goPointRule() {
     Taro.navigateTo({
       url: `/pages/shop/rule/index`
     })
   }
 
-  handleLocationClick () {
+  handleLocationClick() {
     Taro.navigateTo({
       url: `/pages/city/index`
     })
   }
 
-  doSign () {
+  doSign() {
     const { user: { id, havaSigned } } = this.state
     if (havaSigned) {
       return
@@ -183,7 +183,7 @@ export default class Shop extends Component {
     })
   }
 
-  loadUserInfo () {
+  loadUserInfo() {
     // debugger
     queryUserInfo().then(user => {
       console.log(user, "user")
@@ -196,14 +196,14 @@ export default class Shop extends Component {
     })
   }
 
-  renderLogin () {
+  renderLogin() {
     return <Authorize></Authorize>
   }
   handleBannerClick = (item) => {
     console.log(this, "this")
     this.redirectTo(item)
   }
-  redirectTo ({ targetId, contentType, buildingId } = {}) {
+  redirectTo({ targetId, contentType, buildingId } = {}) {
     switch (contentType) {
       // 项目
       case 'project':
@@ -239,6 +239,12 @@ export default class Shop extends Component {
           url: '/pages/news/detail/index?id=' + targetId
         })
         return;
+      // h5
+      case 'h5':
+        Taro.navigateTo({
+          url: '/pages/project/h5Page?id=' + targetId
+        })
+        return;
 
       // 其他
       case 'others':
@@ -248,7 +254,7 @@ export default class Shop extends Component {
     }
   }
 
-  renderGoods () {
+  renderGoods() {
     const { goods: { records = [] } } = this.props
     const { goodsList, goodsBuilding, current } = this.state
 
@@ -330,7 +336,7 @@ export default class Shop extends Component {
     )
   }
 
-  renderDetail () {
+  renderDetail() {
     const { user, points } = this.state
     const { userInfo: { person }, curCity } = this.props
     const { bannerList = [] } = this.state
@@ -389,7 +395,7 @@ export default class Shop extends Component {
     );
   }
 
-  render () {
+  render() {
     const { person: { phone, tel } } = this.props.userInfo
 
     return (

src/utils/login.js

@@ -28,10 +28,11 @@ export default function (payload, callback) {
         Taro.setStorageSync('token', token)
         Taro.setStorageSync('sessionKey', sessionKey)
 
-        dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
+        dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp, miniAuthorized } })
 
         // 用户信息已授权获取成功
         if (miniAuthorized) {
+          console.log(data, "data=============")
           // 保存用户信息
           // dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
           callback && callback(data)
@@ -53,7 +54,7 @@ export default function (payload, callback) {
         }
         ready.open()
 
-        console.info('ready status2',ready)
+        console.info('ready status2', ready)
       })
     }
   })