merge

components/fileList/fileList.axml

@@ -12,7 +12,8 @@
       <view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
     </view>
   </view>
-  <view class="btns-pop" a:if="{{fileView.id == logId && (organizer === currentPeople ? true : currentPeople === fileView.creatorId)}}">
+  <!-- && (organizer === currentPeople ? true : currentPeople === fileView.creatorId) -->
+  <view class="btns-pop" a:if="{{fileView.id == logId}}">
     <view class="edit" catchTap="updateFile" data-fileView="{{fileView}}">
           编辑
     </view>

components/relatedApp/relatedApp.js

@@ -26,7 +26,11 @@ create.Component({
   didUnmount() {},
   methods: {
     getData() {
-      getThirdUserPlatForm().then(res => {
+      let data = {
+        platForm: "",
+        ddUserId: getApp().globalData.userid
+      };
+      getThirdUserPlatForm(data).then(res => {
         let relatedAppPlatformList = [];
         res.data.data.forEach(item => {
           relatedAppPlatformList.push(item.platform);

pages/appDetails/appDetails.js

@@ -47,12 +47,28 @@ create.Page({
         clearInterval(interval);
       }
       requestNum++;
-      getThirdUserPlatForm().then(res => {
-        let relatedAppPlatformList = [];
-        res.data.data.forEach(item => {
-          if (item.platform === this.data.platform) {
+      let data = {
+        platForm: this.data.platform,
+        ddUserId: getApp().globalData.userid
+      };
+      getThirdUserPlatForm(data).then(res => {
+        console.log(JSON.stringify(res));
+        console.log(res.data.msg === "当前账号已被其他账号绑定！");
+        if (res.data.msg === "当前账号已被其他账号绑定！") {
+          this.setData({
+            isBind: false,
+            bindStatus: "binded"
+          });
+          setTimeout(() => {
+            that.setData({
+              isLoading: false
+            });
+          }, 10000);
+          clearInterval(interval);
+        } else if (res.data.data) {
+          if (res.data.data.platform === this.data.platform) {
             this.setData({
-              name: item.userName,
+              name: res.data.data.userName,
               isBind: true,
               bindStatus: "success"
             });
@@ -65,7 +81,7 @@ create.Page({
             this.$store.data.relatedAppNeedUpdate = true;
             this.update();
           }
-        });
+        }
       });
     }, 1000);
   },