fix
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
<div class="view" ref="viewRef" :style="viewStyle"><RouteCache /></div>
|
<div class="view" ref="viewRef" :style="viewStyle"><RouteCache /></div>
|
||||||
<login-dialog />
|
<login-dialog />
|
||||||
<div id="loading" v-if="loading" v-loading="true"></div>
|
<div id="loading" v-if="loading" v-loading="true"></div>
|
||||||
|
<shopping-drawer />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
@@ -11,6 +12,7 @@
|
|||||||
import MainHeader from '@/views/main-header.vue'
|
import MainHeader from '@/views/main-header.vue'
|
||||||
import LoginDialog from '@/views/login/login-dialog.vue'
|
import LoginDialog from '@/views/login/login-dialog.vue'
|
||||||
import { useGlobalStore } from '@/stores'
|
import { useGlobalStore } from '@/stores'
|
||||||
|
import ShoppingDrawer from '@/views/shopping-drawer.vue'
|
||||||
const globalStore = useGlobalStore()
|
const globalStore = useGlobalStore()
|
||||||
const loading = computed(() => globalStore.state.loading)
|
const loading = computed(() => globalStore.state.loading)
|
||||||
const viewRef = ref()
|
const viewRef = ref()
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
|
|||||||
import CommodityList from "./commodity-list.vue";
|
import CommodityList from "./commodity-list.vue";
|
||||||
import MerchantInfo from "./merchant-info.vue";
|
import MerchantInfo from "./merchant-info.vue";
|
||||||
import { useRouter } from "vue-router";
|
import { useRouter } from "vue-router";
|
||||||
|
import myEvent from '@/utils/myEvent'
|
||||||
//const props = defineProps({
|
//const props = defineProps({
|
||||||
//})
|
//})
|
||||||
//const emit = defineEmits([
|
//const emit = defineEmits([
|
||||||
@@ -10,7 +11,9 @@ import { useRouter } from "vue-router";
|
|||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
let data = reactive({
|
let data = reactive({
|
||||||
})
|
})
|
||||||
const addShopping = (item) => {}
|
const addShopping = (item) => {
|
||||||
|
myEvent.emit('addShopping', item)
|
||||||
|
}
|
||||||
const openDetail = (item) => {
|
const openDetail = (item) => {
|
||||||
router.push({name: 'digitalDetail', params: {id: item.id}})
|
router.push({name: 'digitalDetail', params: {id: item.id}})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,9 @@ import feelingWithAiDA from "./feelingWithAiDA.vue";
|
|||||||
import CommodityItem from "@/components/CommodityItem.vue";
|
import CommodityItem from "@/components/CommodityItem.vue";
|
||||||
//const props = defineProps({
|
//const props = defineProps({
|
||||||
//})
|
//})
|
||||||
//const emit = defineEmits([
|
const emit = defineEmits([
|
||||||
//])
|
'addShopping'
|
||||||
|
])
|
||||||
let data = reactive({
|
let data = reactive({
|
||||||
})
|
})
|
||||||
const list = ref([
|
const list = ref([
|
||||||
@@ -27,7 +28,7 @@ const list = ref([
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
const addShopping = (item) => {
|
const addShopping = (item) => {
|
||||||
console.log(item);
|
emit('addShopping', item)
|
||||||
}
|
}
|
||||||
onMounted(()=>{
|
onMounted(()=>{
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
|
import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
|
||||||
import Detail from "./detail/index.vue";
|
import Detail from "./detail/index.vue";
|
||||||
|
import myEvent from '@/utils/myEvent'
|
||||||
//const props = defineProps({
|
//const props = defineProps({
|
||||||
//})
|
//})
|
||||||
//const emit = defineEmits([
|
//const emit = defineEmits([
|
||||||
//])
|
//])
|
||||||
let data = reactive({
|
let data = reactive({
|
||||||
})
|
})
|
||||||
|
const addShopping = (item) => {
|
||||||
|
myEvent.emit('addShopping', item)
|
||||||
|
}
|
||||||
onMounted(()=>{
|
onMounted(()=>{
|
||||||
})
|
})
|
||||||
onUnmounted(()=>{
|
onUnmounted(()=>{
|
||||||
@@ -47,7 +50,7 @@ const {} = toRefs(data);
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<Detail></Detail>
|
<Detail @addShopping="addShopping"></Detail>
|
||||||
</div>
|
</div>
|
||||||
<Footer></Footer>
|
<Footer></Footer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
|
import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
|
||||||
import { useRouter } from "vue-router";
|
import { useRouter } from "vue-router";
|
||||||
import img from "@/assets/images/collectionStory/Rectangle.png";
|
import img from "@/assets/images/collectionStory/Rectangle.png";
|
||||||
import scList from '@/views/shoppingCart/sc-list.vue'
|
import myEvent from '@/utils/myEvent'
|
||||||
|
|
||||||
|
|
||||||
//const props = defineProps({
|
//const props = defineProps({
|
||||||
@@ -12,9 +12,8 @@ import scList from '@/views/shoppingCart/sc-list.vue'
|
|||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
let data = reactive({
|
let data = reactive({
|
||||||
})
|
})
|
||||||
const isShoppingShow = ref(false)
|
|
||||||
const addShopping = (item) => {
|
const addShopping = (item) => {
|
||||||
isShoppingShow.value = true
|
myEvent.emit('addShopping', item)
|
||||||
}
|
}
|
||||||
onMounted(()=>{
|
onMounted(()=>{
|
||||||
})
|
})
|
||||||
@@ -100,9 +99,6 @@ const {} = toRefs(data);
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Footer></Footer>
|
<Footer></Footer>
|
||||||
<el-drawer v-model="isShoppingShow" width="50rem" :close-on-click-modal="false" title="I am the title" :with-header="false">
|
|
||||||
<sc-list is-mini style="flex: 0.6;" @close="isShoppingShow = false"/>
|
|
||||||
</el-drawer>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
|
|||||||
40
src/views/shopping-drawer.vue
Normal file
40
src/views/shopping-drawer.vue
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
|
||||||
|
import myEvent from '@/utils/myEvent'
|
||||||
|
import scList from '@/views/shoppingCart/sc-list.vue'
|
||||||
|
|
||||||
|
//const props = defineProps({
|
||||||
|
//})
|
||||||
|
//const emit = defineEmits([
|
||||||
|
//])
|
||||||
|
let data = reactive({
|
||||||
|
})
|
||||||
|
const isShoppingShow = ref(false)
|
||||||
|
const shoppingClose = () => {
|
||||||
|
isShoppingShow.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(()=>{
|
||||||
|
myEvent.add('addShopping', (item) => {
|
||||||
|
isShoppingShow.value = true
|
||||||
|
console.log(item)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
onUnmounted(()=>{
|
||||||
|
myEvent.remove('addShopping')
|
||||||
|
})
|
||||||
|
defineExpose({})
|
||||||
|
const {} = toRefs(data);
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<el-drawer v-model="isShoppingShow" width="50rem" :close-on-click-modal="false" title="I am the title" :with-header="false">
|
||||||
|
<sc-list is-mini style="flex: 0.6;" @close="shoppingClose"/>
|
||||||
|
</el-drawer>
|
||||||
|
</template>
|
||||||
|
<style lang="less" scoped>
|
||||||
|
.homeNavBox{
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
Reference in New Issue
Block a user