张延森 5 лет назад
Родитель
Сommit
7f6b2a84b9
3 измененных файлов: 20 добавлений и 10 удалений
  1. 4
    4
      config/dev.js
  2. 3
    3
      src/onlineSelling/components/RaiseCard/index.js
  3. 13
    3
      src/onlineSelling/pages/raiseMoney/index.js

+ 4
- 4
config/dev.js Просмотреть файл

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://47.101.36.130:8085"',//测试
6
     // HOST: '"http://47.101.36.130:8085"',//测试
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
8
-    HOST: '"https://dev.pawoma.cn"',//测试
9
-    WSS_HOST: '"wss://dev.pawoma.cn"',
8
+    // HOST: '"https://dev.pawoma.cn"',//测试
9
+    // WSS_HOST: '"wss://dev.pawoma.cn"',
10
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
10
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
12
     // HOST: '"https://lt.pawoma.cn"',
12
     // HOST: '"https://lt.pawoma.cn"',
13
     // WSS_HOST: '"wss://lt.pawoma.cn"',
13
     // WSS_HOST: '"wss://lt.pawoma.cn"',
14
-    // HOST: '"http://127.0.0.1:8080"',
15
-    // WSS_HOST: '"ws://127.0.0.1:8080"',
14
+    HOST: '"http://127.0.0.1:8080"',
15
+    WSS_HOST: '"ws://127.0.0.1:8080"',
16
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
16
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
17
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
17
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
18
     Version: 'V3.5.12'
18
     Version: 'V3.5.12'

+ 3
- 3
src/onlineSelling/components/RaiseCard/index.js Просмотреть файл

48
   }
48
   }
49
   return (
49
   return (
50
     <View className="housecard" style={props.style} >
50
     <View className="housecard" style={props.style} >
51
-      <View className="head" onClick={props.handleCard}>
51
+      <View className="head" onClick={() => (props.handleCard && props.handleCard())}>
52
         {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
52
         {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
53
           <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
53
           <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
54
         }
54
         }
55
       </View>
55
       </View>
56
       <View className="body">
56
       <View className="body">
57
-        {props.type == 'raiseMoney' && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
58
-        <View onClick={props.handleCard}>
57
+        {props.type == 'raiseMoney' && !props.disableCancel && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
58
+        <View onClick={() => (props.handleCard && props.handleCard())}>
59
           {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
59
           {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
60
           {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : ' '}</View>}
60
           {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : ' '}</View>}
61
           {(props.type == 'raiseProfile' || props.type == 'raiseMoney') && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || ''}</View>}
61
           {(props.type == 'raiseProfile' || props.type == 'raiseMoney') && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || ''}</View>}

+ 13
- 3
src/onlineSelling/pages/raiseMoney/index.js Просмотреть файл

160
   }
160
   }
161
   renderHouse() {
161
   renderHouse() {
162
     const { house: { raiseCart } } = this.props
162
     const { house: { raiseCart } } = this.props
163
+    const { raiseProfile } = this.state
164
+    const disabled = raiseProfile.houseLockingType === 'auto'
165
+
163
     return (
166
     return (
164
       <ScrollView scrollY className="container">
167
       <ScrollView scrollY className="container">
165
         {
168
         {
166
           raiseCart.map(item => (
169
           raiseCart.map(item => (
167
             <View key={item.houseId} >
170
             <View key={item.houseId} >
168
-              <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel} />
171
+              <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel} disableCancel={disabled} />
169
             </View>
172
             </View>
170
           ))
173
           ))
171
         }
174
         }
172
-        <View className="addhouse">从 <Text style="color:#F3B82E" onClick={this.gotoHouseSelect.bind(this, 'all')}>房源列表</Text> 中添加其他房源</View>
173
-        <View className="addhouse">从 <Text style="color:#BB9C79" onClick={this.gotoHouseSelect.bind(this, 'select')}>预选记录</Text> 中添加其他房源</View>
175
+        {
176
+          !disabled &&
177
+          (
178
+            <Block>
179
+              <View className="addhouse">从 <Text style="color:#F3B82E" onClick={this.gotoHouseSelect.bind(this, 'all')}>房源列表</Text> 中添加其他房源</View>
180
+              <View className="addhouse">从 <Text style="color:#BB9C79" onClick={this.gotoHouseSelect.bind(this, 'select')}>预选记录</Text> 中添加其他房源</View>
181
+            </Block>
182
+          )
183
+        }
174
         <Statement style="margin-top:80rpx" />
184
         <Statement style="margin-top:80rpx" />
175
       </ScrollView>
185
       </ScrollView>
176
     )
186
     )