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 @@
- http://y.acexe.cn?q=10946481001086181062569234199632 + {{scanLink}}
-
- +
+
@@ -60,7 +60,8 @@ 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 @@
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; } diff --git a/static/images/lawEnforcement/icon/close.png b/static/images/lawEnforcement/icon/close.png new file mode 100644 index 00000000..7da3c513 Binary files /dev/null and b/static/images/lawEnforcement/icon/close.png differ