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

# Conflicts:
#	config/dev.js

.gitignore

@@ -3,4 +3,5 @@ dist/
 .rn_temp/
 node_modules/
 .DS_Store
-*.rar
+*.rar
+*.zip

src/pages/person/index.js

@@ -25,6 +25,7 @@ export default class Person extends Component {
     tourist: false,//普通用户,
     menus: [],
     roleName: '普通用户',
+
   }
 
   componentDidShow () {
@@ -34,9 +35,10 @@ export default class Person extends Component {
   }
 
   loadUserInfo () {
+  
     queryUserInfo().then(user => {
       const [roleSetting, roleName] = this.getRoleName(user.personType)
-
+     
       this.setState({
         user,
         phone: user.phone,
@@ -54,7 +56,7 @@ export default class Person extends Component {
     }
 
     doUserSignin({ id }).then(res => {
-      Taro.Toast({
+      Taro.showToast({
         title: '签到成功'
       })
       // this.setState({
@@ -93,21 +95,21 @@ export default class Person extends Component {
 
 
       putRegisterConsultant().then(res => {
-        console.log("res", res)
+    
 
-        if (res) {
+        // if (res) {
           Taro.showToast({
             title: "匹配成功，请退出小程序重新登录即可",
             icon: "none",
             duration: 3000
           })
-        } else {
-          Taro.showToast({
-            title: "匹配失败，请联系相关管理人员",
-            icon: "none",
-            duration: 3000
-          })
-        }
+        // } else {
+        //   Taro.showToast({
+        //     title: "匹配失败，请联系相关管理人员",
+        //     icon: "none",
+        //     duration: 3000
+        //   })
+        // }
       }).catch(err => {
         console.error(err)
         Taro.showToast({
@@ -200,12 +202,12 @@ export default class Person extends Component {
           </View>
           <View className='qiandao-con'>
             <Text className='qiandao-text'>签到得积分，积分兑好礼，马上去签到吧！</Text>
-            {/* <View className={user.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View> */}
-            {
+            <View className={user.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View>
+            {/* {
               user.havaSigned ?
                 (<View className='reday-qiandao-btn' onClick={this.doSign}> 已签到</View>) :
                 (<View className='qiandao-btn' onClick={this.doSign}>签到</View>)
-            }
+            } */}
             {/* <Text className='integral-cont_btn' onClick={this.goShop}>去兑换</Text> */}
 
           </View>

src/pages/person/profile/index.js

@@ -24,7 +24,7 @@ export default class Profile extends Component {
 
   }
 
-  componentDidShow() {
+  componentWillMount() {
     this.getProfile()
   }
 

src/pages/project/album/index.scss

@@ -49,7 +49,7 @@
     font-size: 32px;
     color: #666;
     line-height: 44px;
-    
+    text-align: center;
 
     &.active {
       color: #BB9C79;
@@ -57,6 +57,8 @@
     }
 &-text {
   padding: 4px 0;
+  text-align: center;
+  
 }
 
     &+& {

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

@@ -57,6 +57,8 @@ export default class Pannel extends Component {
       currentMarkerPos = 0
     }
 
+    // console.log('-------markerList---------', markerList)
+
     this.setState({ currentMarkerPos, markerList })
   }
 

src/pages/project/detail/index.js

@@ -167,8 +167,9 @@ export default class Index extends Component {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
+      console.log(res,'Activity')
       this.setState({
-        activityList: res.list || []
+        activityList: res || []
       })
     })
   }
@@ -824,7 +825,6 @@ export default class Index extends Component {
                       {
                         item && (
                           <View className='house__img-info'>
-                            {console.log(list, '-------')}
                             <Image className='house__img' src={getThumbnail(item.buildingImgList[0].url)} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
                             <View className='house-type__state' style={`background-color: ${statusBgColors[item.marketStatus - 1]}`}>{statusOpts[item.marketStatus - 1]}</View>
                           </View>
@@ -877,9 +877,14 @@ export default class Index extends Component {
       <Block>
         {
           activityList.length > 0 && (
-            <View className="activity" onClick={this.handleActivityMoreClick}>
+            <View className="activity" >
               {console.log(activityList, '----activityList-----')}
-              <View className="title">热门活动</View>
+              <View className="section-head">
+                 <Text className="section-head__title">热门活动</Text>
+                 <View className="section-head__more" onClick={this.handleActivityMoreClick}>
+                   更多活动<Text className="iconfont icon-more"></Text>
+                 </View>
+               </View>
               <View
                 style={{ position: 'relative' }}>
                 <HelpGroupBanner
@@ -894,7 +899,7 @@ export default class Index extends Component {
 
               </View>
             </View>
-            // <View className="house-type">
+            // <View classN                                                                                                                                                                                                                                                                                                                                                                                                                                                    ame="house-type">
             //   <View className="section-head">
             //     <Text className="section-head__title">热门活动</Text>
             //     <View className="section-head__more" onClick={this.handleActivityMoreClick}>

src/pages/project/index.js

@@ -256,7 +256,9 @@ export default class Index extends Component {
           title: '当前城市暂无楼盘',
           icon: 'none'
         })
+     
       }
+    
       Taro.hideLoading()
       this.setState({
         loaded: true

src/pages/shop/detail/index.js

@@ -17,6 +17,8 @@ export default class Index extends Component {
   state = {
     goodsId: null,
     visibleExcBtn: true,
+    datas: {},
+    inventory: null
   }
 
   componentWillMount () {
@@ -49,18 +51,34 @@ export default class Index extends Component {
 
     this.props.dispatchGoodsExchange(goodsId).then(res => {
       hasClick = true
-      Taro.showToast({ title: '兑换成功' })
+
+      Taro.showModal({
+        title: '兑换成功',
+        showCancel: false
+      })
+      this.setState({
+        inventory: res.inventory
+      })
+
+
+      // else{
+      //   Taro.showToast({ title: '积分不足，请先获取积分' })
+      // }
+      // Taro.showToast({ title: '兑换成功' })
       // App.zhuge.track('兑换商品', {
       //   '商品id': goodsId,
       //   '商品名称': goodsName
       // })
+      // this.loadDetail()
     }).catch(err => {
+      console.log(err.message, 'err-----')
       hasClick = true
     })
   }
 
   render () {
     const { goodsDetail } = this.props
+    const { inventory } = this.state
     return (
       <View className="page">
         <ScrollView
@@ -87,7 +105,7 @@ export default class Index extends Component {
               <Text className="num">{goodsDetail.pointPrice}积分</Text>
               <Text className="detail__title-surplus">
                 <Text>剩余数量</Text>
-                <Text className="num">{goodsDetail.inventory}</Text>
+                <Text className="num">{inventory || goodsDetail.inventory}</Text>
               </Text>
             </View>
           </View>

src/pages/shop/index.js

@@ -288,6 +288,7 @@ export default class Shop extends Component {
         {
           goodsBuilding && goodsBuilding.length >= 2 &&
           <View className="list__wrap">
+            <View className="hot_title" style={{marginBottom:'0'}}>热门商品</View>
             <AtTabs scroll tabDirection='horizontal' current={current} tabList={goodsBuilding} onClick={this.handleClick.bind(this)}>
 
               {goodsBuilding.map((l_item, index) => (

src/utils/redux.js

@@ -7,10 +7,14 @@ import { fetch } from './request'
 export function createAction(options) {
   const { url, payload, method, fetchOptions, cb, type } = options
   return (dispatch) => {
-    return fetch({ url, payload, method, ...fetchOptions }).then((res) => {
-      dispatch({ type, payload: cb ? cb(res) : res })
-      return res
-    })
+    try {
+      return fetch({ url, payload, method, ...fetchOptions }).then((res) => {
+        dispatch({ type, payload: cb ? cb(res) : res })
+        return res
+      })
+    } catch (e) {
+      throw e
+    }
   }
 }
 

src/utils/request.js

@@ -70,20 +70,25 @@ export const fetch = async (options) => {
           })
         }
       }
-      console.error(res.data)
+
       Taro.showToast({
         title: message,
         icon: 'none'
       })
+
+      throw res.data
     }
   }).catch((err) => {
-    console.error(err, "444")
-
+    
     let errMessage = `请求失败: ${err.errMsg}`
-    if (err.errMsg === 'request:fail timeout') {
+    if (err.errMsg) {
       errMessage = '请检查网络'
     }
 
+    if (err.message) {
+      errMessage = err.message
+    }
+
     Taro.showToast({
       title: errMessage,
       icon: 'none'