Browse Source

fix: 二维码扫码bug处理

chenzhen2 2 years ago
parent
commit
a17684acb6
2 changed files with 10 additions and 6 deletions
  1. 2 2
      src/views/envmonitor/index.vue
  2. 8 4
      src/views/home/index.vue

+ 2 - 2
src/views/envmonitor/index.vue

@@ -1781,7 +1781,7 @@ export default defineComponent({
         proxyData.timeOutEvent = setTimeout(function () {
           proxyData.touchNumber = 1;
           proxyData.longPress();
-        }, 500); //这里设置定时器,定义长按500毫秒触发长按事件
+        }, 400); //这里设置定时器,定义长按500毫秒触发长按事件
         return false;
       },
       //手释放,如果在500毫秒内就释放,则取消长按事件,此时可以执行onclick应该执行的事件
@@ -1805,7 +1805,7 @@ export default defineComponent({
         proxyData.timeOutEvent = 0;
         proxyData.touchInterval = setInterval(() => {
           proxyData.touchNumber++;
-          if (proxyData.touchNumber === 5) {
+          if (proxyData.touchNumber === 4) {
             clearInterval(proxyData.touchInterval);
             proxyData.touchInterval = null;
             router.push({

+ 8 - 4
src/views/home/index.vue

@@ -20,11 +20,15 @@
               foreground="#CE9F27"
               level="H"
             />
-            <div class="qrcode-model" v-if="codeStatus.status">
+            <div class="qrcode-model" >
               <span v-if="codeStatus.status === 1">已扫描</span>
+              <!-- v-if="codeStatus.status" -->
               <!-- <span v-if="codeStatus.status === 2">已确认</span> -->
+              <!-- v-if="
+                  codeStatus.status === 2 ||
+                  codeStatus.status === 3
+                " -->
               <van-icon
-                v-if="codeStatus.status === 2 || codeStatus.status === 3"
                 class="code-replay"
                 @click="refreshCode"
                 name="replay"
@@ -171,7 +175,7 @@ export default defineComponent({
         let params: any = {
           criteria: {
             macAddress: proxyData.userInfo.mac,
-            isMajorSpace:1
+            isMajorSpace: 1,
           },
           orders: [
             {
@@ -220,7 +224,7 @@ export default defineComponent({
         let mac: any = proxyData.userInfo.mac;
         let qrCodeId: any = proxyData.getQrcode();
         proxyData.qrCodeId = qrCodeId;
-        proxyData.codeValue = `${proxyData.codeValue}?type=ipad&id=${qrCodeId}&mac=${mac}`;
+        proxyData.codeValue = `${orgin}/sgipad/home?type=ipad&id=${proxyData.qrCodeId}&mac=${mac}`;
       },
       //  定时器清楚
       clearTimer() {