|
@@ -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() {
|