Hooke / tswj

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
13be25c1 1 parent d3cbad9a

fix 调整

Inline Side-by-side
Showing 2 changed files with 7 additions and 11 deletions
1 <!-- 1 <!--
2 * @Date: 2022-06-25 03:29:05 2 * @Date: 2022-06-25 03:29:05
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-06-25 11:19:40 4 + * @LastEditTime: 2022-06-25 15:50:08
5 * @FilePath: /tswj/src/components/FlowerIcon/index.vue 5 * @FilePath: /tswj/src/components/FlowerIcon/index.vue
6 * @Description: 文件描述 6 * @Description: 文件描述
7 --> 7 -->
8 <template> 8 <template>
9 - <div :class="[type === 'center' ? 'global-center' : 'flower']" @click="goTo"> 9 + <div :class="[type === 'center' ? 'global-center' : 'flower']">
10 <van-icon :name="icon_flower" color="#c5c5c5" size="1.25rem" :style="{ verticalAlign: align }" /> 10 <van-icon :name="icon_flower" color="#c5c5c5" size="1.25rem" :style="{ verticalAlign: align }" />
11 <span :style="{ color, fontSize }">&nbsp;{{ qty }}</span> 11 <span :style="{ color, fontSize }">&nbsp;{{ qty }}</span>
12 </div> 12 </div>
...@@ -25,10 +25,6 @@ const props = defineProps({ ...@@ -25,10 +25,6 @@ const props = defineProps({
25 type: String, 25 type: String,
26 fontSize: String 26 fontSize: String
27 }) 27 })
28 -const emit = defineEmits(['on-click']);
29 -const goTo = () => {
30 - emit('on-click', true)
31 -}
32 </script> 28 </script>
33 29
34 <style lang="less" scoped> 30 <style lang="less" scoped>
......
...@@ -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-06-25 12:24:11 5 + * @LastEditTime: 2022-06-25 20:13:49
6 * @FilePath: /tswj/src/components/RankingItem/index.vue 6 * @FilePath: /tswj/src/components/RankingItem/index.vue
7 --> 7 -->
8 <template> 8 <template>
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
15 </div> 15 </div>
16 </van-col> 16 </van-col>
17 <van-col span="18" class="content-wrapper"> 17 <van-col span="18" class="content-wrapper">
18 - <div :class="[rankInfo.multi_name ? 'height3rem' : 'height3rem', 'kg-name']" 18 + <div :class="['height3rem', 'kg-name']" @click="go('/client/chooseBook', { kg_id: rankInfo.id })">
19 - @click="go('/client/chooseBook', { kg_id: rankInfo.id })">
20 <van-row align="center" justify="center" style="position: relative; top: 50%; transform: translateY(-50%);"> 19 <van-row align="center" justify="center" style="position: relative; top: 50%; transform: translateY(-50%);">
21 <van-col span="4"> 20 <van-col span="4">
22 <van-image round width="3rem" height="3rem" :src="rankInfo.logo ? rankInfo.logo : icon_logo" 21 <van-image round width="3rem" height="3rem" :src="rankInfo.logo ? rankInfo.logo : icon_logo"
...@@ -24,7 +23,7 @@ ...@@ -24,7 +23,7 @@
24 </van-col> 23 </van-col>
25 <van-col span="20"> 24 <van-col span="20">
26 <div v-if="rankInfo.multi_name" style="margin-left: 0.5rem;"> 25 <div v-if="rankInfo.multi_name" style="margin-left: 0.5rem;">
27 - <p>{{ rankInfo.multi_name[0] }}<br />{{ rankInfo.multi_name[1] }}</p> 26 + <p>{{ rankInfo.multi_name[0] }}<br>{{ rankInfo.multi_name[1] }}</p>
28 </div> 27 </div>
29 <p v-else style="margin-left: 0.5rem;"> 28 <p v-else style="margin-left: 0.5rem;">
30 {{ rankInfo.name }} 29 {{ rankInfo.name }}
...@@ -34,7 +33,8 @@ ...@@ -34,7 +33,8 @@
34 </div> 33 </div>
35 </van-col> 34 </van-col>
36 <van-col> 35 <van-col>
37 - <flower-icon type="right" :qty="rankInfo.qty" align="text-bottom" @on-click="onFlowerClick" /> 36 + <flower-icon type="right" :qty="rankInfo.qty" align="text-bottom"
37 + @click="go('/client/donateList', { kg_id: rankInfo.id })" />
38 </van-col> 38 </van-col>
39 </van-row> 39 </van-row>
40 </div> 40 </div>
......