Parcourir la source

分享跳转逻辑

dxz1228 il y a 2 ans
Parent
commit
db22e3c717

+ 1 - 1
src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -67,7 +67,7 @@ function getPhoneNumber(e) {
67
               Cache.clear('SHARE_ID')
67
               Cache.clear('SHARE_ID')
68
               if (redirectPageObj) {
68
               if (redirectPageObj) {
69
                 if (redirectPageObj.type === 'page') {
69
                 if (redirectPageObj.type === 'page') {
70
-                  return uni.redirectTo({
70
+                  return uni.reLaunch({
71
                     url: redirectPageObj.page
71
                     url: redirectPageObj.page
72
                   })
72
                   })
73
                 }
73
                 }

+ 1 - 1
src/components/FNavBar/FNavBar.vue

@@ -36,7 +36,7 @@ const {
36
         <div v-if="hasLeft" class="f-nav-bar-left" :class="clickableClassName" :hover-class="props.clickable ? 'f-nav-bar-clickable-hover' : ''" @click="clickLeftHandler">
36
         <div v-if="hasLeft" class="f-nav-bar-left" :class="clickableClassName" :hover-class="props.clickable ? 'f-nav-bar-clickable-hover' : ''" @click="clickLeftHandler">
37
           <slot v-if="$slots.left" name="left" />
37
           <slot v-if="$slots.left" name="left" />
38
           <template v-else>
38
           <template v-else>
39
-            <div v-if="props.leftArrow" class="f-nav-bar-icon mr-1 i-tabler-chevron-left" />
39
+            <div v-if="props.leftArrow" class="f-nav-bar-icon mr-1 "><nut-icon name="rect-left" size="20"></nut-icon></div>
40
             <span v-if="props.leftText" class="f-nav-bar-text">{{ props.leftText }}</span>
40
             <span v-if="props.leftText" class="f-nav-bar-text">{{ props.leftText }}</span>
41
           </template>
41
           </template>
42
         </div>
42
         </div>

+ 1 - 1
src/pages/store/home/components/MerchantProductCard.vue

@@ -48,7 +48,7 @@ const is148Merchant = computed(() => {
48
 <template>
48
 <template>
49
   <div class="bg-white rounded-lg text-dark" :class="[props.exClass]" :style="[props.exStyle]">
49
   <div class="bg-white rounded-lg text-dark" :class="[props.exClass]" :style="[props.exStyle]">
50
 
50
 
51
-    <image :src="item.image" style="width: 320rpx;height: 320rpx;" :fade-in="true"></image>
51
+    <image :src="item.image" class="rounded-t-lg" style="width: 342rpx;height: 342rpx;" :fade-in="true"></image>
52
 
52
 
53
     <div class="text-sm p-2 flex flex-col gap-1">
53
     <div class="text-sm p-2 flex flex-col gap-1">
54
       <div class=" text_unshow">
54
       <div class=" text_unshow">

+ 5 - 5
src/pages/store/product/detail.vue

@@ -374,7 +374,7 @@ function handleShowMerchant(merId: string) {
374
 }
374
 }
375
 
375
 
376
 function handleShowShopCart() {
376
 function handleShowShopCart() {
377
-  uni.switchTab({
377
+  uni.reLaunch({
378
     url: `/pages/order_addcart/index`
378
     url: `/pages/order_addcart/index`
379
   })
379
   })
380
 }
380
 }
@@ -439,7 +439,7 @@ function handleCreateShopping() {
439
         icon: 'none'
439
         icon: 'none'
440
       })
440
       })
441
       setTimeout(() => {
441
       setTimeout(() => {
442
-        uni.redirectTo({
442
+        uni.navigateTo({
443
           url: '/pages/user/login/index?key=4'
443
           url: '/pages/user/login/index?key=4'
444
         })
444
         })
445
       }, 500)
445
       }, 500)
@@ -478,7 +478,7 @@ function handleBuyshow() {
478
         icon: 'none'
478
         icon: 'none'
479
       })
479
       })
480
       setTimeout(() => {
480
       setTimeout(() => {
481
-        uni.redirectTo({
481
+        uni.navigateTo({
482
           url: '/pages/user/login/index?key=4'
482
           url: '/pages/user/login/index?key=4'
483
         })
483
         })
484
       }, 500)
484
       }, 500)
@@ -525,7 +525,7 @@ function handleAddshow() {
525
         icon: 'none'
525
         icon: 'none'
526
       })
526
       })
527
       setTimeout(() => {
527
       setTimeout(() => {
528
-        uni.redirectTo({
528
+        uni.navigateTo({
529
           url: '/pages/user/login/index?key=4'
529
           url: '/pages/user/login/index?key=4'
530
         })
530
         })
531
       }, 500)
531
       }, 500)
@@ -577,7 +577,7 @@ function handleOrderConfirm(flag: '1' | '2' | '3' | '5') {
577
         icon: 'none'
577
         icon: 'none'
578
       }).then(() => {
578
       }).then(() => {
579
         setTimeout(() => {
579
         setTimeout(() => {
580
-          uni.redirectTo({
580
+          uni.navigateTo({
581
             url: '/pages/user/login/index?key=4'
581
             url: '/pages/user/login/index?key=4'
582
           })
582
           })
583
         }, 500)
583
         }, 500)

+ 1 - 1
src/pages/user/login/index.vue

@@ -84,7 +84,7 @@ async function handleWexinLogin() {
84
                 if (redirectPageObj) {
84
                 if (redirectPageObj) {
85
                   console.log('我存在吗333',redirectPageObj);
85
                   console.log('我存在吗333',redirectPageObj);
86
                   if (redirectPageObj.type === 'page') {
86
                   if (redirectPageObj.type === 'page') {
87
-                    return uni.redirectTo({
87
+                    return uni.reLaunch({
88
                       url: redirectPageObj.page
88
                       url: redirectPageObj.page
89
                     })
89
                     })
90
                   }
90
                   }

+ 1 - 1
src/pages/user/login/other-phone.vue

@@ -186,7 +186,7 @@ function handleLogin() {
186
     setTimeout(() => {
186
     setTimeout(() => {
187
       if (redirectPageObj) {
187
       if (redirectPageObj) {
188
         if (redirectPageObj.type === 'page') {
188
         if (redirectPageObj.type === 'page') {
189
-          return uni.redirectTo({
189
+          return uni.reLaunch({
190
             url: redirectPageObj.page
190
             url: redirectPageObj.page
191
           })
191
           })
192
         }
192
         }