fix #5425

src/pages/activity/detail/assemble.js

@@ -507,7 +507,7 @@ export default class Detail extends Component {
     console.log('------posterData------', posterData)
     console.log('------posterConfigs------', posterConfigs)
 
-    console.log(isStarter, actState, groupState)
+    const isJoin = memberList.filter(x => x.personId === userInfo.person.personId)[0] || isStarter
 
     return (
       <Block>
@@ -631,8 +631,11 @@ export default class Detail extends Component {
                     !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
 
                     <View className="btn-box">
-                      <Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button>
-                      <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                      {
+                        (groupState === GroupInProcess && !isJoin) &&
+                        (<Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button>)
+                      }                      
+                      <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
                     </View>
 
                   }

src/pages/project/index.js

@@ -112,10 +112,17 @@ export default class Index extends Component {
         },
       })
     }).catch(err => {
-      Taro.showToast({
-        title: `定位城市错误...`,
-        icon: 'none',
-      })
+      if (err.errMsg === 'getLocation:fail auth deny') {
+        Taro.showModal({
+          content: '请同意授权您的定位功能',
+          showCancel: false,
+        })
+      } else {
+        Taro.showToast({
+          title: `定位城市错误...`,
+          icon: 'none',
+        })
+      }
       console.error(err)
       this.updateCity(cityList[0])
     })