From ec2fcd44fa775c748ccf8595451a623b3a1a3858 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Thu, 23 Feb 2023 15:55:32 +0800
Subject: [PATCH] =?UTF-8?q?loading=E5=85=B3=E9=97=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js               |  2 +-
 src/views/HomeView.vue    |  2 +-
 src/views/examination.vue | 25 ++++++-------------------
 vue.config.js             |  4 ++--
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/main.js b/src/main.js
index c405ef3..086efb1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,7 +9,7 @@ import GlobalConfig from "./utils/aisdapp";
 import { Base64 } from "js-base64";
 
 import VConsole from "vconsole";
-// let vConsole = new VConsole();
+let vConsole = new VConsole();
 
 Vue.use(vant);
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 09f37bb..b37bc59 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -3,7 +3,7 @@
     <div class="act_shoose">
       <div v-for="(item, index) in hospitalList" :key="'hospital' + index" @click="doGuidance(item.id)"
         :class="choosedIndex == index ? 'act_btn active' : 'act_btn'">
-        <img :src="item.imgUrl ? item.imgUrl : require('@/assets/image/hospital_logo.png')" />
+        <img :src="item.imgUrl ? (GlobalConfig.appMode ? 'http://www.qdscgs.com:9091' + item.imgUrl : 'http://192.168.1.106:9000' + item.imgUrl) : require('@/assets/image/hospital_logo.png')" />
         <div class="hospital_info">
           <div class="hospital_name">{{ item.fullName }}</div>
           <div class="hospital_addr">{{ item.remark }}</div>
diff --git a/src/views/examination.vue b/src/views/examination.vue
index 7dc3c40..c6e342b 100644
--- a/src/views/examination.vue
+++ b/src/views/examination.vue
@@ -244,11 +244,11 @@ export default {
                 }
                 vaildInterfacefn("cgstjyyxuwxt", "qdsgajjtjczdhqfhlb", JSON.stringify(val), "2", "https://" + this.GlobalConfig.urlCreatesign, "https://" + this.GlobalConfig.urlGateway)
                     .then((value) => {
+                        this.$toast.clear();
                         let retData = JSON.parse(value)
                         console.log(retData.data)
                         if (retData.data.length == 0) {
                             this.examData = retData.data
-                            this.$toast.clear();
                             // lightAppJssdk.notification.alert({
                             //     message: "当前时间无体检项目",
                             //     title: "提示",//可传空
@@ -263,7 +263,6 @@ export default {
                             // })
                         } else {
                             this.examData = retData.data;
-                            this.$toast.clear();
                             this.examData.map(item => {
                                 item.detailList.map(item1 => {
                                     item1.isSelect = false
@@ -272,8 +271,8 @@ export default {
 
                         }
                         console.log('data ===>', this.examData)
-
-                        // this.$toast.clear();
+                    }, err => {
+                        this.$toast.clear();
                     })
             } else {
                 queryList(
@@ -283,21 +282,9 @@ export default {
                         cupCardNo: this.Base64.encode(this.cupCardNo)
                     }
                 ).then(res => {
+                    this.$toast.clear();
                     if (res.data.length == 0) {
                         this.examData = res.data;
-                        this.$toast.clear();
-                        // lightAppJssdk.notification.alert({
-                        //     message: "当前时间无体检项目",
-                        //     title: "提示",//可传空
-                        //     buttonName: "收到",
-                        //     success:  (data) => {
-                        //         this.$toast.clear();
-                        //     //    console.log(this.examData)
-                        //     },
-                        //     fail: function (data) { //错误返回
-                        //     console.log('data')
-                        //     }
-                        //  })
                     } else {
                         this.examData = res.data;
                         this.examData.map(item => {
@@ -305,11 +292,11 @@ export default {
                                 item1.isSelect = false
                             })
                         })
-                        this.$toast.clear();
-
                     }
                     console.log(this.examData)
 
+                }, err => {
+                    this.$toast.clear();
                 })
             }
         },
diff --git a/vue.config.js b/vue.config.js
index 6727f25..8b39eee 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,8 +9,8 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //本地服务接口地址
-        target: "http://192.168.1.3:8080",
-        // target: "http://192.168.1.106",
+        // target: "http://192.168.1.3:8080",
+        target: "http://192.168.1.106",
         //远程演示服务地址,可用于直接启动项目
         // target: 'https://saber.bladex.vip/api',
         ws: true,