|
|
@@ -40,8 +40,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
-
|
|
|
- <loginComp ref="loginRef" @success="handleSuccess"></loginComp>
|
|
|
+ <goLogin ref="loginRef" @success="handleSuccess"></goLogin>
|
|
|
<!-- 底部 -->
|
|
|
<custom-tab-bar :show="true" :current-index="currentTabIndex" />
|
|
|
</view>
|
|
|
@@ -58,7 +57,7 @@
|
|
|
commonCardList
|
|
|
} from '@/api/my.js'
|
|
|
import CustomTabBar from '@/components/custom-tabbar/index.vue';
|
|
|
- import loginComp from "@/components/loginComp/index.vue"
|
|
|
+ import goLogin from "@/components/goLogin/goLogin.vue"
|
|
|
import {
|
|
|
onLoad,
|
|
|
onShow
|
|
|
@@ -157,7 +156,7 @@
|
|
|
// 兑换码兑换策略
|
|
|
if (getUserIsYouke()) {
|
|
|
// 非登录 -- 登录
|
|
|
- loginRef.value.showPopup()
|
|
|
+ loginRef.value.showDl()
|
|
|
} else {
|
|
|
// 已登录
|
|
|
uni.navigateTo({
|
|
|
@@ -202,8 +201,4 @@
|
|
|
url: '/pages/chanpinShop/index'
|
|
|
})
|
|
|
}
|
|
|
-
|
|
|
- function test() {
|
|
|
- loginRef.value.showPopup()
|
|
|
- }
|
|
|
</script>
|