Merge remote-tracking branch 'origin/testMerged'

src/js/indexHorizontalDom.js

@@ -189,7 +189,10 @@ function renderTreatText(className,title,data, parentNode) {
     }
     $(".infomationBox .treatTextBox").on('click',".more",function(){
         openNewWin(`treatplan.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
-      })
+    })
+    $('.' + className + 'box' + ' img').bind('contextmenu', function(){
+        return false
+    })
     
 }
 function renderTreatDrug(className,title,data, parentNode) {
@@ -283,7 +286,7 @@ function renderTipsInfo(icon, className,title,data) {
         </div>`
     } else {
         str = `<div class="informationBox tipsInfoWrapper ${className} clearfix">
-                    <div class="tipsInfoBox clearfix ${className + 'box'}">
+                    <div class="tipsInfoBox clearfix ${className + 'box'} disCopy">
                     </div>
                 </div>`
     }
@@ -292,6 +295,9 @@ function renderTipsInfo(icon, className,title,data) {
     for(let i = 0; i < data.length; i++) {
         renderTipsInfoText('','诊断依据',data[i],className + 'box')
     }
+    $('.' + className + 'box' + ' img').bind('contextmenu', function(){
+        return false
+    })
     // if(data.name) {
     //     renderTipsInfoText('','诊断依据',data.details,className + 'box')
     // }

src/js/indexVertDom.js

@@ -119,6 +119,9 @@ function renderTipsInfo(className,title, data) {
         // renderTipsInfoMsg('tipsInfo', data.name, data.details, className+'box')
         $('.' + className+'box').append('<p class="TipsInfoNull">暂无数据</p>')
     }
+    $('.' + className + 'box' + ' img').bind('contextmenu', function(){
+        return false
+    })
 }
 
 function renderKnowledgeInfo(className,title, data) {
@@ -147,7 +150,7 @@ function renderScaleInfo(className,title, data) {
 
 function renderTipsInfoMsg(className,item,data, parentNode) {
     const childrenNodeBoxStr = `
-        <div class = "treatItemBox ${className + 'box'}">
+        <div class = "treatItemBox ${className + 'box'} disCopy">
             <p class="treatItemTitle">${item.name} <span class="moreInfo" data-name="${item.name}" data-type="${item.type}"}>详情</span></p>
             <p class="${className + 'Info'} clearfix"></p>
         </div>
@@ -198,6 +201,9 @@ function renderTreatText(className,title,data, parentNode) {
     $(".treatItemBox").on('click',".slideDown",function(){
         openNewWin(`treatplan.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
     })
+    $('.' + className + 'Info' + ' img').bind('contextmenu', function(){
+        return false
+    })
 }
 function renderTreatDrug(className,title,data, parentNode) {
     const childrenNodeBoxStr = `

src/js/information.js

@@ -60,6 +60,9 @@ function getInfomation() {
     }
     addLinkClickEvent();
     adjustHeight();
+    $('.content img').bind('contextmenu', function(){
+      return false
+    })
     function addScrollEvent() {
       var scrollTop = $('.infos').scrollTop()
       var divHeight = 0;

src/js/scale.js

@@ -24,10 +24,9 @@ $(function () {
             $('.content').append(scaleInfo[i].content)
           }
         }
-
-        
-
-        
+        $('.content img').bind('contextmenu', function(){
+          return false
+        })
       }
     })
   }