bug fix

config/prod.js

@@ -3,10 +3,10 @@ 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://dev.fangdeal.cn"', //测试
+    WSS_HOST: '"wss://dev.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.28"

src/app.js

@@ -234,6 +234,8 @@ class App extends Component {
           Taro.removeStorageSync('buildingPageIndex')
           Taro.removeStorageSync('followPageIndex')
           Taro.removeStorageSync('clinchPageIndex')
+          // Taro.removeStorageSync('extendContent')
+          Taro.setStorageSync('extendContent', [])
           // 获取分享人
           Taro.setStorageSync('recommender', payload.recommender)
           Taro.setStorageSync('consultantId', payload.consultant)

src/components/Poster/index.js

@@ -115,15 +115,15 @@ export default class Poster extends Component {
           </View>
           <View className="con-body">
             <Swiper className="preview-box" onChange={this.onScroll} >
-            {
-              done && images.map((img, inx) => {
-                return (
-                  <SwiperItem key={`img-${inx}`}>
-                    <Image className="result-img" mode="aspectFit" lazy-load src={img} onClick={this.onPreview}></Image>
-                  </SwiperItem>
-                )
-              })
-            }
+              {
+                done && images.map((img, inx) => {
+                  return (
+                    <SwiperItem key={`img-${inx}`} style=" text-align: center;">
+                      <Image className="result-img" mode="aspectFit" lazy-load src={img} onClick={this.onPreview}></Image>
+                    </SwiperItem>
+                  )
+                })
+              }
             </Swiper>
           </View>
           <Button className="save-btn" onClick={this.saveToAlbum}>保存海报</Button>

src/pages/activity/detail/assemble.js

@@ -734,7 +734,7 @@ export default class Detail extends Component {
                 <Image mode="widthFix" src={transferImage(detail.mainImg)} className="detail-banner__img"></Image>
 
                 <View className="rest-time">
-                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
+                  <Text className="row-label" style={actState === ActBeforeStart || actState === ActInProcess ? 'margin-right: 8px;' : ''}>{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
                   <Text className="row-text">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
                 {detail.successNum > 0 &&

src/pages/activity/detail/assistance.js

@@ -715,7 +715,7 @@ export default class Detail extends Component {
                 <Image mode="aspectFill" src={transferImage(detail.img)} className="detail-banner__img"></Image>
 
                 <View className="rest-time">
-                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
+                  <Text className="row-label" style={actState === ActBeforeStart || actState === ActInProcess ? 'margin-right: 8px;' : ''}>{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
                   <Text className="row-text">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
                 {detail.successNum > 0 &&

src/pages/activity/detail/index.scss

@@ -39,13 +39,13 @@
     padding: 10px 36px;
     font-size: 30px;
     border-radius: 0 12px 0 0 ;
+    line-height: 1.2;
     .row-label{
       color:#666;
-      margin-right: 10px;
     }
     .row-text{
       color: #FF245A;
-      min-width: 6em;
+      min-width: 5em;
       display: inline-block;
       white-space: nowrap;
     }

src/pages/activity/detail/poster.scss

@@ -42,6 +42,7 @@
       // background: #EAEAEA;
       border-radius: 10px;
       padding: 40px 0;
+      text-align: center;
 
       .result-img {
         height: 60vh;

src/pages/card/index.js

@@ -88,6 +88,11 @@ export default class Index extends Component {
           dispatchProjectDetail(buildingId)
         }
       })
+      this.getPosterData().then(posterData => {
+        this.setState({
+          posterData,
+        })
+      })
     }
   }
 
@@ -538,10 +543,6 @@ export default class Index extends Component {
   bindAlbumClick(e) {
 
     e.stopPropagation()
-
-    Taro.showLoading({
-      title: '加载中',
-    })
     Taro.chooseImage({
       count: 1,
       sizeType: ['original', 'compressed'],  //可选择原图或压缩后的图片

src/pages/card/photo.js

@@ -41,8 +41,15 @@ export default class Panorama extends Component {
     const photoUrl = this.$router.params.photoUrl || avatarImg
     const { userInfo: { person: { personId } } } = this.props
     updatePhoto({ photoUrl }).then(res => {
-      // Taro.navigateBack({ delta: 1 })
-      Taro.redirectTo({ url: `/pages/card/index?id=${personId}&loadInfo=need` })
+      Taro.showToast({
+        title: '保存成功',
+        icon: 'none',
+        duration: 1000
+      })
+      setTimeout(() => {
+        Taro.redirectTo({ url: `/pages/card/index?id=${personId}&loadInfo=need` })
+      }, 800)
+
     })
   }
 

src/pages/news/detail/index.js

@@ -378,7 +378,7 @@ export default class NewsDetail extends Component {
   }
   toProjectDetail = () => {
     const { projectDetail: { buildingId } } = this.props
-    this.navigateTo(`/pages/project/detail/index?id=${buildingId}`)
+    Taro.navigateTo({ url: `/pages/project/detail/index?id=${buildingId}` })
   }
   render() {
     const { webViewVisible, grantPhoneVisible, grantAvatarVisible, detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state

src/pages/project/detail/index.js

@@ -347,10 +347,13 @@ export default class Index extends Component {
       icon: 'loading'
     })
     dispatchProjectDetail(buildingId, { ...queryInfo }).then(res => {
-      const maskVisible = (res.extendContent || []).length
+      const connectId = (res.extendContent || [])[0] ? (res.extendContent || [])[0].contentId : null
+      const extendContentList = Taro.getStorageSync('extendContent') || []
+      const maskVisible = extendContentList.length ? (res.extendContent || []).length && extendContentList.indexOf(connectId) == -1 : (res.extendContent || []).length
+      // debugger
       this.setState({
         loaded: true,
-        maskVisible,
+        maskVisible: maskVisible,
         extendContent: (res.extendContent || [])[0],
         // circumOpts: newCircumOpts,
         isSaved: res.isSave
@@ -360,6 +363,10 @@ export default class Index extends Component {
             posterShow: 'flex'
           })
         }
+        if (connectId && extendContentList.indexOf(connectId) == -1) {
+          extendContentList.push(connectId)
+          Taro.setStorageSync('extendContent', extendContentList);
+        }
 
         this._$_dataReady()
       })
@@ -1528,6 +1535,7 @@ export default class Index extends Component {
         Taro.navigateTo({
           url: '/pages/project/detail/index?id=' + buildingId
         })
+        this.handleMaskClose()
         return;
 
       // 活动
@@ -1535,6 +1543,7 @@ export default class Index extends Component {
         Taro.navigateTo({
           url: '/pages/activity/detail/index?id=' + targetId
         })
+        this.handleMaskClose()
         return;
 
       // 助力
@@ -1542,6 +1551,7 @@ export default class Index extends Component {
         Taro.navigateTo({
           url: '/pages/activity/detail/assistance?id=' + targetId
         })
+        this.handleMaskClose()
         return;
 
       // 拼团
@@ -1549,6 +1559,7 @@ export default class Index extends Component {
         Taro.navigateTo({
           url: '/pages/activity/detail/assemble?id=' + targetId
         })
+        this.handleMaskClose()
         return;
 
       // 资讯
@@ -1556,24 +1567,28 @@ export default class Index extends Component {
         Taro.navigateTo({
           url: '/pages/news/detail/index?id=' + targetId
         })
+        this.handleMaskClose()
         return;
       // h5
       case 'h5':
         Taro.navigateTo({
           url: '/pages/project/h5Page?id=' + targetId
         })
+        this.handleMaskClose()
         return;
       // live
       case 'live':
         Taro.navigateTo({
           url: '/onlineSelling/pages/live/index?id=' + targetId
         })
+        this.handleMaskClose()
         return;
       // salesBatch
       case 'salesBatch':
         Taro.navigateTo({
           url: `/onlineSelling/pages/houseList/index?id=${targetId}`
         })
+        this.handleMaskClose()
         return;
 
       // 其他