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

# Conflicts:
#	src/pages/agent/recommend/index.js

src/pages/card/index.js

@@ -426,6 +426,7 @@ export default class Index extends Component {
       return
     }
 
+    this.setState({ grantPhoneVisible: false })
     this.initPageData()
   }
 
@@ -440,10 +441,11 @@ export default class Index extends Component {
     const isSelf = personId === id
 
     const isConsultant = personType === ROLE_CODE['CONSULTANT']
-    const hadPhone = (phone || tel) ? true : false
+    const hadPhone = (phone || tel) ? true : false  // nb
     const visibleChatBtn = !isConsultant && !isSelf
     // const visibleConfirmModal = modalStatus && !isReport && !isSelf && (personType === ROLE_CODE['DRIFT'] || personType === ROLE_CODE['CUSTOMER'])
     const visibleConfirmModal = modalStatus && !isReport && !isSelf
+
     return (
       <Block>
         {/* 生成海报 */}
@@ -453,7 +455,7 @@ export default class Index extends Component {
           <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {
-          visibleConfirmModal && (
+          !grantPhoneVisible && visibleConfirmModal && (
             <View className="modal">
               <View className="modal-mask" onClick={this.hideModal}></View>
               <View className="modal-body">

src/pages/project/detail/index.js

@@ -946,7 +946,11 @@ export default class Index extends Component {
     // })
     videoContext.play()
   }
-
+  bindended(){
+    let videoContext = wx.createVideoContext('myVideo')
+    console.log()
+    videoContext.seek(1)
+  }
   // onPlay () {
   //   console.log()
   //   this.setState({
@@ -983,6 +987,7 @@ export default class Index extends Component {
           }}
           id='myVideo'
           controls={true}
+          bindended={this.bindended}
           // autoplay={false}
           // initialTime='0'
           // loop={true}