From 8521a43d5564ad5fc8215b91efbbb47ab4f1f19e Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Tue, 14 Mar 2023 17:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E9=BB=91=E5=BC=B9=E6=A1=86=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=A2=84=E7=BA=A6=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E6=8F=90=E7=A4=BA=E8=A1=A5=E5=85=85=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E5=92=8C=E6=8B=89=E9=BB=91=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/aisdapp.js      |  2 +-
 src/views/HomeView.vue    |  4 ++--
 src/views/examProject.vue | 19 ++++++++++++-------
 vue.config.js             |  4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/utils/aisdapp.js b/src/utils/aisdapp.js
index 4b49442..56f2c2e 100644
--- a/src/utils/aisdapp.js
+++ b/src/utils/aisdapp.js
@@ -5,7 +5,7 @@ export const appword = "aKd20dbGdFvmuwrt"
 
 const appid = 'cgstjyyxuwxt';
 
-const appMode = true;//是否开启爱山东中控台接口调用方式
+const appMode = false;//是否开启爱山东中控台接口调用方式
 
 export default {
     appid,
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index a256d3e..4ae27d1 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -45,7 +45,7 @@ export default {
       choosedIndex: -1,
       guideShow: false,
       userInfo: null,
-      errMsg: '由于您未及时进行报到，已被拉黑请于10日后再次进行预约',
+      errMsg: '由于您未及时进行报到，已被拉黑请于2023-03-31日后再次进行预约',
       isShowError: false,//自定义错误提示弹框
       //用户登录参数
       urlCreatesign: urldomaincreatesign,
@@ -413,7 +413,7 @@ export default {
     }
 
     .tip_txt {
-      width: 3.6rem;
+      width: 3.8rem;
       color: #666;
       font-size: 0.24rem;
       text-align: center;
diff --git a/src/views/examProject.vue b/src/views/examProject.vue
index 5acdf09..d91e4b2 100644
--- a/src/views/examProject.vue
+++ b/src/views/examProject.vue
@@ -32,10 +32,12 @@
                     <img src="~@/assets/image/succ.png" alt="">
                 </div>
                 <div class="tips">预约成功</div>
-                <div class="tip_txt">
-                    <div>预约成功后若不能按时体检请提前取消</div>
-                    <div>未提前取消且未按期体检将被拉入黑名单</div>
-                    <div>被拉黑用户{{blacklistOutDate}}日内不可再预约</div>
+                <div class="tip_txt" style="text-align: left;padding:0 0.5rem;">
+                    <!-- <div>预约成功后若不能按时体检请在开始时间</div>
+                    <div>前30分钟取消该预约</div>
+                    <div>未按期体检{{blacklistOutDate}}次后将被拉黑</div>
+                    <div>被拉黑的用户请于{{blacklistOutDate}}日后再次预约</div> -->
+                    <div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;预约成功后若不能按时体检请在开始时间前30分钟取消该预约。未按期体检{{timesToBlacklist}}次后将被拉黑，被拉黑的用户请于{{blacklistOutDate}}日后再次预约。</div>
                 </div>
                 <div class="btn" @click="clickSucc">知道了</div>
             </div>
@@ -65,7 +67,8 @@ export default {
             isSuccess: false,
             userInfo: {},
             failTips: '',
-            blacklistOutDate:''
+            blacklistOutDate:'',
+            timesToBlacklist:'',//拉黑限制次数
         };
     },
     mounted() {
@@ -131,7 +134,8 @@ export default {
                         if (retData.code == 200) {
                             this.isShow = true;
                             this.isSuccess = true
-                            this.blacklistOutDate = retData.data.blacklistOutDate
+                            this.blacklistOutDate = retData.data.blacklistOutDate;
+                            this.timesToBlacklist = retData.data.timesToBlacklist;
                         } else {
                             this.failTips = retData.msg;
                             this.isShow = true;
@@ -148,7 +152,8 @@ export default {
                         if (res.code == 200) {
                             this.isShow = true;
                             this.isSuccess = true;
-                            this.blacklistOutDate = res.data.blacklistOutDate
+                            this.blacklistOutDate = res.data.blacklistOutDate;
+                            this.timesToBlacklist = res.data.timesToBlacklist;
                         } else {
                             this.failTips = res.msg
                             this.isShow = true;
diff --git a/vue.config.js b/vue.config.js
index 8b39eee..6727f25 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,