Merge branch 'dev'

config/dev.js

@@ -5,10 +5,10 @@ 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://lt.pawoma.cn"',
-    WSS_HOST: '"wss://lt.pawoma.cn"',
+    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.51:8080"',
     // WSS_HOST: '"ws://192.168.2.51:8080"',
     Version: 'V3.5.5'

config/prod.js

@@ -5,10 +5,10 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.2.54:8080"',
     // WSS_HOST: '"ws://192.168.2.54:8080"',
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    HOST: '"https://lt.pawoma.cn"',
-    WSS_HOST: '"wss://lt.pawoma.cn"',
+    HOST: '"https://dev.jinchengjiaye.com"',//测试
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST: '"https://lt.pawoma.cn"',
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
     Version:'V3.5.5_2019-12-30'
   },
   weapp: {},

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行互动",
-	"appid": "wxd6f47a9bb3052175",
+	"description": "知与行联调",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/components/achieveAvatar/index.js

@@ -74,8 +74,8 @@ export default class Index extends Component {
         <View className="avatar-page">
           <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>
         </View>

src/components/achieveAvatar/index.scss

@@ -29,17 +29,18 @@
       color: #333;
     }
     .touxiang{
-      width: 110px;
-      height: 110px;
+      overflow: hidden;
+      display: block;
+      width: 108px;
+      height: 108px;
+      margin: 24px auto 10px ;
       border-radius: 50%;
-      margin: 20px 0 10px 0;
     }
     .name{
-      font-size: 26px;
-      color: #333;
+      font-size: 28px;
+      color: #353535;
     }
   
-  
     .btn{
       width:290px;
       height:90px;

src/components/achievePhone/index.js

@@ -11,7 +11,7 @@ export default class Index extends Component {
   state = {}
 
   componentDidMount() {
-    const { user = {}} = this.props
+    const { user = {} } = this.props
     if (user.phone && typeof this.props.onSuccess === 'function') {
       this.props.onSuccess();
     }
@@ -30,7 +30,7 @@ export default class Index extends Component {
         }
 
         return
-      } else {        
+      } else {
         if (typeof this.props.onSuccess === 'function') {
           this.props.onSuccess(phoneNumber);
         }
@@ -86,7 +86,7 @@ export default class Index extends Component {
     )
   }
   render() {
-    const { user = {}} = this.props
+    const { user = {} } = this.props
 
     return (
       <Block>

src/components/achievePhone/index.scss

@@ -1,6 +1,8 @@
 .bg_img{
   width: 100vw;
   height: 100vh;
+  position: fixed;
+  z-index: 99;
 }
 .phone-page{
   position: fixed;

src/components/authorizationComponent/index.js

@@ -7,9 +7,7 @@ import { queryUserInfo, doUserSignin } from '@services/user'
 
 @connect(state => state.user, { ...actions })
 export default class Index extends Component {
-  config = {
-    navigationBarTitleText: '我的'
-  }
+
   state = {
     isLogin: false,
     isPhone: false

src/pages/person/index.js

@@ -30,13 +30,14 @@ export default class Person extends Component {
     roleName: '普通用户'
   }
 
-  componentDidShow () {
+  componentDidShow() {
     Taro.showLoading()
     this.loadUserInfo()
     Taro.hideLoading()
+    console.log(this.props, "wwwwwwwwwwwwwwwwww")
   }
 
-  loadUserInfo () {
+  loadUserInfo() {
     queryUserInfo().then(user => {
       const [roleSetting, roleName] = this.getRoleName(user.personType)
 
@@ -50,7 +51,7 @@ export default class Person extends Component {
     })
   }
 
-  doSign () {
+  doSign() {
     const { user: { id, havaSigned } } = this.state
     if (havaSigned) {
       return
@@ -72,13 +73,13 @@ export default class Person extends Component {
     })
   }
 
-  toHomePage () {
+  toHomePage() {
     Taro.switchTab({
       url: '/pages/project/index'
     })
   }
 
-  toShopPage () {
+  toShopPage() {
     Taro.switchTab({
       url: '/pages/shop/index'
     })
@@ -98,10 +99,10 @@ export default class Person extends Component {
           icon: "none",
           duration: 3000
         })
-        Taro.setStorageSync('userId',res.userId)
-        const  payload={
-          path:'',
-          scene:''
+        Taro.setStorageSync('userId', res.userId)
+        const payload = {
+          path: '',
+          scene: ''
         }
 
         login(payload, res => {
@@ -117,11 +118,11 @@ export default class Person extends Component {
         // },this.loadUserInfo())
 
         // if (res) {
-          // Taro.showToast({
-          //   title: "匹配成功，请退出小程序重新登录即可",
-          //   icon: "none",
-          //   duration: 3000
-          // })
+        // Taro.showToast({
+        //   title: "匹配成功，请退出小程序重新登录即可",
+        //   icon: "none",
+        //   duration: 3000
+        // })
         // } else {
         //   Taro.showToast({
         //     title: "匹配失败，请联系相关管理人员",
@@ -141,7 +142,7 @@ export default class Person extends Component {
 
   }
 
-  getRoleName (type) {
+  getRoleName(type) {
     switch (type) {
       case ROLE_CODE['CONSULTANT']:
         return [{ consultant: true }, '置业顾问']
@@ -154,19 +155,19 @@ export default class Person extends Component {
     }
   }
 
-  goShop () {
+  goShop() {
     Taro.switchTab({
       url: `/pages/shop/index`
     })
   }
-  handleMore () {
+  handleMore() {
     Taro.showModal({
       title: '温馨提示',
       content: '敬请期待'
     })
   }
 
-  goPersonDetail () {
+  goPersonDetail() {
 
     const { user: { personType } } = this.state
 
@@ -178,12 +179,13 @@ export default class Person extends Component {
 
   }
 
-  renderLogin () {
+  renderLogin() {
     return <Authorize></Authorize>
   }
 
-  renderDetail () {
+  renderDetail() {
     const { user, menus, roleName } = this.state
+    const { user: { userInfo: { miniApp: { name } } } } = this.props
     // const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']
     // const isConsultant = user.personType
@@ -256,12 +258,16 @@ export default class Person extends Component {
             })
           }
         </View>
-        <View style="text-align:center;line-height:50px;color:#cccccc;">{version}</View>
+        <View style="text-align:center;color:#ccc;line-height:1.5;font-size:22rpx;padding:20rpx 0 4rpx 0 ">
+          <View style="font-size:26rpx;color:#999;"> {version}</View>
+          <View > 橙蕉互动提供技术支持 </View>
+          <View >{name}提供运营方案 </View>
+        </View>
       </View>
     );
   }
 
-  render () {
+  render() {
     const { phone, tel } = this.state.user
     return (
       <View className='wrap'>