chore: 🔨 合并冲突解决
This commit is contained in:
@@ -8,8 +8,7 @@ defineOptions({
|
||||
|
||||
const state = reactive({
|
||||
errGif: new URL("../../assets/images/401.gif", import.meta.url).href,
|
||||
ewizardClap:
|
||||
"https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646",
|
||||
ewizardClap: "https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646",
|
||||
dialogVisible: false,
|
||||
});
|
||||
|
||||
@@ -24,9 +23,7 @@ function back() {
|
||||
|
||||
<template>
|
||||
<div class="page-container">
|
||||
<el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back">
|
||||
返回
|
||||
</el-button>
|
||||
<el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back">返回</el-button>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<h1 class="text-jumbo text-ginormous">Oops!</h1>
|
||||
@@ -49,12 +46,7 @@ function back() {
|
||||
</ul>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<img
|
||||
:src="errGif"
|
||||
width="313"
|
||||
height="428"
|
||||
alt="Girl has dropped her ice cream."
|
||||
/>
|
||||
<img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream." />
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-dialog v-model="dialogVisible" title="随便看">
|
||||
|
||||
Reference in New Issue
Block a user