Merge branch 'test' into icssDataServiceEdit

src/css/index.less

@@ -468,4 +468,8 @@
   .treatMedicineNullText, .treatPlanNullText {
     font-size: 20px;
   }
+ 
+}
+.treatPlanNullWrap .treatPlanNullText {
+  margin-top: 30px;
 }

src/html/treatplan.html

@@ -22,8 +22,7 @@
                     <div class="treatPlanNullWrap">
                             <p class="treatPlan">一般治疗</p>
                             <p class="treatPlanNullText">暂无推荐</p>
-                            <div class="drugWarp"></div>
-                        </div>
+                    </div>
                     <div class="treatMedicineWarp">
                         <p class="treatDrug">推荐药物</p>
                         <p class="treatMedicineNullText">暂无推荐</p>

src/js/landscapeDom.js

@@ -36,8 +36,8 @@ function bqtsFun(data){//病情提示
   })
 }
 function ybzlFun(data){//一般治疗
-  $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap"><p class="treatPlan">一般治疗: </p><p class="commonTreat clearfix">'+data+'</p></div>')
-  $(".diseaseName").html(msg.diag)
+  console.log('data', data)
+  $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap"><p class="treatPlan">一般治疗: </p><div class="commonTreat clearfix">'+ data+'</div></div>')
   var commonTreatHeight = $(".commonTreat").height()
   if(commonTreatHeight > 75){
     $(".commonTreat").addClass('medicinePartLimitHeightSpec').append('<span class="slideDown">更多 </span>')

src/js/landscapeMedical.js

@@ -94,6 +94,7 @@ $(".disclaimer").on("click",function() {
 post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
   var data = res.data
   if(data.code == 0){
+    $(".diseaseName").html(msg.diag)
     var result = data.data;
     var num = 0;
     if(result.commonTreatment && result.commonTreatment.content){

src/landscape.js

@@ -94,6 +94,7 @@ $(".disclaimer").on("click",function() {
 post(config.pushTreatment,Object.assign({featureType: '8'},msg)).then((res)=>{
   var data = res.data
   if(data.code == 0){
+    $(".diseaseName").html(msg.diag)
     var result = data.data;
     var num = 0;
     if(result.commonTreatment && result.commonTreatment.content){