Merge branch 'release' of...

Merge branch 'release' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into release

.env

 NODE_ENV=development
 
 # baseUrl
-BASE_URL=/pica-admin-consultation/
+BASE_URL=/consultation/pica-admin-consultation/
 
 # 路由 base
 VUE_APP_BASE_ROUTE_URL=/consultation/pica-admin-consultation/

.env.development.local

@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
 VUE_APP_APPID=wxf4e66242d31c81c2
 
 #本地token
-VUE_APP_TOKEN=BD84987E12C94A659DA95DE2BF177A76
+VUE_APP_TOKEN=D321743AA7464709A42053132F5D2F8D

.eslintrc.js

@@ -37,11 +37,7 @@ module.exports = {
     'spaced-comment': [2, 'always'], // 强制在注释中 // 或 /* 使用一致的空格
     'array-bracket-spacing': [2, 'never'],// 指定数组的元素之间要以空格隔开(, 后面)， never参数：[ 之后和 ] 之前不能带空格，always参数：[ 之后和 ] 之前必须带空格
     "space-before-blocks": 2,  // if/function等的大括号之前需要有空格
-    "vue/script-indent": ["error", 2, {  // script标签缩进设置
-      "baseIndent": 1,
-      "switchCase": 0,
-      "ignores": []
-    }],
+    "vue/script-indent": 'off',
 
     'no-undef-init': 2,// 禁止将变量初始化为 undefined,保存时会将let a = undefined变成let a
     'semi': [2, 'always'],//强制结尾必须有分号;

src/api/diagnosis.js

@@ -92,10 +92,11 @@ export const messageSend = async (data) => {
 
 // diagnosis-list-new
 
-export const getCountQuery = async () => {
+export const getCountQuery = async (params) => {
   return request({
     url: '/diagnose/admin/diagnose/countQuery',
-    method: 'get',
+    method: 'post',
+    data: params
   });
 };
 

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -963,26 +963,26 @@
   </div>
 </template>
 <script>
-  import uploadImg from '@/components/editor/upload-img';
-  import uploadMusic from '@/components/editor/upload-music';
   import {
-    TYPE_LIST,
-    PAY_LIST,
-    SOURCE_LIST,
-    STATUS_LIST,
-    CAR_LIST,
-    SEX_LIST,
-    RELATION_LIST,
-    D_S_LIST,
-    FOLLW_LIST,
-  } from '@/utils/constants';
-  import { getBirth } from '@/utils/index';
-  import {
-    getAdminDiagnose,
-    getDoctorList,
-    getDiagnoseLog,
-    diagnoseUpdate,
-  } from '@/api/diagnosis';
+diagnoseUpdate,
+getAdminDiagnose,
+getDiagnoseLog,
+getDoctorList,
+} from '@/api/diagnosis';
+import uploadImg from '@/components/editor/upload-img';
+import uploadMusic from '@/components/editor/upload-music';
+import {
+CAR_LIST,
+D_S_LIST,
+FOLLW_LIST,
+PAY_LIST,
+RELATION_LIST,
+SEX_LIST,
+SOURCE_LIST,
+STATUS_LIST,
+TYPE_LIST,
+} from '@/utils/constants';
+import { getBirth } from '@/utils/index';
 
   const PAY_TYPE = {
     1: '自动付款',
@@ -1519,4 +1519,9 @@
     }
   }
 }
+
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled .el-textarea__inner {
+  color: #666;
+}
 </style>

vue.config.js

@@ -70,7 +70,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/proxy': {
-        target: 'https://uat-sc.yunqueyi.com/',
+        target: 'https://dev-sc.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,