Compare commits

..

No commits in common. "14f82809f685dc9d54f02476b1ba5dbfde305f86" and "c53f72be5e830b36139d7dfc3d75f316e2e97273" have entirely different histories.

2 changed files with 4 additions and 23 deletions

View File

@ -6,31 +6,16 @@
<script setup> <script setup>
import { reactive, ref, watch, defineProps } from 'vue' import { reactive, ref, watch, defineProps } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex'
const store = useStore()
const router = useRouter() const router = useRouter()
console.log('router------------>', router)
const props = defineProps({ const props = defineProps({
textColor: { type: String, default: '' }, textColor: { type: String, default: '' },
}) })
const previousPage = () => { const previousPage = () => {
// debugger window.history.go(-1)
// let a =store.state.previousRouter
// if (store.state.previousRouter.name) {
// this.$router.push({name: this.$store.state.previousRouter.name});
// }
// // let val = router.go(-1)
window.history.go(-1)
} }
// router.beforeEach((to, from, next) => {
// debugger
// // console.log('=========>', to, from, next)
// document.documentElement.scrollTop = 0
// document.body.scrollTop = 0
// next()
// })
</script> </script>
<style scoped lang="less"> <style scoped lang="less">

View File

@ -32,7 +32,7 @@
</div> </div>
<div class="flex-row-center"> <div class="flex-row-center">
<div class="bg cjtd"> <div class="bg cjtd">
<img :preview="false" :src="bgImg" /> <a-image :preview="false" :src="bgImg" />
</div> </div>
<div class="content" style="margin-left: 0.5rem"> <div class="content" style="margin-left: 0.5rem">
@ -560,11 +560,7 @@
width: 5.75rem; width: 5.75rem;
height: 3.4rem; height: 3.4rem;
background: url('~@/assets/home/fn/cjtd.png') no-repeat; background: url('~@/assets/home/fn/cjtd.png') no-repeat;
background-size: 100%; background-size: 100%;
}
.cjtd img{
width:100%;
height:100%
} }
.content { .content {