Merge branch 'feature/jq' into 'release-new'

状态修改样式

See merge request !145

package-lock.json

@@ -2840,6 +2840,25 @@
             "slash": "^2.0.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "http://192.168.110.93:4873/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "http://192.168.110.93:4873/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
@@ -2858,6 +2877,41 @@
           "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
           "dev": true
         },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.7.0",
+          "resolved": "http://192.168.110.93:4873/vue-loader/-/vue-loader-16.7.0.tgz",
+          "integrity": "sha1-7hYbL2wnsLRZJkw8I9NAaLRx1XQ=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "4.1.2",
+              "resolved": "http://192.168.110.93:4873/chalk/-/chalk-4.1.2.tgz",
+              "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "http://192.168.110.93:4873/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
         "webpack-bundle-analyzer": {
           "version": "3.9.0",
           "resolved": "http://192.168.110.93:4873/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
@@ -20340,32 +20394,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.5.0",
-      "resolved": "http://192.168.110.93:4873/vue-loader/-/vue-loader-16.5.0.tgz",
-      "integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "http://192.168.110.93:4873/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.5.2",
       "resolved": "http://192.168.110.93:4873/vue-router/-/vue-router-3.5.2.tgz",

src/components/common/inquirylist.vue

@@ -94,7 +94,13 @@
           </div>
         </div>
         <div class="inquiry-user-status">
-          <span class="status-cll-user-answer">{{ doctorCallStatus }}</span>
+          <span
+            :class="
+              doctorCallStatus === '已拨打完成'
+                ? 'status-cll-user-finish'
+                : 'status-cll-user-answer'
+            "
+          >{{ doctorCallStatus }}</span>
         </div>
         <div
           class="line-btn"
@@ -170,7 +176,13 @@
           </div>
         </div>
         <div class="inquiry-user-status">
-          <span class="status-cll-user-answer">{{ userCallStatus }}</span>
+          <span
+            :class="
+              userCallStatus === '已拨打完成'
+                ? 'status-cll-user-finish'
+                : 'status-cll-user-answer'
+            "
+          >{{ userCallStatus }}</span>
         </div>
         <div
           class="line-btn"
@@ -632,11 +644,11 @@
         }
       }
     }
-    .inquiry-user-status{
+    .inquiry-user-status {
       width: calc(100% - 130px);
       padding-bottom: 15px;
       height: 38px;
-      .status-cll-user-answer{
+      .status-cll-user-answer {
         background: rgba(255, 94, 87, 0.07);
         border-radius: 10px;
         border: 1px solid rgba(255, 94, 87, 0.15);
@@ -645,7 +657,20 @@
         font-size: 14px;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-        color: #FF5E57;
+        color: #ff5e57;
+        line-height: 20px;
+        margin-right: 6px;
+      }
+      .status-cll-user-finish {
+        background: rgba(0, 189, 165, 0.07);
+        border-radius: 10px;
+        border: 1px solid rgba(0, 189, 165, 0.17);
+        padding: 0 4px;
+        height: 20px;
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #0d9078;
         line-height: 20px;
         margin-right: 6px;
       }
@@ -723,7 +748,7 @@
     width: 12px;
     height: 12px;
     display: inline-block;
-    background: url('../../assets/image/workbench/appointment.png') no-repeat;
+    background: url("../../assets/image/workbench/appointment.png") no-repeat;
     background-size: cover;
     margin-right: 5px;
   }
@@ -731,21 +756,21 @@
     width: 12px;
     height: 12px;
     display: inline-block;
-    background: url('../../assets/image/workbench/video.png') no-repeat;
+    background: url("../../assets/image/workbench/video.png") no-repeat;
     background-size: cover;
   }
   .photo {
     width: 12px;
     height: 12px;
     display: inline-block;
-    background: url('../../assets/image/workbench/photo.png') no-repeat;
+    background: url("../../assets/image/workbench/photo.png") no-repeat;
     background-size: cover;
   }
   .voice {
     width: 12px;
     height: 12px;
     display: inline-block;
-    background: url('../../assets/image/workbench/voice.png') no-repeat;
+    background: url("../../assets/image/workbench/voice.png") no-repeat;
     background-size: cover;
   }
 }