From da7ed3f33eb9fecc0ff4aa3dd7b553d65bd2bd23 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Fri, 10 Feb 2023 13:48:00 +0800
Subject: [PATCH] =?UTF-8?q?axios=E5=AE=89=E8=A3=85=EF=BC=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                  |   1 +
 src/api/hospital.js           |  19 ++++++++
 src/assets/image/fail_tip.png | Bin 0 -> 2501 bytes
 src/utils/axios.js            |   2 +
 src/views/Guidance.vue        |   8 +--
 src/views/HomeView.vue        |  89 ++++++++++++++++++++++++++++++++++
 vue.config.js                 |  16 ++++++
 yarn.lock                     |  44 ++++++++++++++++-
 8 files changed, 173 insertions(+), 6 deletions(-)
 create mode 100644 src/api/hospital.js
 create mode 100644 src/assets/image/fail_tip.png

diff --git a/package.json b/package.json
index dc0b822..6ed18dc 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "axios": "^1.3.2",
     "core-js": "^3.8.3",
     "vant": "^2.12.53",
     "vconsole": "^3.15.0",
diff --git a/src/api/hospital.js b/src/api/hospital.js
new file mode 100644
index 0000000..be3152b
--- /dev/null
+++ b/src/api/hospital.js
@@ -0,0 +1,19 @@
+import request from "../utils/axios";
+
+//医院列表
+export const queryHosiptal = () => {
+    return request({
+        url: '/api/blade-system/dept/list-hospital',
+        method: 'get',
+    })
+};
+//预约须知
+export const queryNoticeDetail = (id) => {
+    return request({
+        url: '/api/blade-business/article/detail-by-id',
+        method: 'get',
+        params:{
+            id
+        }
+    })
+};
\ No newline at end of file
diff --git a/src/assets/image/fail_tip.png b/src/assets/image/fail_tip.png
new file mode 100644
index 0000000000000000000000000000000000000000..87d271206a09a1a22571ff8c571f7f96099b5ca1
GIT binary patch
literal 2501
zcmV;$2|D(PP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00001b5ch_0Itp)
z=>Px;e@R3^RCr$PonMR_M;*t%zdc|6Kp(Cm6%nN3Dq6Ut?Rg^-65Cg)6{$!ckdWv@
zDo$#mUZhkgqEZhDMEjH?9%x0R77^4#Jwy?C2m*<R77>(4J^QXCDE75Y0u8EBOBKYS
z`r%40vAsVuv$pa1Z11jjy`EX`O80Q`&g{(ZGr#%G{AT7i1jQfz^2DbwvUv|c6EH9i
z#yG&+0oo427$E<epAr})fUg5|9fTq*6al`9>dlMv=d1rwxyqzk;W&NY=fR1CAf5s+
z1)?2+mXY}b01IGR099V6+}nQ-G=HC&DFKA1b|=BsAuv4(!reaW<SjYl8o;Mv7-wkV
zQo&o|;NKn?5ZM(aHXjBs1EPuGtJXt~%vS--p>lJ6P+eQ-KsYn`MX)go;%R`k^dPnn
zlJFWV%){W5lwJO72p?>GA~Yb<HX!i~2-5%(VOG+|w<=(~3RIp8%hvQA2!H7d+puZt
z2^ch^5r|fX6<9on8}vQO=Sw~SJ0|Tb5Kc`#0mFE{&Ct}bV2Zv_f@RIp;_}b?RldFe
z;q>m$fp{LkgZ(P_fb%^Mro)uG^pBv+5jYUenBN5W6hOBHU0Aj9<5hr;Q8xdpAj=gP
z5FQ`jg3pY-2!gN`!}Boa@L}mV6^m;@R5}nKym!}jjBffp2z!Dkly-SAE~0$vYjolA
zb-!iz4aA;T(AmIU9DZvSc6#BGAwJ-D-r@@g?>93T;n$;YFWl1QRaEI9E#<RrQ?$O<
zGmscYCz1Pu(i4yvhEx0R9g1fl(q@1z#@&<)DBwL_ZHgx#_GoJK!q6LVCl>YJg`qE(
z_j(z9xdu|3XS^}ALtD2HTHg~x;txv?xSglC2a+~l9=b_iuMjpunWJ3(sGICu0kPd7
z!VMiiJ|r;h#?9ggg!h}{7~!{KBklu*Oe#lS_tR3o*exe#AQ|(V;$GVofG^sWB;mT*
z=2vumOn;uT`G<N2Qd`fM>tg}^WL<%USuEy%LO?~fL9r5<GQR}_Vhu*kRY}X5>9(HI
zQA6ZP-<D6jtL)+u;|S&QV$Eg4!)fy{2(S2|-N&>ge2lv~tvq%Hl1ly*1|92T!F*)R
zOO!37x@Ewb<RU=(eSD;UNi9A_i-jlKeV{E6PThMqjL|E~sy*{_lq)>j6-YXH0z}XB
zPpZChuD~kqq{VlxwdT?uNZNb_1hHpI(Z@PU+2yXbjWd%ofbp`T6%Yn*o^tskjzBnd
z{{)N?p&jZzUF=7_(2Cm;QOvelvOz;whZ%V^fB<c5$vPnR$ZG5R>h374wg0F90k2{0
z#+~$+zpd0Ydp(eJ@@Wu>F}&JOWPpgt6VFnv@IogbSCrZK+;s@mc@CnH4Y7;Le3f#A
zog08~+B8A9q_%2At;=fEXE){YdGTMP%i>J(hX8#y1~LE%G|j924<v2A8~S0HUh5tu
z8zQ?cT%%n6o`#0hX6C|grN<LBAVTU^`5rNImm0#hhx8>qXvh}T(XptVQLh)+;$yT}
z_?ZnPo%}V34#hwQC;{fvlq)<|2lBpFJ4vFbA<Q38u5c&S);<0`z_#K2(@_K>q_Fni
zJBU-02Voemd6&unQ$!U=wfZn|%KSDAoE)Hdy?;8YKrB2(oH2h4;3@A?8DNU20s&4E
zr_JAj@bv+T*ZZfV3WV`HQhM#V6RM~J0WSy*c@HEa>}d2v6$qm!Y{*B-ZuJ>D4Z(^4
z!W!v@UDT**h;YBhK-6lEF%Y$Q#2TU)4+$hT>grHgiHE)Fzz~BKG3-@%Q}WOad+mu~
z>^f0JOKjJPj?TsPo6FkClXcnjx4!Tvb#=cxo@&)%k8*2ElJ0jM7pQ;|Zr$41=|Dd3
zo7{l}UD58Ks$8J5kFM#pglqdx7VuH|5xRVNwYj13u3fj`_R-e>5|Od>dc+d0tXev$
z*CvO$m__IcrspA|C5T4^P$QnzYQsjOE+|qif0v%yfb?qj?n=9E8<1`r<=j<KueYlF
zBrO$A)pjn*L!SC<CDlvR?n>LdmDIK)8f~_AS4Dl^YTayIGwdoKBkmwvz77$l6<oV!
zf|7Q`BHFGG4S8s%am>5<ID$S0c4P~}8I*1vX*=v4+a!*4KdKEB#>N9XH7(KONSm00
zWD5_~W1O@KUdBAhB+qFv7wL4Qtp-GoL!T9XfZi-DbkhLdmz+X^-cVjkx*qz}<5=_x
zW%GBq5j1B^;ek*%T$97GXsIPi2c40&L(XVj0a1O=nN#2Z8;Ih8XMhrA^S3(zvF(V|
zkk)JUoRWt1ySvaDwK<8}!DlS%04*;6sjCf1O@0N2aW*XJdj5{v;4@lii9_gB>G2)g
zbWY)rw%)=sX<<u%v#3<2>CLzQ)!aIH-+iA(A|WEE9`M|1LrcIfQMPcr-RC+-lrzmS
zd=l>|+y{&Lh-+5QfNMc8iT2bcgsR#NyUe|W_>)?)e{u#R3I_oTtwjg;p{jM1mO2Mt
zi$a*#0HxLUto((EwY4M;q#O{Y5~|qkJCJhCr7{hoUj|gL;mn4u$0)aa+Ntu6T~<8<
z&X^*g<Z#`<<|IA$zt2%Nz+n7ROYCd$;_E8hL$KczbEaHA)yXs6nw@J6k$J}#x_HCU
z&kJ1|U6%|aYh2K76Ph<s2Jkko!m{?#;#=a5cGr(54QW7;YYh;a(IS4ms%ts6yvVDl
z;1Q=an|8VP1VnaUF_aFpdWRu0>={T5r5z7{Fnj}%P=rk(<BwWy-|V$VYRf`wYqcKs
zYBPL|vO1MNzMNR0%ZVF?Ud&TIJNDubP9Ep*PsOh9Zq^)5Cxx3ufKk~69z<tV0`qao
z6#~7z&X-Z|*o8@lq`Y$I!60g`U>@gD#Ste*VK3$G3y?-PX0NCGC_>s&Le=_CxAlx(
zAT+1xD-byflPiyW0+9Dvsd;mnvlJ@;pTfuVY^Te-oU?HEM&E%nv_)($qS5bzFs%`o
z3K*|~%Rgv$Uz9r$dwVN1AnU*&@iYu^#}#eyR@|`O<~3ND2P!Xw1)^TF(1A3-h;6Hz
zw>~b1$wU)jiMs1|n1v&74mWT7qWRXFFv~VDAnS+9rU~#j06G-<4GoNI0G|fvH}yL_
z!UWKlnR<{FkXu<X`c)8%W6e{6yJW-~1+W071)%(gu)8EDSt+3*-3lqs(T{F6K_mCV
zz&IG=Al?S19Uutzf9vk{6);vo^2qcG2t`;Zf~)VKd^10&uE+^Q{rCR??iwS{A$ITu
P00000NkvXXu0mjfF21yP

literal 0
HcmV?d00001

diff --git a/src/utils/axios.js b/src/utils/axios.js
index de5141d..e138a99 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -7,6 +7,8 @@ axios.defaults.withCredentials = true;
 axios.defaults.validateStatus = function (status) {
   return status >= 200 && status <= 500;
 };
+//跨域请求，允许保存cookie
+axios.defaults.withCredentials = true;
 
 //HTTP Request拦截
 axios.interceptors.request.use(
diff --git a/src/views/Guidance.vue b/src/views/Guidance.vue
index ef62935..0447291 100644
--- a/src/views/Guidance.vue
+++ b/src/views/Guidance.vue
@@ -62,7 +62,7 @@ export default {
         return;
       }
       const { scrollTop, clientHeight, scrollHeight } = e.target;
-      if (scrollTop + clientHeight === scrollHeight) {
+      if ((scrollTop + clientHeight) >= (scrollHeight - 5)) {
         this.isFlag = true;
         console.log('阅读完成')
       }
@@ -74,7 +74,7 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped lang="scss">
 .guidance {
-  height:100%;
+  height: 100%;
   background-color: #fff;
 
   .guide_title {
@@ -102,7 +102,7 @@ export default {
     margin: 0.86rem 0.4rem 0;
 
     .guide_actBtn {
-      float:left;
+      float: left;
       display: inline-block;
       width: 3rem;
       color: #999999;
@@ -116,7 +116,7 @@ export default {
       border: 0.02rem solid #E1E1E1;
 
       &.blue {
-        float:right;
+        float: right;
         color: #fff;
         background: #1677FF;
         border-color: #1677FF;
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index fd3f255..c7514bb 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -40,11 +40,24 @@
     <div class="act_box">
       <div @click="goMyBook" class="act_btn">我的预约</div>
     </div>
+    <!-- 黑名单等错误提示 -->
+    <van-overlay :show="isShowError">
+      <div class="wrapper" @click.sto>
+        <div class="img_box">
+          <img src="~@/assets/image/fail_tip.png" alt="">
+        </div>
+        <div class="tips">提示</div>
+        <div class="tip_txt">{{ errMsg }}</div>
+        <div class="btn" @click="isShowError = false">知道了</div>
+      </div>
+      <div class="close_box" @click="isShowError = false"><img src="~@/assets/image/close.png" alt=""></div>
+    </van-overlay>
     <!-- 阅读须知 -->
     <!-- <GuidanceVue @doCancelGuide="doCancelGuide" v-if="guideShow"></GuidanceVue> -->
   </div>
 </template>
 <script>
+import { queryHosiptal } from "@/api/hospital";
 import GuidanceVue from '@/components/Guidance.vue';
 import { getUserInfo } from '@/utils/aisdapp';
 import { isMobile } from '@/utils';
@@ -57,6 +70,8 @@ export default {
     return {
       guideShow: false,
       userInfo: null,
+      errMsg: '由于您未及时进行报道，已被拉黑请于10日后再次进行预约',
+      isShowError:false,//自定义错误提示弹框
     }
   },
   mounted() {
@@ -68,12 +83,20 @@ export default {
       }
       else {
         this.userInfo = userInfo;
+        this.queryHosiptal();
       }
     } else {
+      this.queryHosiptal();
       return false // alert('PC端')
     }
   },
   methods: {
+    //医院列表
+    queryHosiptal() {
+      queryHosiptal().then(res => {
+
+      })
+    },
     //跳转我的预约列表
     goMyBook() {
       this.$router.push({ name: 'MyExam' });
@@ -174,5 +197,71 @@ export default {
       border-radius: 0.08rem;
     }
   }
+
+  .wrapper {
+    width: 5.98rem;
+    height: 6.66rem;
+    background: #FFFFFF;
+    border-radius: 0.16rem;
+    margin: 0 auto;
+    margin-top: 2.76rem;
+
+    .img_box {
+      display: flex;
+      justify-content: center;
+
+      img {
+        width: 1rem;
+        height: 1rem;
+        margin-top: 1.2rem;
+      }
+    }
+
+    .tips {
+      display: flex;
+      justify-content: center;
+      font-size: 0.34rem;
+      color: #000;
+      font-weight: bold;
+      margin: 0.56rem 0 0.2rem 0;
+      font-family: PingFang SC-Regular, PingFang SC;
+
+    }
+
+    .tip_txt {
+      width:3.6rem;
+      color: #666;
+      font-size: 0.24rem;
+      text-align: center;
+      font-family: PingFang SC-Regular, PingFang SC;
+      margin: 0 auto;
+    }
+
+    .btn {
+      width: 3rem;
+      height: 0.8rem;
+      background: #1677FF;
+      border-radius: 0.08rem;
+      margin: 0 auto;
+      margin-top: 0.6rem;
+      font-size: 0.3rem;
+      color: #fff;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-family: PingFang SC-Regular, PingFang SC;
+    }
+  }
+
+  .close_box {
+    display: flex;
+    justify-content: center;
+    margin-top: 0.6rem;
+
+    img {
+      width: 0.5rem;
+      height: 0.5rem;
+    }
+  }
 }
 </style>
diff --git a/vue.config.js b/vue.config.js
index aaf30b2..bc10ee8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,4 +2,20 @@ const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
   lintOnSave: false,
   transpileDependencies: true,
+  //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
+  devServer: {
+    port: 8080,
+    proxy: {
+      '/api': {
+        //本地服务接口地址
+        target: 'http://192.168.1.106',
+        //远程演示服务地址,可用于直接启动项目
+        // target: 'https://saber.bladex.vip/api',
+        ws: true,
+        pathRewrite: {
+          '^/api': '/'
+        }
+      }
+    }
+  }
 });
diff --git a/yarn.lock b/yarn.lock
index 85de508..4c2ce1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1889,6 +1889,11 @@ async@^2.6.4:
   dependencies:
     lodash "^4.17.14"
 
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -1906,6 +1911,15 @@ autoprefixer@^10.2.4:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+axios@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3"
+  integrity sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-loader@^8.2.2:
   version "8.3.0"
   resolved "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
@@ -2272,6 +2286,13 @@ colorette@^2.0.10:
   resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
   integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
 
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2614,6 +2635,11 @@ define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -3201,11 +3227,20 @@ flatted@^3.1.0:
   resolved "https://registry.npmmirror.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-follow-redirects@^1.0.0:
+follow-redirects@^1.0.0, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -4061,7 +4096,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -4842,6 +4877,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"