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

config/dev.js

@@ -5,11 +5,11 @@ module.exports = {
   defineConstants: {
     HOST: '"https://dev.fangdeal.cn"',//测试
     WSS_HOST: '"wss://dev.fangdeal.cn"',
-    // HOST: '"http://192.168.2.41:8080"',
-    // WSS_HOST: '"ws://192.168.2.41:8080"',
+    // HOST: '"http://192.168.2.43:8080"',
+    // WSS_HOST: '"ws://192.168.2.43:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.22'
+    Version: 'V3.5.21'
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -3,13 +3,13 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://dev.fangdeal.cn"',//正式
-    WSS_HOST: '"wss://dev.fangdeal.cn"',
+    HOST: '"https://wx.fangdeal.cn"',//正式
+    WSS_HOST: '"wss://wx.fangdeal.cn"',
     // HOST: '"https://wx.fangdeal.cn"',//正式
     // WSS_HOST: '"wss://wx.fangdeal.cn"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.22'
+    Version: 'V3.5.24'
   },
   weapp: {},
   h5: {}

package.json

@@ -32,7 +32,7 @@
     "@tarojs/plugin-babel": "1.3.25",
     "@tarojs/plugin-csso": "1.3.25",
     "@tarojs/plugin-less": "1.3.25",
-    "@tarojs/plugin-sass": "^1.3.25",
+    "@tarojs/plugin-sass": "^2.1.5",
     "@tarojs/plugin-uglifyjs": "1.3.25",
     "@tarojs/webpack-runner": "1.3.25",
     "@types/react": "^16.4.6",

project.config.json

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

src/pages/person/index.js

@@ -156,7 +156,7 @@ export default class Person extends Component {
       case ROLE_CODE['CONSULTANT']:
         return [{ consultant: true }, '置业顾问']
       case ROLE_CODE['ESTATE_AGENT']:
-        return [{ isAgent: true }, '普通用户']
+        return [{ isAgent: true }, '专业经纪人']
       case ROLE_CODE['CHANNEL_AGENT']:
         return [{ isAgent: true }, '专业经纪人']
       default:
@@ -164,6 +164,19 @@ export default class Person extends Component {
     }
   }
 
+  // getRoleName(type) {
+  //   switch (type) {
+  //     case ROLE_CODE['CONSULTANT']:
+  //       return [{ consultant: true }, '置业顾问']
+  //     case ROLE_CODE['ESTATE_AGENT']:
+  //       return [{ isAgent: true }, '普通用户']
+  //     case ROLE_CODE['CHANNEL_AGENT']:
+  //       return [{ isAgent: true }, '专业经纪人']
+  //     default:
+  //       return [{ tourist: true }, '普通用户']
+  //   }
+  // }
+
   goShop() {
     Taro.switchTab({
       url: `/pages/shop/index`

src/pages/person/menus.js

@@ -173,23 +173,22 @@ const menus = [
     },
   ],
   [
-    // {
-    //   name: '成为专业经纪人',
-    //   url: '/pages/agent/become/index',
-    //   icon: icons.development,
-    //   extends: undefined,
-    //   userTypes: [CUSTOMER, ESTATE_AGENT],
-    //   style: { color: '#888888' },
-    // },
     {
       name: '成为置业顾问',
       url: '',
       icon: icons.consultant,
       extends: undefined,
       style: { color: '#888888' },
-      userTypes: [CUSTOMER, ESTATE_AGENT],
+      userTypes: [CUSTOMER, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '成为专业经纪人',
+      url: '/useless/pages/agent/become/index',
+      icon: icons.development,
+      extends: undefined,
+      userTypes: [CUSTOMER],
+      style: { color: '#888888' },
     },
-
   ]
 ]
 

src/pages/person/personDetail/index.js

@@ -72,6 +72,15 @@ export default class personDetail extends Component {
             <Image src={require('@/assets/person/arrow2.png')} mode="widthFix"></Image>
           </View>
         </View>
+        {user.personType == ROLE_CODE['ESTATE_AGENT'] &&
+          <View className='col_box' onClick={this.goEdit.bind(this)}>
+            <Text>所属渠道</Text>
+            <View className='col_right'>
+              <Text>{user.channelName || ''}</Text>
+            </View>
+          </View>
+        }
+
         {/* {
           (user.personType == ROLE_CODE['CHANNEL_AGENT'] || user.personType == ROLE_CODE['ESTATE_AGENT']) &&
 

src/pages/project/index.js

@@ -33,6 +33,7 @@ export default class Index extends Component {
     maskBanner: '',
     shareImg: '',
     imgDocument: '',
+    newImg:'',
     // adImage: advImageOfApp,
     bannerList: [],
     helpGroupList: [],
@@ -87,10 +88,14 @@ export default class Index extends Component {
     getIndexShare().then(res => {
 
       const shareInfo = (res || []).filter(item => item.imgType === 'index')[0]
+      const newsInfo = (res || []).filter(item => item.imgType === 'indexNews')[0]
       this.setState({
         shareImg: (shareInfo || {}).imgUrl,
         imgDocument: (shareInfo || {}).imgDocument,
+        newImg: (newsInfo || {}).imgUrl,
       })
+      
+      // indexNews
       console.log(shareInfo, '首页分享信息')
     })
   }
@@ -503,7 +508,7 @@ export default class Index extends Component {
   }
 
   render() {
-    const { achieve, helpGroupList, propagandaBanner, newsShow, iconList } = this.state
+    const { achieve, helpGroupList, propagandaBanner, newsShow, iconList,newImg } = this.state
     const { curCity, unReadNum, userInfo: { person: { personType } } } = this.props
 
     return (
@@ -572,7 +577,7 @@ export default class Index extends Component {
                   </View>
                 }
                 {/* 资讯 */}
-                <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
+                <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} newImg = {newImg} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
               </View >
               {/* 参加活动*/}
               {

src/pages/project/newsbanner/index.js

@@ -4,7 +4,7 @@ import { queryNewsList } from '@/services/news'
 import dayjs from 'dayjs'
 import { connect } from '@tarojs/redux'
 
-@connect(state => ({...state.city, ...state.user }))
+@connect(state => ({ ...state.city, ...state.user }))
 export default class SwiperBanner extends Component {
   static options = {
     addGlobalClass: true,
@@ -48,13 +48,15 @@ export default class SwiperBanner extends Component {
 
   render() {
     if (!this.state.list.length) return null;
-
+    const { newImg } = this.props
+    console.log(newImg,'newImg')
     return (
       <View className="notice-box" >
         <View style="display: flex;align-items: center;">
           <View className="left-text">
-            <View className="up"> 地产</View >
-            <View className="down"> 头条</View >
+            {newImg  && <Image style="width:76rpx ; height:76rpx" src={newImg} >{console.log(newImg,'newImg')}</Image>}
+            {!newImg  && <View><View className="up"> 地产</View >
+              <View className="down"> 头条</View ></View >}
           </View >
           <Swiper
             className='notice-swiper'

src/useless/pages/agent/become/index.js

@@ -32,18 +32,26 @@ export default class Index extends Component {
       recommendAgentCode: recommendAgentCode,
       channelCode: channelCode
     }
-    if (payload.channelCode)
+    if (payload.channelCode) {
       registerAgent(payload).then(res => {
-        // debugger
         this.props.dispatchUpdateUserInfoNew(res.personId)
-        Taro.navigateTo({
-          url: '/useless/pages/agent/index'
+        Taro.showToast({
+          title: '验证成功，恭喜成为专业经纪人',
+          icon: 'none'
         })
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          })
+        }, 2000)
+        // Taro.navigateTo({
+        //   url: '/useless/pages/agent/index'
+        // })
       })
-    else {
+    } else {
       console.log('11111')
       Taro.showToast({
-        title: '请输入渠道码',
+        title: '请输入渠道验证码',
         icon: 'none'
       })
     }
@@ -126,7 +134,7 @@ export default class Index extends Component {
     const { userInfo: { person: { phone } } } = this.props
     return (
       <View className='page'>
-        <Image src={bannerImg} className='banner' mode='aspectFill'></Image>
+        <Image src={bannerImg} className='banner' mode='widthFix'></Image>
         <View className='become_agent'>
           {/* <View className='agent_type'>
             <Text className='agent_title'>经纪人类型</Text>
@@ -136,16 +144,16 @@ export default class Index extends Component {
               </View>
             </Picker>
           </View> */}
-          <Input type='number' className='channel_code' placeholder='渠道验证码 (必填)' onInput={this.bindInfo.bind(this)} data-id='channelCode'></Input>
+          <Input type='number' className='channel_code' placeholder-style='color:#999' placeholder='请输入渠道验证码 (必填)' onInput={this.bindInfo.bind(this)} data-id='channelCode'></Input>
 
-          <Input type='number' className='input_code' value={recommendAgentCode} placeholder='输入推荐码 (选填)' onInput={this.bindInfo.bind(this)} data-id='recommendAgentCode'></Input>
-          {
-            phone ? (
-              <Button onClick={this.putMessage} className='become_btn'>立即成为经纪人</Button>
-            ) : (
+          {/* <Input type='number' className='input_code' value={recommendAgentCode} placeholder='输入推荐码 (选填)' onInput={this.bindInfo.bind(this)} data-id='recommendAgentCode'></Input> */}
+          {/* {
+            phone ? ( */}
+          <Button onClick={this.putMessage} className='become_btn'>立即成为经纪人</Button>
+          {/* ) : (
                 <Button open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber} className='become_btn'>立即成为经纪人</Button>
               )
-          }
+          } */}
         </View>
 
       </View>

src/useless/pages/agent/become/index.scss

@@ -1,3 +1,6 @@
+@import "@/styles/mixins.scss";
+@import "@/styles/theme.scss";
+
 .page {
   position: relative;
   width: 100%;
@@ -33,23 +36,22 @@
       height: 80px;
       line-height: 80px;
       text-align: center;
-      border-radius: 20px;
-      border: 1px solid #979797;
-      font-size: 32px;
+      // border-radius: 20px;
+      border-bottom: 1px solid #eee;
+      font-size: 30px;
       margin-bottom: 40px;
+      text-align: center;
     }
     .become_btn {
       width: 100%;
-
       height: 90px;
-      background: #ff4740;
-      border-radius: 20px;
+      background:  $primary-color;
+      border-radius: 12px;
       color: #fff;
-      font-size: 32px;
+      font-size: 30px;
       font-weight: 500;
       line-height: 90px;
       text-align: center;
-      margin-top: 120px;
     }
   }
 }

yarn.lock

@@ -4064,7 +4064,7 @@ eslint-scope@^5.0.0:
 
 eslint-utils@^1.3.1, eslint-utils@^1.4.3:
   version "1.4.3"
-  resolved "http://r.cnpmjs.org/eslint-utils/download/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  resolved "https://registry.npm.taobao.org/eslint-utils/download/eslint-utils-1.4.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-utils%2Fdownload%2Feslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
   integrity sha1-dP7HxU0Hdrb2fgJRBAtYBlZOmB8=
   dependencies:
     eslint-visitor-keys "^1.1.0"
@@ -4488,7 +4488,7 @@ fast-json-stable-stringify@^2.0.0:
 
 fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6:
   version "2.0.6"
-  resolved "http://r.cnpmjs.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://registry.npm.taobao.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastparse@^1.1.1: