Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/home/detailBack.vue

@@ -6,16 +6,31 @@
 <script setup>
 import { reactive, ref, watch, defineProps } from 'vue'
 import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+const store = useStore()
 const router = useRouter()
-console.log('router------------>', router)
 
 const props = defineProps({
   textColor: { type: String, default: '' },
 })
 
 const previousPage = () => {
-  window.history.go(-1)
+ //        debugger
+// 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>
 
 <style scoped lang="less">

front/src/views/home/integrationServicesDetails.vue

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