xujing 5 년 전
부모
커밋
7f61d7ae2a
5개의 변경된 파일10개의 추가작업 그리고 7개의 파일을 삭제
  1. 1
    1
      project.config.json
  2. 4
    2
      src/components/achieveAvatar/index.js
  3. 1
    1
      src/pages/activity/detail/index.js
  4. 2
    2
      src/pages/project/detail/index.js
  5. 2
    1
      src/pages/project/floor/index.js

+ 1
- 1
project.config.json 파일 보기

@@ -2,7 +2,7 @@
2 2
 	"miniprogramRoot": "dist/",
3 3
 	"projectname": "mini-chengjiao",
4 4
 	"description": "知与行联调",
5
-	"appid": "wxda1f84b79b3edeb3",
5
+	"appid": "wxd9ee3a9480a4e544",
6 6
 	"setting": {
7 7
 		"urlCheck": false,
8 8
 		"es6": false,

+ 4
- 2
src/components/achieveAvatar/index.js 파일 보기

@@ -16,6 +16,7 @@ export default class Index extends Component {
16 16
     }
17 17
   }
18 18
   getUserInfo() {
19
+    Taro.showLoading({ mask: true, title: '授权中...' });
19 20
     const { dispatchUpdateUserInfo } = this.props
20 21
     const sessionKey = Taro.getStorageSync('sessionKey')
21 22
     Taro.getUserInfo({
@@ -35,11 +36,12 @@ export default class Index extends Component {
35 36
         dispatchUpdateUserInfo(payload).then(res => {
36 37
           console.log('更新信息')
37 38
           this.props.onSuccess();
39
+          Taro.hideLoading()
38 40
         })
39 41
       },
40 42
       fail: (err) => {
41 43
         console.error(err)
42
-
44
+        Taro.hideLoading()
43 45
         Taro.showToast({
44 46
           title: '获取用户信息失败',
45 47
           icon: 'none'
@@ -56,7 +58,7 @@ export default class Index extends Component {
56 58
           <View className="content">
57 59
             <View className="title">请允许获取昵称、头像、地区及性别</View>
58 60
             <View className="touxiang"><open-data type="userAvatarUrl"></open-data></View>
59
-              <View className="name"><open-data type="userNickName"></open-data></View>
61
+            <View className="name"><open-data type="userNickName"></open-data></View>
60 62
             <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
61 63
           </View>
62 64
         </View>

+ 1
- 1
src/pages/activity/detail/index.js 파일 보기

@@ -491,7 +491,7 @@ export default class Detail extends Component {
491 491
                   <View className="detail-top">
492 492
                     <View className="detail-top__row">
493 493
                       <Text className="row-label">活动时间:</Text>
494
-                      <Text className="row-content">{dayjs(detail.startDate).format('YYYY-MM-DD HH:mm:ss')}-{dayjs(detail.endDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
494
+                      <Text className="row-content">{dayjs(detail.startDate).format('YYYY-MM-DD HH:mm:ss')}{dayjs(detail.endDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
495 495
                     </View>
496 496
                     <View className="detail-top__row">
497 497
                       <Text className="row-label">活动地址:</Text>

+ 2
- 2
src/pages/project/detail/index.js 파일 보기

@@ -712,7 +712,7 @@ export default class Index extends Component {
712 712
     })
713 713
   }
714 714
 
715
- 
715
+
716 716
   // 调起授权电话
717 717
   toggleGrantPhone = () => {
718 718
     const { userInfo: { person: { phone, tel } } } = this.props
@@ -1367,7 +1367,7 @@ export default class Index extends Component {
1367 1367
                       <View className='row project__time'>
1368 1368
                         <Text className="label">开盘时间:</Text>
1369 1369
                         {/* <Text>{openDate}</Text> */}
1370
-                        <Text>{projectDetail.openingDate}</Text>
1370
+                        <Text>{projectDetail.openingDate || '待定'}</Text>
1371 1371
                       </View>
1372 1372
                       <View className='row project__time'>
1373 1373
                         <Text className="label">物业:</Text>

+ 2
- 1
src/pages/project/floor/index.js 파일 보기

@@ -56,7 +56,8 @@ export default class Index extends Component {
56 56
           </View>
57 57
           <View className='item'>
58 58
             <Text className='txt left-txt'>开盘日期</Text>
59
-            <Text className='txt right-txt'>{projectDetail.openingDate ? dayjs(projectDetail.openingDate).format('YYYY-MM-DD HH:mm:ss') : '待定'}</Text>
59
+            {/* <Text className='txt right-txt'>{projectDetail.openingDate ? dayjs(projectDetail.openingDate).format('YYYY-MM-DD HH:mm:ss') : '待定'}</Text> */}
60
+            <Text className='txt right-txt'>{projectDetail.openingDate || '待定'}</Text>
60 61
           </View>
61 62
           <View className='item'>
62 63
             <Text className='txt left-txt'>楼盘地址</Text>