zls

src/pages/person/index.js

@@ -191,8 +191,12 @@ export default class Person extends Component {
           </View>
           <View className='qiandao-con'>
             <Text className='qiandao-text'>签到得积分，积分兑好礼，马上去签到吧！</Text>
-            <View className={user.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View>
-
+            {/* <View className={user.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View> */}
+            {
+                user.havaSigned ?
+                  ( <View className='reday-qiandao-btn' onClick={this.doSign}> 已签到</View> ):
+                  (<View className="qiandao__btn" onClick={this.doSign}>签到</View>)
+              }
             {/* <Text className='integral-cont_btn' onClick={this.goShop}>去兑换</Text> */}
 
           </View>

src/pages/project/index.js

@@ -101,9 +101,14 @@ export default class Index extends Component {
       const payload = { location: `${location.longitude},${location.latitude}` }
 
       getLocationCity(payload).then(res => {
-        const curCity = res
-        this.updateCity(curCity)
-      }).catch(err=>{
+
+        let curCity = cityList.filter(item => {
+          return item.name == res.name
+        })
+
+        console.log('-----curCity-->', curCity)
+        this.updateCity(curCity[0] || defaultCity)
+      }).catch(err => {
         Taro.showToast({
           title: `定位错误: ${err.message}`,
           icon: 'none',
@@ -162,7 +167,7 @@ export default class Index extends Component {
   }
   loadBannerList () {
     const { curCity } = this.props
-    console.log(this.props,'this.props')
+    console.log(this.props, 'this.props')
     // 获取首页banner
     const payload = {
       showPosition: 'index'