e6d22845 by lxs

Merge branch 'develop' into release-test

2 parents 4d3118ee d3c1d9c8
...@@ -28,6 +28,7 @@ const path = route.path; ...@@ -28,6 +28,7 @@ const path = route.path;
28 28
29 const loading = ref(false); 29 const loading = ref(false);
30 const defaultItemLogo = new URL('@/assets/images/home-finance-product.png', import.meta.url).href 30 const defaultItemLogo = new URL('@/assets/images/home-finance-product.png', import.meta.url).href
31 const sjsLogo = new URL('@/assets/images/sjs-logo.png', import.meta.url).href
31 const carouselInfo: any = ref({ 32 const carouselInfo: any = ref({
32 list: [], 33 list: [],
33 height: '172px', 34 height: '172px',
...@@ -541,7 +542,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -541,7 +542,7 @@ const rejectDialogBtnClick = (btn, info) => {
541 @click="btnClick({ value: 'search', ...item })" v-preReClick> 542 @click="btnClick({ value: 'search', ...item })" v-preReClick>
542 <div class="title" :class="{ active: exchangGuid == item.exchangeGuid }"> 543 <div class="title" :class="{ active: exchangGuid == item.exchangeGuid }">
543 <img class="left-img" 544 <img class="left-img"
544 :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo" alt="" /> 545 :src="item.exchangeName.indexOf('门户') > -1 ? sjsLogo : defaultItemLogo" alt="" />
545 <span>{{ item.exchangeName ?? '--' }}</span> 546 <span>{{ item.exchangeName ?? '--' }}</span>
546 </div> 547 </div>
547 <div class="count-group"> 548 <div class="count-group">
...@@ -754,7 +755,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -754,7 +755,7 @@ const rejectDialogBtnClick = (btn, info) => {
754 } 755 }
755 756
756 img { 757 img {
757 width: 20px; 758 width: 24px;
758 margin-right: 16px; 759 margin-right: 16px;
759 } 760 }
760 761
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!