Bläddra i källkod

一键授权后仍在原页面,项目名超出显示省略号

许静 5 år sedan
förälder
incheckning
e02848767c

+ 14
- 7
src/components/authorize/index.js Visa fil

@@ -11,7 +11,7 @@ export default class Index extends Component {
11 11
     navigationBarTitleText: '我的'
12 12
   }
13 13
   state = {
14
-    user:{}
14
+    user: {}
15 15
   }
16 16
   componentWillMount() {
17 17
     this.loadUserInfo()
@@ -25,11 +25,18 @@ export default class Index extends Component {
25 25
           icon: 'none'
26 26
         })
27 27
         return
28
-      }else{
28
+      } else {
29 29
         this.props.dispatchUpdateUserInfoNew(this.state.user.id)
30
-        Taro.reLaunch({
30
+        if (this.props.from) {
31
+          Taro.reLaunch({
32
+            url: this.props.from
33
+          })
34
+        } else {
35
+          Taro.reLaunch({
31 36
             url: '/pages/person/index'
32
-         })
37
+          })
38
+        }
39
+
33 40
       }
34 41
     })
35 42
   }
@@ -49,12 +56,12 @@ export default class Index extends Component {
49 56
   }
50 57
 
51 58
   render() {
52
-    const {user}=this.state
59
+    const { user } = this.state
53 60
     return (
54 61
       <View className='auth-page'>
55
-        <Image className="avatar_img" src={user.avatar}/>
62
+        <Image className="avatar_img" src={user.avatar} />
56 63
         <View className="user_name">{user.nickname}</View>
57
-        <Button  className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
64
+        <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
58 65
         <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View>
59 66
       </View>
60 67
     )

+ 1
- 1
src/pages/activity/activity.js Visa fil

@@ -52,7 +52,7 @@ export default class active extends Component {
52 52
   }
53 53
 
54 54
   renderLogin() {
55
-    return <Authorize></Authorize>
55
+    return <Authorize from="/pages/activity/activity"></Authorize>
56 56
   }
57 57
 
58 58
   render() {

+ 1
- 1
src/pages/agent/recommend/index.js Visa fil

@@ -417,7 +417,7 @@ export default class Index extends Component {
417 417
     })
418 418
   }
419 419
   renderLogin () {
420
-    return <Authorize></Authorize>
420
+    return <Authorize from="/pages/agent/recommend/index"></Authorize>
421 421
   }
422 422
 
423 423
   renderDetail() {

+ 1
- 1
src/pages/person/index.js Visa fil

@@ -160,7 +160,7 @@ export default class Person extends Component {
160 160
   }
161 161
 
162 162
   renderLogin () {
163
-    return <Authorize></Authorize>
163
+    return <Authorize from="/pages/person/index"></Authorize>
164 164
   }
165 165
 
166 166
   renderDetail () {

+ 2
- 0
src/pages/project/detail/index.scss Visa fil

@@ -399,6 +399,8 @@
399 399
       .bold {
400 400
         font-size: 40px;
401 401
         font-weight: bold;
402
+        max-width: 560px;
403
+        white-space: normal;
402 404
       }
403 405
 
404 406
       .favor-btn {

+ 2
- 31
src/pages/project/index.js Visa fil

@@ -102,7 +102,7 @@ export default class Index extends Component {
102 102
       const payload = { location: `${location.longitude},${location.latitude}` }
103 103
 
104 104
       getLocationCity(payload).then(res => {
105
-        console.log(res, "!!!!!!!!!!!!!!!!!11res=========")
105
+      
106 106
         let curCity = cityList.filter(item => {
107 107
           return item.name == res.name || ''
108 108
         })
@@ -134,36 +134,7 @@ export default class Index extends Component {
134 134
     })
135 135
   }
136 136
   updateCity (payload) {
137
-    const NanJing = {
138
-      citycode: "025",
139
-      id: 320100,
140
-      initial: "N",
141
-      lat: "32.041544",
142
-      leveltype: 2,
143
-      lng: "118.767413",
144
-      name: "南京市",
145
-      parentid: 320000,
146
-      pinyin: "Nanjing",
147
-      shortname: "南京",
148
-      status: 1,
149
-      zipcode: "320100"
150
-    }
151
-
152
-    const appId = accountInfo.miniProgram.appId;
153
-    let params;
154
-
155
-    switch (appId) {
156
-      // 知与行联调
157
-      case 'wxd9ee3a9480a4e544':
158
-        params = NanJing;
159
-        break;
160
-
161
-      default:
162
-        params = payload;
163
-        break;
164
-    }
165
-
166
-    this.props.dispatchCitySelected(params).then(res => {
137
+    this.props.dispatchCitySelected(payload).then(res => {
167 138
       this.loadData()
168 139
     })
169 140
   }

+ 2
- 0
src/pages/project/item/index.scss Visa fil

@@ -51,6 +51,8 @@
51 51
       &__title {
52 52
         font-size: 32px;
53 53
         font-weight: bold;
54
+        max-width: 500px;
55
+        @include text-ellipsis;
54 56
       }
55 57
 
56 58
       &__price {

+ 1
- 1
src/pages/shop/index.js Visa fil

@@ -197,7 +197,7 @@ export default class Shop extends Component {
197 197
   }
198 198
 
199 199
   renderLogin () {
200
-    return <Authorize></Authorize>
200
+    return <Authorize from="/pages/shop/index"></Authorize>
201 201
   }
202 202
   handleBannerClick = (item) => {
203 203
     console.log(this, "this")