xujing vor 5 Jahren
Ursprung
Commit
8243f00011

+ 2
- 2
src/onlineSelling/components/RaiseCard/index.js Datei anzeigen

@@ -69,10 +69,10 @@ export default function RaiseCard(props) {
69 69
         <View onClick={() => (props.handleCard && props.handleCard())}>
70 70
           {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
71 71
           {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : ' '}</View>}
72
-          {(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>}
72
+          {(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>}
73 73
           {props.type == 'raiseMoney' && taRaise.displayHousePrice && <View className="red-price">现价{Number(price) + 0}万</View>}
74 74
           {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 12rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
75
-          <View className="title">{title}</View>
75
+          <View className="title" style={props.type == 'raiseMoney' && !props.disableCancel ? 'max-width:340rpx' : ''}>{title}</View>
76 76
           {!props.type && <View className="meta">{showDT}</View>}
77 77
           {props.type == 'raiseProfile' && taRaise.displayHousePrice && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
78 78
           {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&

+ 2
- 1
src/onlineSelling/pages/detail/index.js Datei anzeigen

@@ -203,9 +203,10 @@ export default class Index extends Component {
203 203
                 <View className="address">
204 204
                   <Image className="location-icon" src={require('../../assets/location.png')}></Image>{address || ''}
205 205
                 </View>
206
-                <View className="date">
206
+                {houseDetail.preselectionStartTime && <View className="date">
207 207
                   预选时间:{dayjs(houseDetail.preselectionStartTime).format('MM/DD HH:mm:ss')}--{dayjs(houseDetail.preselectionEndTime).format('MM/DD HH:mm:ss')}
208 208
                 </View>
209
+                }
209 210
                 {taRaise && <View className="date">认筹时间:{dayjs(taRaise.raiseStartTime).format('MM/DD HH:mm:ss')}--{dayjs(taRaise.raiseEndTime).format('MM/DD HH:mm:ss')}
210 211
                 </View>}
211 212
 

+ 2
- 2
src/onlineSelling/pages/raiseMoney/index.js Datei anzeigen

@@ -50,7 +50,7 @@ export default class raiseMoney extends Component {
50 50
     raiseProfile: undefined,  // 认筹主记录
51 51
     record: {},               // 认筹单
52 52
     preselectList: [],        // 我的预选 - 当前批次
53
-    protocolCountdown: 10,    // 单位 s
53
+    protocolCountdown: 5,    // 单位 s
54 54
     captchaCountdown: 60,     // 单位 s
55 55
     payType: '',              // 缴费方式
56 56
     failInfo: undefined,      // 操作失败 - 对象 { title, desc }
@@ -333,7 +333,7 @@ export default class raiseMoney extends Component {
333 333
               <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
334 334
               姓名
335 335
             </View>
336
-            <Input className='input' placeholder-style="color:#999" disabled={disabled} value={record.name} onInput={this.handleInput.bind(this, 'name')} type='text' placeholder='请填写真实姓名' />
336
+            <Input className='input' placeholder-style="color:#999" maxlength="10" disabled={disabled} value={record.name} onInput={this.handleInput.bind(this, 'name')} type='text' placeholder='请填写真实姓名' />
337 337
           </View>
338 338
           <View className="profile-item">
339 339
             <View className="name">

+ 5
- 5
src/onlineSelling/pages/raiseProfile/index.js Datei anzeigen

@@ -100,8 +100,8 @@ export default class Raise extends Component {
100 100
   toPay = () => {
101 101
     console.log(this.props, "this.propsthis.propsthis.props")
102 102
     const { raiseDeatil: { raiseRecordId } } = this.state
103
-    const { user: { userInfo: { miniApp: { tpls } } } } = this.props                  
104
-    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true)[0] || {}).tplId  
103
+    const { user: { userInfo: { miniApp: { tpls } } } } = this.props
104
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true)[0] || {}).tplId
105 105
 
106 106
     wx.requestSubscribeMessage({
107 107
       tmplIds: [tplId],
@@ -111,7 +111,7 @@ export default class Raise extends Component {
111 111
 
112 112
       },
113 113
       complete() {
114
-       
114
+
115 115
         Taro.navigateTo({
116 116
           url: `/onlineSelling/pages/raiseMoney/index?type=pay&raiseRecordId=${raiseRecordId}`
117 117
         })
@@ -220,7 +220,7 @@ export default class Raise extends Component {
220 220
     const otherInfo = [
221 221
       { head: '其他信息', body: '供核对数据使用' },
222 222
       { head: '认筹单编号', body: raiseDeatil.raiseRecordId || '', action: true },
223
-      { head: '缴费单编号', body: orderDetail.tradeNo || '', action: true, hide: raiseDeatil.payStatus != 'paid' },
223
+      { head: '缴费单编号', body: orderDetail.tradeNo || '', action: true, hide: (raiseDeatil.payStatus != 'refunded' || raiseDeatil.payStatus != 'paid') },
224 224
       { head: '退费单编号', body: refundOrder.refundNo || '', action: true, hide: raiseDeatil.payStatus != 'refunded' },
225 225
     ]
226 226
 
@@ -245,7 +245,7 @@ export default class Raise extends Component {
245 245
               contactClick={() => this.handleChatClick(raiseDeatil.consultantInfo)}
246 246
             />}
247 247
             <View className="hr" />
248
-            {raiseDeatil.payStatus == 'paid' &&
248
+            {(raiseDeatil.payStatus == 'paid' || raiseDeatil.payStatus == 'refunded') &&
249 249
               <Block>
250 250
                 <CellBlock dataset={payInfo} />
251 251
                 <View className="hr" />