Merge branch 'dev-cme-1216' of...

Merge branch 'dev-cme-1216' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme into dev-cme-1216

* 'dev-cme-1216' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme:
  进详情页判断的弹框修改

src/views/merge-detail.vue

@@ -278,10 +278,10 @@ export default {
           console.log("跳登录");
           rocNative.gotoLogin();
         } else {
-          if (!_this.premissionFlag) {
-            _this.premissionFlag = true;
-            _this.permission(); // 提示是否有机构和在申请范围内
-          }
+          // if (!_this.premissionFlag) {
+          //   _this.premissionFlag = true;
+          //   _this.permission(); // 提示是否有机构和在申请范围内
+          // }
         }
       });
     },
@@ -290,7 +290,7 @@ export default {
       let _this = this;
       let param = {
         id: _this.projectId,
-        creditId: _this.project.creditId || 1,
+        creditId: _this.project.creditId,
         token: _this.userInfo.userToken || this.token,
         setEntry: true
       };
@@ -311,7 +311,7 @@ export default {
       let _this = this;
       let param = {
         id: _this.projectId,
-        creditId: _this.project.creditId || 1,
+        creditId: _this.project.creditId,
         token: _this.userInfo.userToken || this.token,
         setEntry: true
       };
@@ -414,6 +414,11 @@ export default {
           _this.projectComponentDTOS = _this.setListData(
             res.data.projectComponentDTOS
           );
+
+          if(!_this.isWeb && !_this.premissionFlag) {
+            _this.premissionFlag = true;
+            _this.permission(); // 提示是否有机构和在申请范围内
+          }
         }
         //_this.showLoading = false;
       });