zhangxc hace 4 años
padre
commit
0b5484f9cd

+ 20 - 3
src/css/cdssHorizontal.less

@@ -50,7 +50,7 @@
     width: 10px;
     position: absolute;
     font-size: 12px;
-    left: 10px;
+    left: 7px;
 }
 .tabList{
     position: absolute;
@@ -124,7 +124,7 @@
     box-sizing: border-box;
     position: absolute;
     left: 0;
-    margin-top: -2px;
+    margin-top: -1px;
 }
 .titleIcon{
     width: 20px;
@@ -148,6 +148,9 @@
 .diag .moduleTitle{
     color: #FF656B;
 }
+.medicine .moduleTitle,.operation .moduleTitle{
+    color: #1E1E1E;
+}
 .warning .moduleTitle{
     color: #fff;
     background: #FF7836;
@@ -193,6 +196,8 @@
     float: right;
     line-height: 27px;
     color: #3B9ED0;
+    position: relative;
+    right: 5px;
 }
 .showMoreNewPage{
     display: inline-block;
@@ -267,9 +272,21 @@
     width: 12px;
     position: absolute;
     left: 25px;
-    bottom: 13px;
+    bottom: 8px;
     display: none;
 }
 .new-icon .versionIcon{
     display: inline-block;
+}
+.iconArrowImg{
+    width: 10px;
+}
+.showLess .iconArrowImg{
+    position: relative;
+    top: -5px;
+}
+.medicine .titleIcon, .operation .titleIcon{
+    width: 13px;
+    position: relative;
+    top: 2px;
 }

BIN
src/images/collapse2.png


BIN
src/images/show2.png


BIN
src/images/treat_icon.png


+ 2 - 2
src/js/cdssHorizontal.js

@@ -20,8 +20,8 @@ let infoImg = require('./../images/icon_info.png').replace(/^undefined/g, '')
 let infoImgOn = require('./../images/icon_info_on.png').replace(/^undefined/g, '')
 let iconArrowUp = require('./../images/icon_arrow_up.png').replace(/^undefined/g, '')
 let iconArrowDown = require('./../images/icon_arrow_down.png').replace(/^undefined/g, '')
-let showImg = require('./../images/show.png').replace(/^undefined/g, '')
-let collapseImg = require('./../images/collapse.png').replace(/^undefined/g, '')
+let showImg = require('./../images/show2.png').replace(/^undefined/g, '')
+let collapseImg = require('./../images/collapse2.png').replace(/^undefined/g, '')
 
 
 

+ 4 - 2
src/js/promise.js

@@ -13,6 +13,8 @@ let iconDiagPush = require('./../images/icon_diag_push.png').replace(/^undefined
 let iconCommonTreatPush = require('./../images/icon_drug_push.png').replace(/^undefined/g, '')
 let iconCheckupPush = require('./../images/icon_checkup_push.png').replace(/^undefined/g, '')
 let iconTreat = require('./../images/zhiliao.png').replace(/^undefined/g, '')
+let iconTreatMedicine = require('./../images/treat_icon.png').replace(/^undefined/g, '')
+
 //重写assign方法imgR
 if (typeof Object.assign != 'function') {
   Object.assign = function (target) {
@@ -247,12 +249,12 @@ const titleConfigH = {
   },
   drugPush:{
     background: "#E3FEFE",
-    icon: iconDrugPush,
+    icon: iconTreatMedicine,
     name:"推荐用药"
   },
   operationPush:{
     background: "#E3FEFE",
-    icon: iconOperationPush,
+    icon: iconTreatMedicine,
     name:"手术/操作"
   },
   vigilancePush:{