'关注弹出框'

showPhotos/js/page/common.js

@@ -104,20 +104,46 @@ function loadHtmlJson() {
   }
 }
 
+// 获取机构名称
+function getOrgNameFn(callback) {
+  var signupId = getQueryString('bindId')
+  var orgId = orgIdFn(signupId).orgId
+  $.ajax({
+      type: 'GET',
+      url: baseUrl + '/ORG/hospital/community/hospitalInfo/' + orgId,
+      headers: {
+          'x-token': getToken()
+      },
+      success: function(data) {
+          if(data.code == 200) {
+            callback && callback(data)
+          }
+      },
+      error: function() {
+          $.dialog({
+              type : 'tips',
+              autoClose : 3000,
+              infoText : '找不到此机构'
+          });
+      }
+  })
+}
+
 // 关注弹出框
 function appendAttentionDialog() {
-var bindId = getQueryString("bindId");
-var orgQrCode = '';
-// var orgInfo = orgIdFn(orgId);
-// var orgName = orgInfo !== null ? orgInfo.orgName : '';
-for(var k = 0; k < rules.acActivityOrgs.length; k++){
+  var bindId = getQueryString("bindId");
+  var orgQrCode = '';
+  var orgId = '';
+
+  for(var k = 0; k < rules.acActivityOrgs.length; k++){
     if(rules.acActivityOrgs[k].id == bindId){
-    orgQrCode = rules.acActivityOrgs[k].qrCodeUrl
+      orgId = rules.acActivityOrgs[k].orgId;
+      orgQrCode = rules.acActivityOrgs[k].qrCodeUrl;
       break;
     }
-}
+  }
 
-var str = '<section id="html-container-attention" style="display: none;">'+
+  var str = '<section id="html-container-attention" style="display: none;">'+
               '<div>'+
                 '<div class="c-modal-wrap">'+
                   '<div class="mshe-mask"></div> '+
@@ -128,7 +154,7 @@ var str = '<section id="html-container-attention" style="display: none;">'+
                         '<img src="'+ orgQrCode +'" class="header-pic">'+
                       '</div>'+ 
                       '<div class="modal-body">'+
-                      '<p class="struct">长按关注'+ orgName +'后继续活动</p>'+
+                        '<p class="struct">长按关注后继续活动</p>'+
                         '<div>'+
                           '<img src="http://qnfile.icareyou.net/55c7553ba1a44465be91c57d19a69d3e1562894997132.jpg" alt="" style="width: 100%;">'+
                         '</div>'+
@@ -149,6 +175,12 @@ var str = '<section id="html-container-attention" style="display: none;">'+
     $("#html-container-attention").fadeOut();
   });
 
+  // 获取机构名称
+  getOrgNameFn(function(data){
+    var orgName = '长按关注'+  data.records.orgName +'后继续活动';
+    $('#html-container-attention .modal-body .struct').text(orgName);
+  });
+
   // 未关注过默认显示弹出框  
   if (!user.attention){
     $("#html-container-attention").fadeIn();

showPhotos/js/page/signup.js

@@ -9,7 +9,9 @@ $(function () {
     removeAttr();
     btnBindClick();// 绑定点击事件
     $('#act11739232574395').attr({ 'readonly': 'readonly' });
-    getOrgNameFn();
+    getOrgNameFn(function(data){
+        $('#act11739232574395').val(data.records.orgName)
+    });
     voteDialogBindFn();
 })
 
@@ -159,31 +161,6 @@ function btnBindClick() {
     });
 }
 
-// 获取机构名称
-function getOrgNameFn() {
-    var signupId = getQueryString('bindId')
-    var orgId = orgIdFn(signupId).orgId
-    $.ajax({
-        type: 'GET',
-        url: baseUrl + '/ORG/hospital/community/hospitalInfo/' + orgId,
-        headers: {
-            'x-token': getToken()
-        },
-        success: function(data) {
-            if(data.code == 200) {
-                $('#act11739232574395').val(data.records.orgName)
-            }
-        },
-        error: function() {
-            $.dialog({
-                type : 'tips',
-                autoClose : 3000,
-                infoText : '找不到此机构'
-            });
-        }
-    })
-}
-
 function selectFileImage(fileObj) {
     var file = fileObj.files['0'];
     //图片方向角 added by lzk