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

状态添加

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!141

.env.development.local

+NODE_ENV=development
+VUE_APP_ENV=development
+
+VUE_APP_SERVICE_URL=
+
+# 模拟用户信息
+VUE_APP_MOCK_USER_INFO=
+
+VUE_APP_ENCRYPT=
+
+VUE_APP_CONSOLE=
+
+# 本地开发环境
+VUE_APP_IS_LOCAL=true
+
+# appid
+VUE_APP_APPID=wxf4e66242d31c81c2
+
+#本地token
+VUE_APP_TOKEN=080D305CDE1648C8A23B59AECE68C7A7

.gitignore

@@ -3,8 +3,8 @@ node_modules
 /dist
 .history/
 # local env files
-.env.local
-.env.*.local
+#.env.local
+#.env.*.local
 update_*.sh
 package-lock.json
 

src/components/common/inquirylist.vue

@@ -93,6 +93,9 @@
             >
           </div>
         </div>
+        <div class="inquiry-user-status">
+          <span class="status-cll-user-answer">{{ doctorCallStatus }}</span>
+        </div>
         <div
           class="line-btn"
           @click="openChat"
@@ -166,7 +169,9 @@
             >
           </div>
         </div>
-
+        <div class="inquiry-user-status">
+          <span class="status-cll-user-answer">{{ userCallStatus }}</span>
+        </div>
         <div
           class="line-btn"
           @click="openAdvice"
@@ -216,6 +221,34 @@
         showChat: (state) => state.showChat,
         showAdvice: (state) => state.showAdvice,
       }),
+      doctorCallStatus() {
+        switch (this.item.doctorCallStatus) {
+        case 1:
+          return '未拨打';
+        case 2:
+          return '已拨打未接听';
+        case 3:
+          return '被挂断';
+        case 4:
+          return '已拨打完成';
+        default:
+          return '';
+        }
+      },
+      userCallStatus() {
+        switch (this.item.userCallStatus) {
+        case 1:
+          return '未拨打';
+        case 2:
+          return '已拨打未接听';
+        case 3:
+          return '被挂断';
+        case 4:
+          return '已拨打完成';
+        default:
+          return '';
+        }
+      },
       diagnoseType() {
         switch (this.item.diagnoseType) {
         case 1:
@@ -506,7 +539,7 @@
         width: calc(100% - 10px);
         display: flex;
         justify-content: space-between;
-        margin-bottom: 20px;
+        margin-bottom: 10px;
         padding: 0 5px;
         .inquiry-user-l {
           display: flex;
@@ -599,7 +632,24 @@
         }
       }
     }
-
+    .inquiry-user-status{
+      width: calc(100% - 130px);
+      padding-bottom: 15px;
+      height: 38px;
+      .status-cll-user-answer{
+        background: rgba(255, 94, 87, 0.07);
+        border-radius: 10px;
+        border: 1px solid rgba(255, 94, 87, 0.15);
+        padding: 0 4px;
+        height: 20px;
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #FF5E57;
+        line-height: 20px;
+        margin-right: 6px;
+      }
+    }
     .line-btn {
       cursor: pointer;
       position: relative;