xujing 5 years ago
parent
commit
ecc1e8a14d

+ 4
- 2
src/pages/activity/detail/index.js View File

373
                   </View>
373
                   </View>
374
                   <View className="detail-con">
374
                   <View className="detail-con">
375
                     <View className="detail-con__title">活动详情</View>
375
                     <View className="detail-con__title">活动详情</View>
376
-                    <import src='../../../components/wxParse/wxParse.wxml' />
377
-                    <template is='wxParse' data='{{wxParseData:article.nodes}}' />
376
+                    {/* <View >{detail.desc}</View> */}
377
+                    <richText nodes={detail.desc} ></richText>
378
+                    {/* <import src='../../../components/wxParse/wxParse.wxml' />
379
+                    <template is='wxParse' data='{{wxParseData:article.nodes}}' /> */}
378
                   </View>
380
                   </View>
379
                   <View style="color:#999;font-size:15px;margin:0 auto 90px auto;text-align:center">已经到底了~</View>
381
                   <View style="color:#999;font-size:15px;margin:0 auto 90px auto;text-align:center">已经到底了~</View>
380
 
382
 

+ 2
- 2
src/pages/person/personDetail/editDetail/index.js View File

176
           <View className='edit edit-phone'>电话号码</View>
176
           <View className='edit edit-phone'>电话号码</View>
177
           <Input type='text' className='edit' value={user.tel ? user.tel : user.phone} data-id='phone' onInput={this.BindInfo.bind(this)} />
177
           <Input type='text' className='edit' value={user.tel ? user.tel : user.phone} data-id='phone' onInput={this.BindInfo.bind(this)} />
178
         </View>
178
         </View>
179
-        {
179
+        {/* {
180
           isAgent && (<View className='col_box'>
180
           isAgent && (<View className='col_box'>
181
             <View className='edit edit-phone'>经纪人类型</View>
181
             <View className='edit edit-phone'>经纪人类型</View>
182
             <Picker mode='selector' className='edit' className='selector' range={this.state.selector} onChange={this.onChange}>
182
             <Picker mode='selector' className='edit' className='selector' range={this.state.selector} onChange={this.onChange}>
190
           (isChannel && user.personType == 'estate agent') && (<View className='col_box'>
190
           (isChannel && user.personType == 'estate agent') && (<View className='col_box'>
191
             <Input type='text' placeholder='请输入渠道码' className='channelCode' data-id='channelCode' onInput={this.BindInfo.bind(this)} />
191
             <Input type='text' placeholder='请输入渠道码' className='channelCode' data-id='channelCode' onInput={this.BindInfo.bind(this)} />
192
           </View>)
192
           </View>)
193
-        }
193
+        } */}
194
         <View className='comfire' onClick={this.clickEditAgent}>保存</View>
194
         <View className='comfire' onClick={this.clickEditAgent}>保存</View>
195
       </View>
195
       </View>
196
     )
196
     )

+ 1
- 1
src/pages/person/personDetail/editDetail/index.scss View File

26
   .comfire{
26
   .comfire{
27
     width:680px;
27
     width:680px;
28
     height:90px;
28
     height:90px;
29
-    background:rgba(255,71,64,1);
29
+    background:$primary-color;
30
     border-radius:14px;
30
     border-radius:14px;
31
     margin: 0 auto;
31
     margin: 0 auto;
32
     text-align: center;
32
     text-align: center;