Merge remote-tracking branch 'origin/pushParm' into testMerged

src/css/treatPlan.less

@@ -103,6 +103,11 @@
     float: left;
     margin: 10px;
 }
+.slideImg {
+    width: 16px;
+    float: right;
+    margin: 10px;
+}
 .commonTreat {
     line-height: 36px;
 }
@@ -127,3 +132,6 @@
     filter:alpha(opacity=30);
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=30);";
 }
+.treatPlanWrap {
+    margin: 0 0 10px 0;
+}

src/js/treatplan.js

@@ -6,8 +6,10 @@ require('../css/common.less');
 require('../css/treatPlan.less');
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin, isIe8 } = require('../js/promise.js');
-let generalImg = require('./../images/general.png')
-let drugImg = require('./../images/drug.png')
+let generalImg = require('./../images/general.png');
+let drugImg = require('./../images/drug.png');
+let slideUpImg = require('./../images/slide-up.png');
+let slideDownImg = require('./../images/slide-down.png');
 
 
 const is8Ie = isIe8() //判断是否为IE8
@@ -15,6 +17,8 @@ if(is8Ie) {
   let reg = /undefined/g
   generalImg = generalImg.replace(reg, '')
   drugImg = drugImg.replace(reg, '')
+  slideUpImg = slideUpImg.replace(reg, '')
+  slideDownImg = slideDownImg.replace(reg, '')
 }
 
 // var msg = {
@@ -55,8 +59,16 @@ post(config.pushInner,Object.assign({featureType: '8',ruleType:config.ruleTypeMa
 })
 
 function ybzlFun(data){//一般治疗
-  $(".conditionHintZhiliaoAp").prepend(`<div class="treatPlanWrap clearfix"><div class="treatPlan"><p class="treatPlanBg"></p><p class="treatPlanTitle"><img src=${generalImg} title="一般治疗" class="icon">一般治疗</p></div><div class="commonTreat clearfix">${data}</div></div>`)
+  $(".conditionHintZhiliaoAp").prepend(`<div class="treatPlanWrap clearfix"><div class="treatPlan"><p class="treatPlanBg"></p><p class="treatPlanTitle clearfix"><img src=${generalImg} title="一般治疗" class="icon"/><img src=${slideUpImg} title="收起" class="slideImg"/>一般治疗</p></div><div class="commonTreat clearfix">${data}</div></div>`)
   $(".diseaseName").html(' ( '+msg.diseaseName.uniqueName+' )')
+  $(document).on('click','.treatPlanTitle', function(){
+    if($('.slideImg').attr('src') === slideDownImg) {
+      $('.slideImg').attr('src', slideUpImg)
+    } else {
+      $('.slideImg').attr('src', slideDownImg)
+    }
+    $(".commonTreat").slideToggle(500);
+  })
 }
 function cyywFun(data){//常用药物
   for(let i = 0; i < data.length; i++) {