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: {}

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   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: '"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"',
   },

project.config.json

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

src/pages/agent/client/index.js

@@ -20,7 +20,7 @@ export default class Index extends Component {
     floor: '',
     recordId: null
   }
-  componentWillMount() {
+  componentWillMount () {
     savePoint({
       event: 'list',
       eventType: 'agent',
@@ -35,15 +35,15 @@ export default class Index extends Component {
   }
 
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
-  componentDidMount() {
+  componentDidMount () {
     this.loadList()
   }
   //获取楼盘列表
-  loadGetFloor() {
+  loadGetFloor () {
     const params = {
       pageNumber: 1,
       pageSize: 50,
@@ -55,7 +55,7 @@ export default class Index extends Component {
       })
     })
   }
-  loadList() {
+  loadList () {
     var that = this;
     const params = {
       pageNumber: 1,
@@ -71,19 +71,25 @@ export default class Index extends Component {
     })
   }
 
-  formatDate(value) {
+  formatDate (value) {
     return dayjs(value).format('YYYY-MM-DD')
   }
-  navigateTo(id) {
+  navigateTo (id) {
     Taro.navigateTo({ url: `/pages/agent/progress/index?customerId=${id}` })
   }
-  getName(dict, id) {
+  getName (dict, id) {
     dict = dict.records || []
     // let floorName = (dict.filter(({ buildingId: target }) => id === target)[0] || {}).name
     return (dict.filter(({ buildingId: target }) => id === target)[0] || {}).buildingName
 
   }
-  render() {
+
+  toRecomonedPage () {
+    Taro.navigateTo({
+      url: `/pages/agent/recommend/index`
+    })
+  }
+  render () {
     const { list, status, floorList } = this.state
     return (
       <View className='myClient'>
@@ -113,7 +119,7 @@ export default class Index extends Component {
               {
                 list.map((item, index) => {
                   return (
-                    <View className='client__list' key={index+'client'} onClick={this.navigateTo.bind(this, item.customerId)}>
+                    <View className='client__list' key={index + 'client'} onClick={this.navigateTo.bind(this, item.customerId)}>
                       <Image className='bg' src={item.verifyStatus == 2 ? require('@assets/person/card1.png') : require('@assets/person/card2.png')}></Image>
                       <View className='client'>
                         <View className='client__status2'>
@@ -145,6 +151,11 @@ export default class Index extends Component {
           </View>
         }
 
+        {/* <View className='recommend' onClick={this.toRecomonedPage}>123</View> */}
+        <View className="recommend"  onClick={this.toRecomonedPage}  >
+        <Image src={require('@assets/tuijiankehu.png')} className='home-img'></Image>
+        <Text className="text">推荐</Text>
+      </View>
       </View>
     );
   }

src/pages/agent/client/index.scss

@@ -151,4 +151,41 @@
   left:0;
   tpop:0;
   padding:50px;
+}
+
+// .recommend{
+//   position:absolute;
+//   right: 0;
+//   bottom: 60px;
+//   k
+// }
+.recommend {
+  position: fixed;
+  bottom: 16%;
+  right: 5%;
+  width: 104px;
+  height: 104px;
+  border-radius: 50%;
+  background-color: $primary-color;
+  box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.25);
+  z-index: 99;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+
+  .iconfont {
+    color: white;
+    font-size: 40px;
+  }
+  .home-img{
+    width: 38px;
+    height: 34px;
+    margin: 3px 0;
+  }
+  .text {
+    color: white;
+    font-size: 22px;
+  }
+
 }

src/pages/card/index.js

@@ -435,7 +435,7 @@ export default class Index extends Component {
                   <Image className='mycard__user__img' src={picture} mode="widthFix"></Image>
                   <Image src={picture} mode="aspectFill" className='head__img'></Image>
                 </View>
-                <Image src={require('@assets/person/top.png')} className='top-img' mode="widthFix"></Image>
+                <Image src={require('@assets/person/top.png')} className='top-img' mode="aspectFill"></Image>
               </View>
 
               <View className='mycard__user__information'>

src/pages/card/index.scss

@@ -67,7 +67,8 @@
       position: absolute;
       width: 100%;
       bottom: 0%;
-      height: 100px;
+      height: 101px;
+      
     }
 
     .head__img {
@@ -75,7 +76,7 @@
       bottom: 0%;
       left: 5%;
       width: 150px;
-      height: 150px;
+      height: 149px;
       border-radius: 50%;
       border: 4px solid rgba(255, 255, 255, 1);
       z-index: 2;

src/pages/person/index.js

@@ -54,7 +54,7 @@ export default class Person extends Component {
     }
 
     doUserSignin({ id }).then(res => {
-      Taro.showToast({
+      Taro.Toast({
         title: '签到成功'
       })
       // this.setState({
@@ -95,13 +95,16 @@ export default class Person extends Component {
       putRegisterConsultant().then(res => {
         // console.log("匹配成功，请退出小程序重新登录即可")
         Taro.showToast({
-          title: "匹配成功，请退出小程序重新登录即可"
+          title: "匹配成功，请退出小程序重新登录即可",
+          icon: "none",
+          duration:3000
         })
       }).catch(err => {
         console.error(err)
         Taro.showToast({
           title: "匹配失败，请联系相关管理人员",
-          icon: "none"
+          icon: "none",
+          duration:3000
         })
       })
     }
@@ -170,14 +173,14 @@ export default class Person extends Component {
                 <View className="info-text__name">{user.name ? user.name : user.nickname}</View>
                 <View className="info-text__intro">积分 {user.points || 0}</View>
               </View>
-              {/* {
-                user.personType != 'customer' && (
+              {
+                user.personType == 'consultant' && (
                   <Navigator url={`/pages/person/spread/index`} className="tuiguang">
                     <Image style="width:40px;height:36px" src={require('@assets/mine/tuiguangma.png')} ></Image>
                     <View className="info-text__intro" style="margin:4px 0 0 4px">推广码</View>
                   </Navigator>
                 )
-              } */}
+              }
             </View>
             {/* <View
               className={`sign__btn ${user.havaSigned && 'signed'}`}

src/pages/person/menus.js

@@ -15,6 +15,7 @@ const icons = {
   feedback: require('@assets/mine/feedback.png'),
   client: require('@assets/mine/client.png'),
   consultant: require('@assets/mine/consultant.png'),
+  customerAnalysis: require('@assets/mine/customerAnalysis.png'),
 }
 
 const DRIFT = ROLE_CODE['DRIFT']
@@ -43,7 +44,7 @@ const menus = [
     {
       name: '盘客工具',
       url: '/pages/person/customerAnalysis/index',
-      icon: icons.homepage,
+      icon: icons.customerAnalysis,
       extends: undefined,
       userTypes: [CONSULTANT],
       style: '',
@@ -72,13 +73,13 @@ const menus = [
     // },
   ],
   [
-    {
-      name: '我的客户',
-      url: '/pages/person/myGuest/index',
-      icon: icons.client,
-      extends: undefined,
-      userTypes: [CONSULTANT],
-    },
+    // {
+    //   name: '我的客户',
+    //   url: '/pages/person/myGuest/index',
+    //   icon: icons.client,
+    //   extends: undefined,
+    //   userTypes: [CONSULTANT],
+    // },
     {
       name: '我的活动',
       url: '/pages/activity/myActivity?from=mine',

src/pages/project/album/index.js

@@ -76,7 +76,7 @@ export default class Index extends Component {
                 return (<View>
                   {buildingImgList.length>0&&
                   <View
-                    style={{ padding: '0 20px ' }}
+                    // style={{ padding: '0 20px ' }}
                     key={current}
                     className={`around-tab__item ${current === index ? 'active' : ''}`}
                     onClick={() => this.setState({ current: index })}

src/pages/project/banner/index.js

@@ -3,7 +3,7 @@ import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
 // import { cdn } from '@constants/api'
 import './index.scss'
 import emptyImg from '@assets/empty.png'
-import { getThumbnail } from '@utils/tools'
+import { getThumbnail, resizeImage } from '@utils/tools'
 
 export default class SwiperBanner extends Component {
   static defaultProps = {
@@ -54,7 +54,7 @@ export default class SwiperBanner extends Component {
                 mode="widthFix"
                 style={style}
                 className='home-banner__swiper-item-img'
-                src={getThumbnail(item.image || item.url || item.img || emptyImg)}
+                src={resizeImage(item.image || item.url || item.img || emptyImg)}
               />
             </SwiperItem>
           ))}

src/pages/project/detail/index.js

@@ -47,7 +47,7 @@ export default class Index extends Component {
     activityList: [],
     helpList: [],
     groupList: [],
-    statusOpts: ['待定', '在建', '在售'],
+    statusOpts: ['待定', '售罄', '在售'],
     // circumOpts: [],
     curTab: 'Transport',
     recordId: null,
@@ -375,8 +375,8 @@ export default class Index extends Component {
     const {
       userInfo: { person: { personType } }
     } = this.props
-    if (personType === ROLE_CODE['DRIFT'] || personType === ROLE_CODE['CUSTOMER']) {
-      // 游客或者客户 区别是否有电话
+    if (personType === ROLE_CODE['DRIFT'] ) {
+      // 游客或者客户 区别是否有电话|| personType === ROLE_CODE['CUSTOMER']
       Taro.navigateTo({
         url: `/pages/agent/become/index`
       })
@@ -790,13 +790,14 @@ 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'>{statusOpts[item.marketStatus - 1]}</View>
                           </View>
                         )
                       }
                       <View className="rest-info">
-                        <View className='house-type__name'><Text style="color:#FA5431;margin-right:10px">{item.buildingArea || ''}</Text>{item.apartmentName || ''}</View>
+                        <View className='house-type__name'>{item.apartmentName || ''}</View>
                         <View className='construction__area'>
                           <Text>建面{item.buildingArea || ''}m²</Text>
                           {
@@ -963,7 +964,7 @@ export default class Index extends Component {
           // controls={false}
           // autoplay={false}
           // initialTime='0'
-          // loop={false}
+          loop={true}
           // muted={false}
 
           show-mute-btn='true'

src/pages/project/item/index.scss

@@ -23,7 +23,7 @@
       top:0 ;
       left:0;
       background:rgba(246,182,29,1);
-      border-radius:18px 0px 12px 0px;
+      border-radius:12px 0px 12px 0px;
       padding: 10px 36px;
       color: #fff;
       font-size: 26px;

src/utils/request.js

@@ -28,7 +28,6 @@ export const setStorage = function (key, data) {
  */
 export const fetch = async (options) => {
   const { url, payload, method = 'GET', showToast = true, autoLogin = true } = options
-  // console.log(Taro.getStorageSync('token'),'----token---')
   return Taro.request({
     url,
     method,

src/utils/tools.js

@@ -19,6 +19,17 @@ export function getThumbnail(img, quality) {
   return img
 }
 
+
+export function resizeImage(img, size) {
+  if (!img) return img
+
+  if (img.indexOf('https://estateagents.oss-cn-shanghai.aliyuncs.com') === 0) {
+    return `${img}?x-oss-process=style/resize${size || 750}`
+  }
+
+  return img
+}
+
 /**
  * 解析 queryString   a=b&c=d  ==> { a:b, c:d }
  * @param {*} queryString