Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

project.config.json

 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "dev环境",
-	"appid": "wxda1f84b79b3edeb3",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/pages/activity/index.js

   }
 
   onPullDownRefresh = async (rest) => {
+    // debugger
     if (this.refreshing) return
     this.refreshing = true
 

src/pages/checkin/index.js

       this.setState({
         data: res
       })
-      console.log('1111', res.enlist.attendNum)
+      
     })
+    // activityStatus
   }
 
   checkinActive () {
   }
 
   render () {
-
+    
     // const { data = { person: {}, dynamic: {} }, style } = this.props
     // console.log("data"  ,this.data)
     return (
           <View className="text1"> <Text>{this.state.data.dynamic.title}</Text></View>
         </View >
 
+        
+        
+
         {this.state.data.enlist.enlistId != null && <View>
           <View style="text-align: center;display:inline-block;width:100vw;">
             <View style="text-align: center;display:inline-block;" className="line">- - - - - - - - - - - - - -   </View>
           {/* {console.log(data.person.status)} */}
         </View>}
         {this.state.data.enlist.enlistId == null && <View className="unregistered">
+        {this.state.data.dynamic.activityStatus === 1 && <View style="text-align: center;color:#666666">
+          活动未开始
+        </View>
+          }
+          {this.state.data.dynamic.activityStatus === 2 && <View style="text-align: center;color:#666666">
+          活动已结束
+        </View>
+          }
+
+{this.state.data.dynamic.activityStatus === 0 && <View>
           <View>
             <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
           </View>
             <Text className="messageText" >您还未报名当前活动,请先前往活动报名页报名成功后再进行扫码签到~ </Text>
 
           </View>
-{console.log(this.state.data.dynamic.dynamicId)}
+
           <AtButton type='primary' className="toactivebutton" onClick={() => { this.toactivity(this.state.data.dynamic.dynamicId) }}>立即前往</AtButton>
-          {/* <Image src={require('@assets/checkin/checkin.png')}  style="position: absolute; width:110px;height:110px ;bottom:12vh;left:132.5px"  ></Image> */}
-        </View>}
+        </View>
+          }
+          
+        
+        </View>
+      }
       </View>
 
     );

src/pages/checkin/index.scss

       position: absolute;
       font-size: 36px;
       font-weight: 400;
-      color: rgba(187, 156, 121, 1);
+      color:#C8C8C8;
       line-height: 56px;
       width: 660px;
       text-align: center;

src/pages/project/index.js

       this.qqmapsdk.reverseGeocoder({
         location,
         success: (res) => {
+          debugger
           let city = res.result.address_component.city
+          
           let curCity = cityList.filter(item => {
             return item.name == city
           })
+          Taro.showToast({
+            title: `当前定位城市:${curCity[0].name}`,
+            icon: 'none',
+          })
           this.updateCity(curCity[0] || cityList[0])
         },
         fail: (error) => {
+          Taro.showToast({
+            title: `定位城市错误...`,
+            icon: 'none',
+          })
+          console.error(err)
           this.updateCity(cityList[0])
         },
       })
     }).catch(err => {
+      Taro.showToast({
+        title: `定位城市错误...`,
+        icon: 'none',
+      })
+      console.error(err)
       this.updateCity(cityList[0])
     })
   }

src/pages/project/list/filter/index.js

   }
 
   handleFilter() {
-    const { tabs, keywords, selectedIndex } = this.state
 
+    console.log("111")
+    const { tabs, keywords, selectedIndex } = this.state
+    console.log(this.state)
     let values = selectedIndex.map((selectedList, tabIndex) => {
       let curTab = tabs[tabIndex]
       let curTabList = curTab.list || []
       if (selectedList.length === 1 && selectedList[0] === 0) {
         return ''
       }
-
+    
       // 类型
       if (tabIndex === 0) {
         let val = selectedList.map(index => curTabList[index])
         return val.join(',')
       }
     })
-
+    console.log(values)
     let params = {
       name: keywords,
       houseType: values[0],
       area: values[2],
       buildingType: values[3],
     }
-
+    console.log(params)
     this.props.onFilter(params, () => {
       this.hideFilter()
     })