Hooke / tswj

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
0a49c07f 1 parent a6a27d15

馃悶 fix: 瀛楁闂璋冩暣

Inline Side-by-side
Showing 3 changed files with 11 additions and 9 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-30 10:20:34 3 * @Date: 2022-05-30 10:20:34
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-05-31 17:38:37 5 + * @LastEditTime: 2022-06-01 15:15:00
6 * @FilePath: /tswj/src/components/RankingList/index.vue 6 * @FilePath: /tswj/src/components/RankingList/index.vue
7 --> 7 -->
8 <template> 8 <template>
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
20 <div :class="[rankInfo.multi_name ? 'height6rem' : 'height3rem', 'kg-name']" @click="go('/client/chooseBook', { kg_id: rankInfo.id })"> 20 <div :class="[rankInfo.multi_name ? 'height6rem' : 'height3rem', 'kg-name']" @click="go('/client/chooseBook', { kg_id: rankInfo.id })">
21 <van-row align="center" justify="center" style="position: relative; top: 50%; transform: translateY(-50%);"> 21 <van-row align="center" justify="center" style="position: relative; top: 50%; transform: translateY(-50%);">
22 <van-col span="4"> 22 <van-col span="4">
23 - <van-image round width="3rem" height="3rem" :src="rankInfo.logo ? rankInfo.logo : icon_avatar" style="vertical-align: text-bottom;" /> 23 + <van-image round width="3rem" height="3rem" :src="rankInfo.logo ? rankInfo.logo : icon_logo" style="vertical-align: text-bottom;" />
24 </van-col> 24 </van-col>
25 <van-col span="20"> 25 <van-col span="20">
26 <div v-if="rankInfo.multi_name" style="margin-left: 0.5rem;"> 26 <div v-if="rankInfo.multi_name" style="margin-left: 0.5rem;">
27 - <p>{{ rankInfo.multi_name[0] }}</p> 27 + <p style="line-height: 2;">{{ rankInfo.multi_name[0] }}</p>
28 <p>{{ rankInfo.multi_name[1] }}</p> 28 <p>{{ rankInfo.multi_name[1] }}</p>
29 </div> 29 </div>
30 <p v-else style="margin-left: 0.5rem;"> 30 <p v-else style="margin-left: 0.5rem;">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 </van-col> 36 </van-col>
37 <van-col span="2"> 37 <van-col span="2">
38 <div class="flower" @click="go('/client/donateList', { kg_id: rankInfo.id })"> 38 <div class="flower" @click="go('/client/donateList', { kg_id: rankInfo.id })">
39 - <van-icon :name="icon_flower" color="#c5c5c5" size="1.25rem" style="vertical-align: bottom;" />&nbsp;3000 39 + <van-icon :name="icon_flower" color="#c5c5c5" size="1.25rem" style="vertical-align: bottom;" />&nbsp;{{ rankInfo.qty }}
40 </div> 40 </div>
41 </van-col> 41 </van-col>
42 </van-row> 42 </van-row>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 </template> 44 </template>
45 45
46 <script setup> 46 <script setup>
47 -import { icon_avatar, icon_ranking1, icon_ranking2, icon_ranking3, icon_flower } from '@/utils/generateIcons.js' 47 +import { icon_logo, icon_ranking1, icon_ranking2, icon_ranking3, icon_flower } from '@/utils/generateIcons.js'
48 48
49 import { ref } from 'vue' 49 import { ref } from 'vue'
50 import _ from 'lodash' 50 import _ from 'lodash'
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-17 11:34:35 3 * @Date: 2022-05-17 11:34:35
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-05-31 17:38:05 5 + * @LastEditTime: 2022-06-01 13:49:40
6 * @FilePath: /tswj/src/utils/generateIcons.js 6 * @FilePath: /tswj/src/utils/generateIcons.js
7 * @Description: 鍥炬爣闆嗗悎 7 * @Description: 鍥炬爣闆嗗悎
8 */ 8 */
...@@ -12,7 +12,8 @@ import icon_down from '@images/icon-zhankai@2x.png' ...@@ -12,7 +12,8 @@ import icon_down from '@images/icon-zhankai@2x.png'
12 import icon_subscribed from '@images/icon-dingyue01@2x.png' 12 import icon_subscribed from '@images/icon-dingyue01@2x.png'
13 import icon_unsubscribe from '@images/icon-dingyue02@2x.png' 13 import icon_unsubscribe from '@images/icon-dingyue02@2x.png'
14 import no_image from '@images/que-shuju@2x.png' 14 import no_image from '@images/que-shuju@2x.png'
15 -import icon_avatar from '@images/que-logo@2x.png' 15 +import icon_avatar from '@images/que-touxiang@2x.png'
16 +import icon_logo from '@images/que-logo@2x.png'
16 import icon_dianzan1 from '@images/icon-dianzan01@2x.png' 17 import icon_dianzan1 from '@images/icon-dianzan01@2x.png'
17 import icon_dianzan2 from '@images/icon-dianzan02@2x.png' 18 import icon_dianzan2 from '@images/icon-dianzan02@2x.png'
18 import icon_shoucang1 from '@images/icon-shoucang01@2x.png' 19 import icon_shoucang1 from '@images/icon-shoucang01@2x.png'
...@@ -35,6 +36,7 @@ export { ...@@ -35,6 +36,7 @@ export {
35 icon_unsubscribe, 36 icon_unsubscribe,
36 no_image, 37 no_image,
37 icon_avatar, 38 icon_avatar,
39 + icon_logo,
38 icon_dianzan1, 40 icon_dianzan1,
39 icon_dianzan2, 41 icon_dianzan2,
40 icon_liuyan, 42 icon_liuyan,
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 </van-image> 15 </van-image>
16 <van-image 16 <van-image
17 v-else round width="3rem" height="3rem" lazy-load 17 v-else round width="3rem" height="3rem" lazy-load
18 - :src="icon_avatar" 18 + :src="icon_logo"
19 style="vertical-align: text-bottom" 19 style="vertical-align: text-bottom"
20 > 20 >
21 <template #error> 21 <template #error>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 </template> 65 </template>
66 66
67 <script setup> 67 <script setup>
68 -import { no_image, icon_avatar } from '@/utils/generateIcons'; 68 +import { no_image, icon_logo } from '@/utils/generateIcons';
69 import { MyButton, ShortcutFixed, BookCard } from '@/utils/generateModules'; 69 import { MyButton, ShortcutFixed, BookCard } from '@/utils/generateModules';
70 import { styleObject3 } from '@/settings/designSetting.js'; 70 import { styleObject3 } from '@/settings/designSetting.js';
71 import { useBookList, useShortcutBar } from '@/composables'; 71 import { useBookList, useShortcutBar } from '@/composables';
......