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

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.pawoma.cn"',//测试
-    WSS_HOST: '"wss://dev.pawoma.cn"',
+    // HOST: '"https://dev.pawoma.cn"',//测试
+    // WSS_HOST: '"wss://dev.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: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
     // HOST: '"http://127.0.0.1:8080"',
     // WSS_HOST: '"ws://127.0.0.1:8080"',
     Version: 'V3.5.10'

config/prod.js

@@ -7,10 +7,10 @@ module.exports = {
     // WSS_HOST: '"ws://192.168.2.54:8080"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    HOST: '"https://dev.pawoma.cn"',// 新测试
-    WSS_HOST: '"wss://dev.pawoma.cn"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    // HOST: '"https://dev.pawoma.cn"',// 新测试
+    // WSS_HOST: '"wss://dev.pawoma.cn"',
+    HOST: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
     Version: 'V3.5.10'
   },
   weapp: {},

project.config.json

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

src/components/indexMenus/icons.js

@@ -70,7 +70,7 @@ const menus = [
         switchTab: true,
     },
     {
-        name: '参与活动',
+        name: '参加活动',
         url: '/pages/activity/activity',
         icon: icons.activity,
         iconCode: 'Popularactivities',

src/onlineSelling/components/HouseGrid/Room.js

@@ -19,7 +19,7 @@ export default function Room(props) {
       {status == '1' && <View className="room" onClick={handleClick}>
         <View className="warn">{roomName || ''}</View>
         <View className="warn">{personNum || ''}</View>
-        <View className="info" style="white-space:nowrap;">{wanY}万元</View>
+        <View className="info" >{wanY}万元</View>
         <View className="info">{apartmentName || ''}</View>
       </View>}
 

src/onlineSelling/components/HouseGrid/room.scss

@@ -4,10 +4,12 @@
   padding: 20px 10px;
   font-size: 28px;
   line-height: 1.4em;
+  height: 192px;
   overflow: hidden;
 
   .info {
     color: #333;
+    white-space:nowrap;
   }
 
   .warn {

src/onlineSelling/pages/detail/index.js

@@ -93,15 +93,30 @@ export default class Index extends Component {
     })
   }
 
-  handlePanoramaClick(panorama) {
-    const url = (panorama || {}).panoramaLink
+  handlePanoramaClick(panoramaLink) {
+    console.log(panoramaLink, "panoramapanoramapanoramapanoramapanoramapanoramapanoramapanoramapanorama")
 
-    if (!url) return;
+    if (!panoramaLink) return;
 
-    this.navigateTo(`/pages/project/panorama/index?url=${encodeURIComponent(url)}`)
+    Taro.navigateTo({ url: `/pages/project/panorama/index?url=${encodeURIComponent(panoramaLink)}` })
+
+  }
+
+  goToPanorama(panoramaLink) {
+
+
+    if (!panoramaLink) return;
+
+    this.navigateTo(`/pages/project/panorama/index?url=${encodeURIComponent(panoramaLink)}`)
+  }
+
+  handlePanoramaClick(panoramaLink) {
+    this.goToPanorama(panoramaLink)
+  }
+  navigateTo(url) {
+    Taro.navigateTo({ url: url })
   }
 
-  
 
 
   render() {
@@ -119,23 +134,27 @@ export default class Index extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
-        {popVisiable && <View className="pop-box">
-          <View className="title" >{!houseDetail.isPreselect ? `确认使用手机号${userInfo.person.phone || userInfo.person.tel}预选此房源？` : '确认取消预选此房源？'}</View>
-          <View className="sure" onClick={!houseDetail.isPreselect ? () => this.chooseBtn('add') : () => this.chooseBtn('cancel')}>确定</View>
-          <View className="cancel" onClick={() => this.setState({ popVisiable: false })}>取消</View>
-        </View>}
+        {popVisiable &&
+          <Block>
+            <View className="mask"> </View>
+            <View className="pop-box">
+              <View className="title" >{!houseDetail.isPreselect ? `确认使用手机号${userInfo.person.phone || userInfo.person.tel}预选此房源？` : '确认取消预选此房源？'}</View>
+              <View className="sure" onClick={!houseDetail.isPreselect ? () => this.chooseBtn('add') : () => this.chooseBtn('cancel')}>确定</View>
+              <View className="cancel" onClick={() => this.setState({ popVisiable: false })}>取消</View>
+            </View>
+          </Block>
+        }
 
         <View className='detail'>
           <View className='detail-top'>
             {buildingImgList.length ?
-              <Block>
-                <Image className="cover-img" mode="aspectFill" src={transferImage(buildingImgList[0].url)}></Image>
-                {/* <Image className="vr-img"   onClick={this.handlePanoramaClick.bind(this)} src={require('@/assets/vr.png')}></Image> */}
-              </Block>
+              <Image className="cover-img" mode="widthFix" onClick={() => buildingImgList[0].type == '1' ? this.handlePanoramaClick(buildingImgList[0].panoramaLink) : ''} src={transferImage(buildingImgList[0].url)} />
               : <Blank tips="暂无户型信息"></Blank>
             }
-
           </View>
+          {buildingImgList.length && buildingImgList[0].type == '1' &&
+            <Image className="vr-img" onClick={() => this.handlePanoramaClick(buildingImgList[0].panoramaLink)} src={require('@/assets/vr.png')} />
+          }
           <ScrollView
             enableBackToTop
             className="wrap"

src/onlineSelling/pages/detail/index.scss

@@ -1,5 +1,15 @@
 @import "@/styles/mixins.scss";
 @import "@/styles/theme.scss";
+.mask{
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: rgba(0,0,0,.34);
+  z-index: 99;
+
+}
 .pop-box{
   position: fixed;
   bottom: 0;
@@ -28,6 +38,13 @@
   }
 
 }
+.vr-img{
+  position: fixed;
+  top: 452px;
+  left: 327px;
+  width:96px;
+  height:88px;
+}
 .detail {
   position: relative;
   width: 100%;
@@ -38,21 +55,15 @@
     height:600px;
     position: fixed;
     top: 0;
+    background-color: #F8F8F8;
  
     
     .cover-img{
       width:100%;
       height:100%;
-      position: fixed;
-      top: 0;
-    }
-    .vr-img{
-      position: fixed;
-      top: 452px;
-      left: 327px;
-      width:96px;
-      height:88px;
+      min-height: 600px;
     }
+    
     .norecord-img{
       width:280px;
       height:220px;
@@ -65,9 +76,10 @@
   }
  
   .wrap {
-    padding-top: 570px;
+    margin-top: 570px;
     background: transparent;
     position: relative;
+
   }
 
   &__main {

src/onlineSelling/pages/houseList/index.js

@@ -340,7 +340,7 @@ export default class HouseList extends Component {
       }
 
       const [page, scene] = this.currentPageAndParams()
-      const payload = { page, scene }
+      const payload = { page, scene, showToast: false }
 
       getMiniQrcode(payload).then(qrcode => {
         const { posterData = {} } = this.state
@@ -582,7 +582,7 @@ export default class HouseList extends Component {
     } = this.state
 
     if (loading) {
-      return <View style="margin: 80px auto;"><Loading color="#BB9C79" size={100}/></View>
+      return <View style="margin: 80px auto;"><Loading color="#BB9C79" size={100} /></View>
     }
 
     const { userInfo: { person } } = this.props

src/pages/activity/detail/poster.js

@@ -122,7 +122,7 @@ export default class Index extends Component {
       // {
       //   x: (data.miniAppName || '').length * 30 + 130,
       //   y: 1065,
-      //   text: '参与活动',
+      //   text: '参加活动',
       //   fontSize: 26,
       //   color: '#999',
       //   baseLine: 'middle',

src/pages/activity/index.js

@@ -10,7 +10,7 @@ import { connect } from '@tarojs/redux'
 export default class Index extends Component {
 
   config = {
-    navigationBarTitleText: '参与活动'
+    navigationBarTitleText: '参加活动'
   }
 
   state = {

src/pages/card/index.js

@@ -53,8 +53,7 @@ export default class Index extends Component {
       // if (sceneInShare(options.scene)) {
 
       // 必须授权电话
-      const { cardInfo, userInfo: { person: { personId, orgId } } } = this.props
-      console.log(person, "cardInfocardInfocardInfocardInfocardInfocardInfocardInfo")
+
       if (this.toggleGrantPhone()) {
         this.toggleGrantAvatar()
       }
@@ -407,8 +406,10 @@ export default class Index extends Component {
       cardInfo: { id, name, projects = [] },
       userInfo: { person: { phone, tel, personType, avatarurl, personId } }
     } = this.props
-    
-    Taro.setNavigationBarTitle({ title: `${name}为您服务` })
+    if (id != personId) {
+      Taro.setNavigationBarTitle({ title: `${name}为您服务` })
+    }
+
 
     if (personType === ROLE_CODE['CONSULTANT']) {
       return

src/pages/project/activity/index.js

@@ -48,7 +48,7 @@ export default class SwiperBanner extends Component {
         return (
             <View className="activity-box" style={`background: url(${transferImage(bgImg)}) no-repeat center;background-size: 100% 100%;`}>
                 <View className="section-head">
-                    <View className="section-head__title">参与活动 </View>
+                    <View className="section-head__title">参加活动 </View>
                     <View className="section-head__more" onClick={this.toActivity}>
                         查看更多<Text className="iconfont icon-more"></Text>
                     </View>

src/pages/project/detail/index.js

@@ -1208,7 +1208,7 @@ export default class Index extends Component {
           activityList.length > 0 && (
             <View className="activity" >
               <View className="section-head">
-                <Text className="section-head__title" style={{ margin: '10rpx 0 40rpx 35rpx' }}>参与活动</Text>
+                <Text className="section-head__title" style={{ margin: '10rpx 0 40rpx 35rpx' }}>参加活动</Text>
                 <View className="section-head__more" style={{ marginRight: '20rpx' }} onClick={this.handleActivityMoreClick}>
                   更多活动<Text className="iconfont icon-more"></Text>
                 </View>
@@ -1562,7 +1562,7 @@ export default class Index extends Component {
                   {this.renderGroup()}
                   {/* 新鲜资讯 */}
                   {this.renderNews()}
-                  {/* 参与活动 */}
+                  {/* 参加活动 */}
                   {this.renderActivities()}
                   {/* 相册 */}
                   {this.renderPhotoAlbum()}

src/pages/project/icons.js

@@ -70,7 +70,7 @@ const menus = [
         switchTab: true,
     },
     {
-        name: '参与活动',
+        name: '参加活动',
         url: '/pages/activity/activity',
         icon: icons.activity,
         iconCode: 'Popularactivities',

src/pages/project/index.js

@@ -666,7 +666,7 @@ export default class Index extends Component {
                 {/* 资讯 */}
                 <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
               </View >
-              {/* 参与活动*/}
+              {/* 参加活动*/}
               {
                 helpGroupList && helpGroupList.length &&
                 (<Activity helpGroupList={helpGroupList} cityId={curCity.id} />)

src/styles/reset.scss

@@ -6,7 +6,7 @@
 
 /* weapp */
 page {
-  height: 100%;
+  // height: 100%;
   font-size:28px;
   color:#313131;
 }