xiongzhu vor 2 Jahren
Ursprung
Commit
247cba0e17

+ 2 - 2
src/components/ProductInfo.vue

@@ -49,7 +49,7 @@
 
 <script setup>
 import { computed } from 'vue'
-import { useRouter } from 'vue-router'
+import { useIonRouter } from '@ionic/vue'
 import { useSystemStore } from '../stores/system'
 import { accAdd, accMul } from '../plugins/calc'
 import toast from '@/utils/toast'
@@ -78,7 +78,7 @@ const category = computed(() => {
     return props.info.category || {}
 })
 
-const router = useRouter()
+const router = useIonRouter()
 
 const width = computed(() => {
     return props.list ? 104 : 78

+ 2 - 2
src/components/ProductSmallInfo.vue

@@ -32,7 +32,7 @@
 
 <script setup>
 import { computed } from 'vue'
-import { useRouter } from 'vue-router'
+import { useIonRouter } from '@ionic/vue'
 import { useSystemStore } from '../stores/system'
 import { accAdd, accMul } from '../plugins/calc'
 import toast from '@/utils/toast'
@@ -72,7 +72,7 @@ const notStock = computed(() => {
     )
 })
 
-const router = useRouter()
+const router = useIonRouter()
 const goDetail = () => {
     if (notStock.value) {
         toast(t('common.notAvailable') + '...')

+ 2 - 2
src/views/BLFPage.vue

@@ -64,7 +64,7 @@ import { useI18n } from 'vue-i18n'
 import Toast from '@/utils/toast'
 import '@/styles/animate.css'
 import http from '@/plugins/http'
-import { useRouter } from 'vue-router'
+import { useIonRouter } from '@ionic/vue'
 import { onIonViewWillEnter } from '@ionic/vue'
 import { differenceInMilliseconds, differenceInSeconds } from 'date-fns'
 import { useUserStore } from '@/stores/user'
@@ -83,7 +83,7 @@ const progress = computed(() => {
     return (now.value * 100) / total.value
 })
 
-const router = useRouter()
+const router = useIonRouter()
 const buy = () => {
     if (user.value == null) {
         router.push({ name: 'login' })

+ 3 - 3
src/views/HomePage.vue

@@ -194,9 +194,9 @@ import intoIcon from '@/assets/svgs/icon_inter.svg'
 
 import { Swiper, SwiperSlide } from 'swiper/vue'
 import SwiperCore, { Pagination, Autoplay, Parallax, Controller } from 'swiper'
-import { useRouter, useRoute } from 'vue-router'
+import { useRoute } from 'vue-router'
 import { ref, watch, computed } from 'vue'
-import { onIonViewWillEnter } from '@ionic/vue'
+import { useIonRouter, onIonViewWillEnter } from '@ionic/vue'
 import { isAfter, isBefore, parse, getYear, getMonth, getDate, addDays, getTime, format } from 'date-fns'
 import { http } from '@/plugins/http'
 import toast from '@/utils/toast'
@@ -208,7 +208,7 @@ import { init as initEruda } from '@/utils/console'
 import { emitter } from '@/utils/eventBus'
 import { getUtcTime } from '@/plugins/time'
 
-const router = useRouter()
+const router = useIonRouter()
 
 SwiperCore.use([Pagination, Autoplay])
 

+ 2 - 2
src/views/LoginPage.vue

@@ -59,9 +59,9 @@
 
                 <div class="btns">
                     <div class="btn-left">
-                        <span @click="$router.replace('/register')">{{ $t('loginPage.goRegister') }}</span>
+                        <span @click="$router.replace({ name: 'register' })">{{ $t('loginPage.goRegister') }}</span>
                     </div>
-                    <div class="btn-right" @click="$router.replace('/loginPhone')">
+                    <div class="btn-right" @click="$router.replace({ name: 'loginPhone' })">
                         {{ $t('loginPage.loginByCode') }}
                     </div>
                 </div>

+ 2 - 2
src/views/MinePage.vue

@@ -187,7 +187,7 @@
 <script setup>
 import { computed } from 'vue'
 import { useUserStore } from '@/stores/user'
-import { useRouter } from 'vue-router'
+import { useIonRouter } from '@ionic/vue'
 import defaultAvatar from '@/assets/png_moren.png'
 import { ref, watch } from 'vue'
 import { http } from '@/plugins/http'
@@ -199,7 +199,7 @@ const user = computed(() => {
     return userStore.user
 })
 
-const router = useRouter()
+const router = useIonRouter()
 const goLogin = () => {
     router.push({ name: 'login' })
 }

+ 2 - 1
src/views/NewsDetailPage.vue

@@ -17,7 +17,8 @@
     </ion-page>
 </template>
 <script setup>
-import { useRouter, useRoute } from 'vue-router'
+import { useRoute } from 'vue-router'
+import { useIonRouter } from '@ionic/vue'
 import { ref } from 'vue'
 import { http } from '@/plugins/http'
 

+ 2 - 2
src/views/NewsPage.vue

@@ -32,7 +32,7 @@
 <script setup>
 import emptyIcon from '../assets/img_empty.png'
 import { ref, getCurrentInstance, onMounted, computed } from 'vue'
-import { useRouter } from 'vue-router'
+import { useIonRouter } from '@ionic/vue'
 import useList from '../plugins/list'
 const { empty, loading, finished, list, getData } = useList('/article/all', () => {
     return {
@@ -45,7 +45,7 @@ const { empty, loading, finished, list, getData } = useList('/article/all', () =
 onMounted(() => {
     getData(true)
 })
-const router = useRouter()
+const router = useIonRouter()
 function detail(item) {
     router.push({
         name: 'newsDetail',

+ 1 - 1
src/views/ProductDetailPage.vue

@@ -211,7 +211,7 @@ const pay = () => {
     })
         .then(res => {
             toast.clear()
-            router.push({
+            router.replace({
                 name: 'orderDetail',
                 query: {
                     id: res.id

+ 2 - 2
src/views/RankPage.vue

@@ -111,7 +111,7 @@ import { Vue3Lottie } from 'vue3-lottie'
 import prizeJSON from '@/assets/lottie/prize.json'
 import '@/styles/animate.css'
 import rankBg from '@/assets/png-bg-paihang-xiahua.jpg'
-import { useRouter } from 'vue-router'
+import { useIonRouter } from '@ionic/vue'
 import { accMul } from '@/plugins/calc.js'
 
 const rankImg = [rank1, rank2, rank3]
@@ -192,7 +192,7 @@ function getRank() {
     })
 }
 
-const router = useRouter()
+const router = useIonRouter()
 function goInvite() {
     router.replace({ path: '/distribution1', query: { showShare: true } })
 }

+ 5 - 4
src/views/RegisterPage.vue

@@ -132,7 +132,9 @@
                 </div>
 
                 <div class="btns">
-                    <div class="btn-right" @click="$router.replace('/login')">{{ $t('loginPage.loginNow') }}</div>
+                    <div class="btn-right" @click="$router.replace({ name: 'login' })">
+                        {{ $t('loginPage.loginNow') }}
+                    </div>
                 </div>
             </van-form>
         </ion-content>
@@ -186,7 +188,6 @@ export default {
     },
     beforeRouteEnter(to, from) {
         fromRoute = from
-        console.log(to, from)
     },
     methods: {
         sendPhone(e) {
@@ -222,7 +223,7 @@ export default {
                             fromRoute.name === 'login' ||
                             fromRoute.name === 'loginPhone'
                         ) {
-                            this.$router.replace('/home')
+                            this.$router.replace({ name: 'home' })
                         } else {
                             this.$router.back()
                         }
@@ -235,7 +236,7 @@ export default {
                 })
         },
         agreement() {
-            this.$router.push('/rule')
+            this.$router.push({ name: 'rule' })
         }
     }
 }