From d7b2139381f0e8f0214dbeccb7694b0b16b5ef1d Mon Sep 17 00:00:00 2001
From: xiayt <x1027869635@gmail.com>
Date: Thu, 1 Dec 2022 16:44:58 +0800
Subject: [PATCH] feat:研学码扫一扫修改

---
 src/views/Home/YanxueCode.vue                   |  2 +-
 src/views/Home/YanxueInfo.vue                   | 16 ++++++++++++++--
 src/views/Service/AbroadDetail/AbroadDetail.vue |  9 ++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/views/Home/YanxueCode.vue b/src/views/Home/YanxueCode.vue
index 4d2f8b5..1fc2b84 100644
--- a/src/views/Home/YanxueCode.vue
+++ b/src/views/Home/YanxueCode.vue
@@ -38,7 +38,7 @@ export default {
     }
   },
   mounted () {
-    this.studentInfo = JSON.parse(localStorage.getItem('bindYanxueCodeChildInfo'));
+    this.studentInfo = JSON.parse(localStorage.getItem('StudentDetialInfo'));
     this.creatQrCode()
   },
   methods: {
diff --git a/src/views/Home/YanxueInfo.vue b/src/views/Home/YanxueInfo.vue
index a6c0125..f6f7272 100644
--- a/src/views/Home/YanxueInfo.vue
+++ b/src/views/Home/YanxueInfo.vue
@@ -22,7 +22,7 @@ export default {
   },
   created () {
 
-    let studentInfo = JSON.parse(localStorage.getItem('bindYanxueCodeChildInfo'));
+    let studentInfo = JSON.parse(localStorage.getItem('StudentDetialInfo'));
     this.userNum = studentInfo.travelerNum
     this.school = studentInfo.schoolName
     this.name = studentInfo.travelerName
@@ -46,7 +46,19 @@ export default {
     },
     //扫一扫
     saoYiSao () {
-      window.location.href = 'http://sao315.com/w/api/saoyisao?redirect_uri=https://payment.myjxt.com/center/%23/YanxueInfo';
+      ZWJSBridge.scan({
+        type: 'qrCode',
+      })
+        .then((res) => {
+          if(res.qrcode&&!isNaN(Number(res.qrcode))){
+            this.$router.push({ name: 'YanxueInfo', query: { qrresult: res.qrcode } })
+          }else{
+            this.$toast.fail('扫码失败')
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
     // 获取链接参数
     GetQueryString (name) {
diff --git a/src/views/Service/AbroadDetail/AbroadDetail.vue b/src/views/Service/AbroadDetail/AbroadDetail.vue
index 1a6c08c..2da6bd5 100644
--- a/src/views/Service/AbroadDetail/AbroadDetail.vue
+++ b/src/views/Service/AbroadDetail/AbroadDetail.vue
@@ -332,7 +332,7 @@ export default {
   .abroad_detail .uni_text .course_name{
     font-size: 50px;
   }
-  .abroad_detail .uni_text .course_count,.abroad_detail .uni_text .tag_box .tag,.service_bottom_btn_left .icon p,.abroad_detail .Collection .box .box_btn,.abroad_detail .tag_item .tag_text{
+  .abroad_detail .uni_text .course_count,.abroad_detail .uni_text .tag_box .tag,.service_bottom_btn_left .icon p,.abroad_detail .Collection .box .box_btn,.abroad_detail {
     font-size: 36px !important;
   }
   .abroad_detail .content_box .content_all img{
@@ -341,5 +341,12 @@ export default {
   .abroad_detail .tag_item{
     padding: 0;
   }
+  .abroad_detail .tag_item .tag_text{
+    font-size: 36px !important;
+    *{
+    font-size: 36px !important;
+
+    }
+  }
 }
 </style>
--
libgit2 0.21.0