Merge branch 'develop' of gitlab.icaremgt.com:tanxinyu/h5_activity into develop

showPhotos/js/page/common.js

@@ -9,6 +9,18 @@ function setToken(){
   }
 }
 
+// 机构id
+function orgIdFn(id) {
+    var signupOrg = rules.acActivityOrgs
+    var org = signupOrg && signupOrg.filter(function(item){
+        return id == item.id
+    })
+    if(org.length == 1) {
+        return org[0]
+    }else {
+        return null
+    }
+}
 // 获取token
 function getToken() {
   var t = sessionStorage.getItem('x-token');

showPhotos/js/page/signup.js

@@ -208,9 +208,11 @@ function btnBindClick() {
 
 // 获取机构名称
 function getOrgNameFn() {
+    var signupId = getQueryString('id')
+    var orgId = orgIdFn(signupId).orgId
     $.ajax({
         type: 'GET',
-        url: baseUrl + '/ORG/hospital/community/hospitalInfo/' + getQueryString('orgId'),
+        url: baseUrl + '/ORG/hospital/community/hospitalInfo/' + orgId,
         success: function(data) {
             if(data.code == 200) {
                 $('#act11739232574395').val(data.records.orgName)

showPhotos/js/page/user.js

@@ -159,7 +159,7 @@ function userTabInfo() {
                 var innerInfo = $('#act3932189955 .user-info .inner-info')
                 innerInfo.find('.userName span').text(userInfoObj.name)
                 innerInfo.find('.userNo span').text(userInfoObj.userNumber)
-                innerInfo.find('.userRank span').text(userInfoObj.userRank)   // 排名
+                innerInfo.find('.userRank span').text(userInfoObj.ranking)   // 排名
                 innerInfo.find('.userVoteNum span').text(userInfoObj.voteNum)
                 $('#act3932189955 .userState').val(userInfoObj.declaration)
                 $('#act3932189955 .userState').attr('readOnly','readOnly')

showPhotos/signup.html

@@ -55,4 +55,6 @@
 </body>
 <script type="text/javascript" src="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/page/common.js"></script>
 <script type="text/javascript" src="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/page/signup.js"></script>
+<!-- <script type="text/javascript" src="js/page/common.js"></script>
+<script type="text/javascript" src="js/page/signup.js"></script> -->
 </html>

showPhotos/user.html

@@ -41,4 +41,5 @@
 </body>
 <script type="text/javascript" src="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/page/common.js"></script>
 <script type="text/javascript" src="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/page/user.js"></script>
+<!-- <script type="text/javascript" src="js/page/user.js"></script> -->
 </html>