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

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.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    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.0.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    // HOST: '"http://192.168.0.84:8080"',
+    // WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/pages/activity/detail/assemble.js

@@ -642,7 +642,7 @@ export default class Detail extends Component {
                         (groupState === GroupInProcess && !isJoin) &&
                         (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></FormIdCollector></View>)
                       }                      
-                      <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"}>
+                      <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} style="border:none">
                         <FormIdCollector>
                           <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
                         </FormIdCollector>

src/pages/project/detail/index.js

@@ -48,8 +48,8 @@ export default class Index extends Component {
     activityList: [],
     helpList: [],
     groupList: [],
-    statusOpts: ['待定', '售罄', '在售'],
-    statusBgColors: ['#F6B61D', '#BB9C79', '#CECECE'],
+    statusOpts: ['待售', '售罄', '在售'],
+    statusBgColors: ['#BB9C79', '#CECECE', '#F6B61D'],
     // circumOpts: [],
     curTab: 'Transport',
     recordId: null,
@@ -63,7 +63,7 @@ export default class Index extends Component {
 
   componentWillMount() {
     ready.queue(() => {
-    
+
       // 分享场景需要先授权手机, 再授权头像
       const options = wx.getLaunchOptionsSync()
       if (sceneInShare(options.scene)) {
@@ -245,10 +245,10 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum (index){
+  toViewAlbum(index) {
     const { buildingId } = this.state
-    console.log('1111111',index)
-    this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}` )
+    console.log('1111111', index)
+    this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}`)
   }
 
   onViewFans() {
@@ -637,21 +637,21 @@ export default class Index extends Component {
                       console.log(buildingImgUrl, 'buildingImgUrl')
 
                       // if (buildingImgUrl != null) {
-                      return ( <View key={index + "listimg"}>
+                      return (<View key={index + "listimg"}>
                         {buildingImgUrl != null && (<View
                           style={{ marginRight: '8px' }}
-                          
+
                         >
 
                           <View>
-                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} onClick={()=>this.toViewAlbum(index)}></Image>
+                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} onClick={() => this.toViewAlbum(index)}></Image>
                             <View style={{ width: '218rpx', display: 'flex', justifyContent: 'center' }} >
                               <View style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
                               <View> ({buildingImgList.length})</View>
                             </View>
                           </View>
                         </View>)}
-                        </View>
+                      </View>
                       )
                       // }
 
@@ -869,21 +869,21 @@ export default class Index extends Component {
   }
   renderActivities() {
 
- 
+
     const { activityList } = this.state
-   
+
     return (
       <Block>
         {
           activityList.length > 0 && (
             <View className="activity" >
-           
+
               <View className="section-head">
-                 <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>
-               </View>
+                <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>
+              </View>
               <View
                 style={{ position: 'relative' }}>
                 <HelpGroupBanner
@@ -898,7 +898,7 @@ export default class Index extends Component {
 
               </View>
             </View>
-      
+
           )
         }
       </Block>