From 78024603f2d145afd77ac1b6a63d46aeffe8436c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 8 Nov 2022 11:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/qrcode/Scaner.vue              |   2 +-
 .../retrospect/retrospectDetail.vue           |  23 +++++++++---
 src/views/lawEnforcement/retrospect/scan.vue  |  34 +++++++++++-------
 static/images/lawEnforcement/icon/close.png   | Bin 0 -> 413 bytes
 4 files changed, 41 insertions(+), 18 deletions(-)
 create mode 100644 static/images/lawEnforcement/icon/close.png

diff --git a/src/components/qrcode/Scaner.vue b/src/components/qrcode/Scaner.vue
index 131d6a4f..a67444a7 100644
--- a/src/components/qrcode/Scaner.vue
+++ b/src/components/qrcode/Scaner.vue
@@ -254,7 +254,7 @@ export default {
   display: inline-block;
   height: 24PX;
   width: 24PX;
-  /*background: url('../assets/close.png') no-repeat center;*/
+  background: url('../../../static/images/lawEnforcement/icon/close.png') no-repeat center;
   background-size: auto 100%;
   position: absolute;
   right: 8PX;
diff --git a/src/views/lawEnforcement/retrospect/retrospectDetail.vue b/src/views/lawEnforcement/retrospect/retrospectDetail.vue
index a4da09ab..747cd408 100644
--- a/src/views/lawEnforcement/retrospect/retrospectDetail.vue
+++ b/src/views/lawEnforcement/retrospect/retrospectDetail.vue
@@ -23,11 +23,11 @@
     <div class="main">
 
       <div class="main_box">
-        <a href="http://y.acexe.cn?q=10946481001086181062569234199632" style="font-size: 14px;display: block;width: 100%;text-align: center;">http://y.acexe.cn?q=10946481001086181062569234199632</a>
+        <a style="font-size: 14px;display: block;width: 100%;text-align: center;">{{scanLink}}</a>
       </div>
 
-      <div class="iframe-wrap">
-        <iframe id="iframe" src="http://y.acexe.cn?q=10946481001086181062569234199632" class="iframe" width="100%" frameborder="0"></iframe>
+      <div class="iframe-wrap" v-if="scanLink.indexOf('http')>0">
+        <iframe id="iframe" :src="scanLink" class="iframe" width="100%" frameborder="0"></iframe>
       </div>
 
 <!--      <div class="main_box center_box" style="margin-top: 10px;">-->
@@ -60,7 +60,8 @@
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import {getScheme, getSurveyByCaseId} from "@/api/lawEnforcement/index";
+  import Cookies from "js-cookie";
   export default {
     name: "programmeDetail",
     data() {
@@ -84,6 +85,8 @@
         activeNames: ['1'],
         activeNames1: ['1'],
         activeNames2: ['1'],
+
+        scanLink:'',
       };
     },
     created() {
@@ -99,6 +102,18 @@
         window.history.go(-1)
       }
     },
+    watch: {
+      $route (to, from ) {
+        // 监听路由变化, 实现类似 小程序的 onShow 事件
+        if (to.path === '/lawEnforcement/retrospectDetail') {
+          // do anything you want
+          if (Cookies.get('scanLink')){
+              this.scanLink = Cookies.get('scanLink');
+              Cookies.remove('scanLink')
+          }
+        }
+      }
+    },
   }
 </script>
 
diff --git a/src/views/lawEnforcement/retrospect/scan.vue b/src/views/lawEnforcement/retrospect/scan.vue
index 6e7e380c..bef5bdb0 100644
--- a/src/views/lawEnforcement/retrospect/scan.vue
+++ b/src/views/lawEnforcement/retrospect/scan.vue
@@ -2,7 +2,7 @@
   <div class="scan">
     <div class="nav">
       <a class="close" @click="() => $router.go(-1)"></a>
-      <p class="title">Scan QRcode</p>
+      <p class="title">扫一扫</p>
     </div>
     <div class="scroll-container">
       <Scaner
@@ -19,6 +19,7 @@
 <script>
 
 import Scaner from '@/components/qrcode//Scaner';
+import Cookies from "js-cookie";
 
 export default {
   name: 'Scan',
@@ -35,7 +36,10 @@ export default {
     codeScanned(code) {
       this.scanned = code;
       setTimeout(() => {
-        alert(`扫码解析成功: ${code}`);
+        // alert(`扫码解析成功: ${code}`);
+        Cookies.remove('scanLink')
+        Cookies.set("scanLink", code);
+        history.back(-1);
       }, 200)
     },
     errorCaptured(error) {
@@ -80,29 +84,33 @@ export default {
   width: 100%;
 }
 .scan .nav {
-  width: 100%;
-  height: 48PX;
-  line-height: 48PX;
+  height: 116px;
+  background: url('../../../../static/images/lawEnforcement/new/list_head.png') no-repeat;
+  background-size: 100% 100%;
   position: fixed;
   top: 0;
   left: 0;
+  width: 100%;
+  font-size: 36px;
+  line-height: 116px;
+  text-align: center;
+  color: #fff;
+  z-index: 999;
 }
 .scan .nav .title {
   padding: 0;
   margin: 0;
   font-size: 16PX;
   color: #FFFFFF;
-  background: rebeccapurple;
   text-align: center;
 }
 .scan .nav .close {
-  display: inline-block;
-  height: 22PX;
-  width: 22PX;
-  background: url('../../../assets/images/sunVillage_info/list_icon_5.png') no-repeat center;
-  background-size: auto 100%;
+  width: 24px;
+  height: 43.2px;
+  background: url('../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+  background-size: 20px 36px;
   position: absolute;
-  left: 16PX;
-  top: 14PX;
+  left: 38px;
+  top: 36px;
 }
 </style>
diff --git a/static/images/lawEnforcement/icon/close.png b/static/images/lawEnforcement/icon/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..7da3c513e8902487fbccde8910e36d6eba30a719
GIT binary patch
literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s#sNMdu0Z<z`;Q+!e0u*Lh`s;;
zjQt6j0bxVP<#)rj1GNd31o;IsG#FQiv-{_|%JFO4Dkq1=sJ<|;U|?Y6@N{tu@i_i=
z%2}a93Op^53ay`(zyH7GnqflYvR6kxJ}5u6WjE&=hF9nLoz0Ht9G?AZ0+*b{{(Xw^
z8<y|cq|y`Paq<GIvEGSaP0Bq}dG6F7nz*H|^L3%!giiOi*4=CW%?wz3_hf@^#o4Eu
zYR&qCPFsJ7UOU_F^zMv_uXZ<oz1A?ZNohebPt}u)2^X!eEfY7Jc+r~8_D@E~jpFzI
zY}V5<5B&*$oYN%x#l&Juje&){U$~vjy6en)m3`Ra&-1^ob`KQJ=I!|U=7G`5nL&?F
z==#TAHe2#UQ0M(CmAe<tztgaMusK{o;$@RpM7yN$RG!%9U!zOCN@{<*yb}FoxzyyR
k<&>@Qd-@#z{uDAlxr*KVdt18>Fu)i*UHx3vIVCg!07u5mIsgCw

literal 0
HcmV?d00001