Merge remote-tracking branch 'origin/main'

src/components/detail/imageWatch.vue

@@ -2,7 +2,8 @@
     <div class="watch-box" v-show="show">
         <div class="pos-r dis-f al-item mg-t-60">
             <div class="s-w-100">
-                <el-carousel arrow="never" height="600px" :autoplay="false" indicator-position="none" ref="carousel">
+                <el-carousel arrow="never" height="600px" :autoplay="false" :initial-index="props.index"
+                    indicator-position="none" ref="carousel">
                     <el-carousel-item v-for="(item, i) in list" :key="i">
                         <div class="dis-f jus-x al-item" v-if="item">
                             <div class="img-box dis-f jus-x" style="width:600px" v-if="item['type'] != 'attachment'">
@@ -52,6 +53,7 @@ const props = defineProps({
             return []
         }
     },
+    index: Number,
     close: {
         type: Function
     },
@@ -67,6 +69,8 @@ let close = props.close
 
 let carousel = ref(null)
 let imageTab = ref(0)
+
+ if(!props['index']) imageTab = props['index']
 //上一张
 let prev = () => {
     if (imageTab.value === list.value.length - 1) return

src/components/user/systematic-notification-pop.vue

@@ -179,7 +179,7 @@ const handleScroll = (event) => {
 // 点击跳转详情页
 const goDetail = (uniqid, status) => {
     if (status != 1) return
-    router.push(`/detail?uniqid=${uniqid}`);
+    router.push(`/detail?id=${uniqid}`);
 }
 
 </script>