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

project.config.json

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

src/components/authorizationComponent/index.js

@@ -0,0 +1,117 @@
+import Taro, { Component } from '@tarojs/taro'
+import { connect } from '@tarojs/redux'
+import * as actions from '@actions/user'
+import './index.scss'
+import getUserPhone from '@utils/getUserPhone'
+import { queryUserInfo, doUserSignin } from '@services/user'
+
+@connect(state => state.user, { ...actions })
+export default class Index extends Component {
+  config = {
+    navigationBarTitleText: '我的'
+  }
+  state = {
+    isLogin: false,
+    isPhone: false
+  }
+  componentWillMount() {
+    const { user = {} } = this.props
+    // this.toggleGrantAvatar()
+  }
+
+  toggleGrantAvatar = () => {
+    const { userInfo: { person: { avatarurl,tel,phone } } } = this.props
+
+    if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
+      console.log(this.props.userInfo, "this.props")
+      this.setState({isLogin:false})
+    }
+    console.log(avatarurl, "avatarurl")
+    this.setState({isLogin:true})
+    if(!tel&&!phone){
+      this.setState({isPhone:false})
+    }
+    this.setState({isPhone:true})
+  }
+
+  getUserInfo() {
+    const { dispatchUpdateUserInfo } = this.props
+    const sessionKey = Taro.getStorageSync('sessionKey')
+    Taro.getUserInfo({
+      lang: 'zh_CN',
+      success: res => {
+        console.log(res, "res")
+        const payload = Object.assign(res, { sessionKey })
+        // const { userInfo: { nickName, gender, country, city, province } } = payload
+        // App.zhuge.identify(nickName, {
+        //   '昵称': nickName,
+        //   '性别': gender == 1 ? '男' : '女',
+        //   '国家': country,
+        //   '省份': province,
+        //   '城市': city
+        // })
+        // 用户信息保存至服务器
+        dispatchUpdateUserInfo(payload).then(res => {
+          console.log('更新信息')
+          this.setState({isLogin:true})
+        })
+      },
+      fail: (err) => {
+        console.error(err)
+
+        Taro.showToast({
+          title: '获取用户信息失败',
+          icon: 'none'
+        })
+        return
+        // this.toPage(false)
+      }
+    })
+  }
+
+  getPhoneNumber(e) {
+    getUserPhone(e, (phoneNumber) => {
+      const { dispatchUpdateUserInfoNew } = this.props
+      if (!phoneNumber) {
+        Taro.showToast({
+          title: '获取手机号失败',
+          icon: 'none'
+        })
+        return
+      } else {
+        dispatchUpdateUserInfoNew(this.state.user.id)
+        this.setState({isPhone:true})
+      }
+    })
+  }
+
+  render() {
+    const {user}=this.state
+    if (!this.state.isLogin) {
+      return (
+        <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>
+            <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
+          </View>
+        </View>
+      )
+    } else if (!this.state.isPhone) {
+      return (
+        <View className='auth-page'>
+          <Image className="avatar_img" src={user.avatar} />
+          <View className="user_name">{user.nickname}</View>
+          <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
+          {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
+        </View>
+      )
+    }
+    return (
+      <View>
+        {this.props.children}
+      </View>
+    )
+  }
+}

src/components/authorizationComponent/index.scss

@@ -0,0 +1,103 @@
+@import "@styles/theme.scss";
+
+.auth-page{
+  position: relative;
+  width: 100%;
+  height: 100%;
+  .avatar_img{
+    position: absolute;
+    width:120px;
+    height:120px;
+    left:50%;
+    margin-left:-60px;
+    top:20%;
+    border-radius:20px;
+  }
+  .user_name{
+    position: absolute;
+    width:100%;
+    left:0;
+    text-align:center;
+    top:33%;
+    font-size:32px;
+  }
+  .auth-btn{
+    position: absolute;
+    width: 80%;
+    left: 10%;
+    height:90px;
+    border-radius: 10px;
+    top:40%;
+    font-size:32px;
+    font-weight: 500;
+    line-height: 90px;
+    color: white;
+    background-color: $primary-color;
+  }
+  .adver-btn{
+    position: absolute;
+    color: #5B90FF;
+    
+    width: 100%;
+    text-align: center;
+    top:52%;
+    Text{
+      border-bottom: 1px solid #5B90FF;
+    }
+  }
+}
+
+
+.avatar-page{
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  left: 0;
+  top: 0;
+  z-index: 9999;
+  background: rgba(0, 0, 0, 0.22);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  
+  .content {
+    width: 94vw;
+    height: 430px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -47vw;
+    transform: translateY(-50%);
+    background-color: #fff;
+    border-radius: 12px;
+    padding: 40px;
+    text-align: center;
+    .title{
+      font-size: 34px;
+      color: #333;
+    }
+    .touxiang{
+      width: 110px;
+      height: 110px;
+      border-radius: 50%;
+      margin: 20px 0 10px 0;
+    }
+    .name{
+      font-size: 26px;
+      color: #333;
+    }
+  
+  
+    .btn{
+      width:290px;
+      height:90px;
+      background:rgba(187,156,121,1);
+      border-radius:12px;
+      font-size: 34px;
+      color: #fff;
+      line-height: 90px;
+      margin-top: 40px;
+    }
+  }
+}