Skip to content

Commit 7647b92

Browse files
Copilotliweijie0812
andcommitted
Changes before error encountered
Co-authored-by: liweijie0812 <10710889+liweijie0812@users.noreply.github.com>
1 parent 0ab81b1 commit 7647b92

3 files changed

Lines changed: 10 additions & 16 deletions

File tree

package-lock.json

Lines changed: 4 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
"nprogress": "^0.2.0",
3030
"pinia": "2.1.7",
3131
"pinia-plugin-persistedstate": "^3.2.0",
32-
"qrcode.vue": "^3.4.1",
3332
"qs": "^6.13.1",
3433
"tdesign-icons-vue-next": "^0.3.6",
35-
"tdesign-vue-next": "^1.13.2",
34+
"tdesign-vue-next": "^1.15.1",
3635
"tvision-color": "^1.6.0",
3736
"vue": "^3.5.13",
3837
"vue-i18n": "^9.9.1",

src/pages/login/components/Login.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<span class="tip">{{ t('pages.login.wechatLogin') }}</span>
4747
<span class="refresh">{{ t('pages.login.refresh') }} <t-icon name="refresh" /> </span>
4848
</div>
49-
<qrcode-vue value="" :size="160" level="H" />
49+
<q-r-code-component value="" :size="160" level="H" />
5050
</template>
5151

5252
<!-- 手机号登录 -->
@@ -81,9 +81,9 @@
8181
</t-form>
8282
</template>
8383
<script setup lang="ts">
84-
import QrcodeVue from 'qrcode.vue';
8584
import type { FormInstanceFunctions, FormRule, SubmitContext } from 'tdesign-vue-next';
8685
import { MessagePlugin } from 'tdesign-vue-next';
86+
import { QRCode } from 'tdesign-vue-next/es/qrcode';
8787
import { ref } from 'vue';
8888
import { useRoute, useRouter } from 'vue-router';
8989
@@ -93,6 +93,9 @@ import { useUserStore } from '@/store';
9393
9494
const userStore = useUserStore();
9595
96+
// Define the QRCode component for use in template
97+
const QRCodeComponent = QRCode;
98+
9699
const INITIAL_DATA = {
97100
phone: '',
98101
account: 'admin',

0 commit comments

Comments
 (0)