Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev

pages/appDetails/appDetails.axml

@@ -30,7 +30,7 @@
         </view>
     </view>
     <view class="{{isBind ? 'unBinding': 'binding'}} bindBtn {{isLoading ? 'loadingBtn' : ''}}">
-        <text onTap="{{isBind ? 'unbind' : 'bindApp'}}">{{isBind ? '解绑' : '绑定'}}</text>
+        <text onTap="{{isBind ? 'showPopup' : 'bindApp'}}">{{isBind ? '解绑' : '绑定'}}</text>
     </view>
 </view>
 <view class="loadingToast" a:if="{{isLoading}}">

pages/appDetails/appDetails.js

@@ -21,7 +21,6 @@ create.Page({
     selectPopupList: [{ text: "取消关联" }]
   },
   onLoad(e) {
-    console.log(e);
     this.setData({
       platform: e.platform,
       name: e.userName,
@@ -92,7 +91,8 @@ create.Page({
       if (res.data.data) {
         this.setData({
           name: "",
-          isBind: false
+          isBind: false,
+          showSelectPopup: false
         });
         this.$store.data.relatedAppNeedUpdate = "1";
         this.update();