Hooke / tswj

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
5d150efe 1 parent 8ceea18e

🐞 fix: 反馈意见修改

Inline Side-by-side
Showing 6 changed files with 62 additions and 36 deletions
<template>
<div class="video-wrapper" style="position: relative;">
<!-- FIXME: 反馈意见：需要更改图片 -->
<div v-if="mp && detail.showStatus" class="status">
<van-image v-if="item.status === 'ENABLE'" round width="6rem" height="6rem" style="vertical-align: bottom;" :src="icon_enable" />
<van-image v-if="item.status === 'REFUSE'" round width="6rem" height="6rem" style="vertical-align: bottom;" :src="icon_refuse" />
......@@ -31,6 +32,7 @@
</van-col>
</van-row>
</div>
<!-- FIXME: 反馈意见：显示书名+语言 -->
<div @click="goTo" style="color: #999999; padding: 0px 1rem 0.5rem;">{{ item.kg_name }} ｜ {{ item.localism_type }}
</div>
</div>
......
......@@ -4,10 +4,10 @@
<div class="belong-school">
<van-row align="center" justify="center" style="position: relative; top: 50%; transform: translateY(-50%);">
<van-col span="2">
<van-image v-if="kgInfo.logo" round width="2rem" height="2rem" lazy-load :src="kgInfo.logo" style="vertical-align: text-bottom;" >
<van-image v-if="kgInfo.logo" round width="3rem" height="3rem" lazy-load :src="kgInfo.logo" style="vertical-align: text-bottom;" >
<template v-slot:error>加载失败</template>
</van-image>
<van-image v-else round width="2rem" height="2rem" lazy-load :src="icon_avatar" style="vertical-align: text-bottom;" >
<van-image v-else round width="3rem" height="3rem" lazy-load :src="icon_avatar" style="vertical-align: text-bottom;" >
<template v-slot:error>加载失败</template>
</van-image>
</van-col>
......@@ -23,13 +23,13 @@
<van-row class="van-hairline--bottom">
<van-col span="12" class="van-hairline--right">
<div class="text-box">
<span class="text">视频上传</span>
<span class="text bg-gradient">视频上传</span>
<span class="number">&nbsp;{{ kgInfo.mission_num }}<span style="color: #888888;">/{{ kgInfo.mission_target }}</span></span>
</div>
</van-col>
<van-col span="12">
<div class="text-box">
<span class="text">作品总数</span>
<span class="text bg-gradient">作品总数</span>
<span class="number">&nbsp;{{ kgInfo.prod_num }}</span>
</div>
</van-col>
......@@ -37,13 +37,13 @@
<van-row>
<van-col span="12" class="van-hairline--right">
<div class="text-box">
<span class="text">捐书金额</span>
<span class="text bg-gradient">捐书金额</span>
<span class="number">&nbsp;¥&nbsp;{{ kgInfo.donate_amt }}</span>
</div>
</van-col>
<van-col span="12">
<div class="text-box">
<span class="text">参与人数</span>
<span class="text bg-gradient">参与人数</span>
<span class="number">&nbsp;{{ kgInfo.perf_num }}</span>
</div>
</van-col>
......@@ -56,7 +56,7 @@
<div class="header van-hairline--bottom">
<van-row>
<van-col span="8" class="left">
<span class="text" style="border-bottom: 2px solid #F9D95C;">所有书籍</span>
<span class="text bg-gradient">所有书籍</span>
</van-col>
<van-col span="8"></van-col>
<van-col span="8" class="right">
......@@ -161,7 +161,7 @@ export default {
color: #222222;
display: inline-block;
vertical-align: super;
margin-left: 1rem;
margin-left: 2rem;
}
}
......@@ -177,15 +177,24 @@ export default {
text-align: center;
color: #713610;
.text-box {
padding: 1.5rem 2rem;
padding: 1.5rem 1rem;
overflow: auto;
.text {
color: #222222;
border-bottom: 2px solid @base-color;
// border-bottom: 3px solid @base-color;
// text-decoration: underline;
// text-decoration-color: @base-color;
font-size: 0.85rem;
display: block;
float: left;
}
.bg-gradient {
background: linear-gradient(@base-color, @base-color) no-repeat;
/*调整下划线的宽度占百分之百 高度是3px */
background-size: 100% 3px;
/* 调整下划线的起始位置 左侧是0 上边是1.15em */
background-position: 0 1.15em;
}
.number {
display: block;
float: right;
......@@ -213,6 +222,13 @@ export default {
color: #888888;
font-size: 0.9rem;
}
.bg-gradient {
background: linear-gradient(@base-color, @base-color) no-repeat;
/*调整下划线的宽度占百分之百 高度是3px */
background-size: 100% 3px;
/* 调整下划线的起始位置 左侧是0 上边是1.15em */
background-position: 0 1.2rem;
}
}
}
.ding {
......
......@@ -200,6 +200,7 @@ const themeVars = {
buttonPrimaryBackground: '#F9D95C',
buttonPrimaryBorderColor: '#F9D95C',
buttonPrimaryColor: '#713610',
CellVerticalPadding: '14px'
};
</script>
......@@ -277,8 +278,8 @@ body {
background-color: @base-color;
text-align: center;
color: #713610;
font-size: 2vh;
padding: 1vh;
font-size: 2.25vh;
padding: 1.5vh;
border-radius: 5px;
}
}
......
<template>
<div class="book-detail-page content-bg">
<div class="modify-top"></div>
<div style="height: 1.5rem;"></div>
<div class="book-detail">
<div style="text-align: center;">
<van-image width="220" height="220" :src="bookInfo.cover" />
......@@ -73,15 +74,20 @@
<div style="height: 6rem;"></div>
<div class="book-bar">
<div @click="onSubscribe" class="text">
<van-icon v-if="!bookInfo.is_subscribe" :name="icon_subscribed" size="1.25rem" style="margin: 0 auto;" />
<van-icon v-else :name="icon_unsubscribe" size="1.25rem" style="margin: 0 auto;" />
<span style="font-size: 0.85rem;">订阅</span>
<template v-if="!bookInfo.is_subscribe">
<van-icon :name="icon_subscribed" size="1.25rem" style="margin: 0 auto;" />
<span style="font-size: 0.85rem;">订阅</span>
</template>
<template v-else>
<van-icon :name="icon_unsubscribe" size="1.25rem" style="margin: 0 auto;" />
<span style="font-size: 0.85rem;">已订阅</span>
</template>
</div>
<div class="button">
<my-button @on-click="toDonate" type="plain">爱心捐书</my-button>
<my-button @on-click="uploadVideo" type="primary">上传作品</my-button>
</div>
<div class="button">
<my-button @on-click="uploadVideo" type="primary">上传作品</my-button>
<my-button @on-click="toDonate" type="plain">爱心捐书</my-button>
</div>
</div>
<shortcut-fixed type="C" :item="['home', 'me']"></shortcut-fixed>
......@@ -316,11 +322,13 @@ export default {
color: #222222;
font-size: 1.25rem;
font-weight: bold;
margin-bottom: 0.5rem;
}
#book-intro {
color: #333333;
margin-top: 0.25rem;
line-height: 1.7;
}
.book-toggle-icon {
......
<template>
<div class="choose-book-page content-bg">
<div class="modify-top"></div>
<div class="belong-school">
<template v-if="kg_id">
<van-row align="center" justify="center" style="position: relative; top: 50%; transform: translateY(-50%);">
<van-col span="2">
<van-image v-if="kgInfo.logo" round width="2rem" height="2rem" lazy-load :src="kgInfo.logo" style="vertical-align: text-bottom;">
<template v-slot:error>加载失败</template>
</van-image>
<van-image v-else round width="2rem" height="2rem" lazy-load :src="icon_avatar" style="vertical-align: text-bottom;">
<template v-slot:error>加载失败</template>
</van-image>
</van-col>
<van-col span="22">
<p class="title">{{ kgInfo.name }}</p>
</van-col>
</van-row>
</template>
<div class="belong-school" v-if="kg_id">
<van-row align="center" justify="center" style="position: relative; top: 50%; transform: translateY(-50%);">
<van-col span="2">
<van-image v-if="kgInfo.logo" round width="3rem" height="3rem" lazy-load :src="kgInfo.logo" style="vertical-align: text-bottom;">
<template v-slot:error>加载失败</template>
</van-image>
<van-image v-else round width="3rem" height="3rem" lazy-load :src="icon_avatar" style="vertical-align: text-bottom;">
<template v-slot:error>加载失败</template>
</van-image>
</van-col>
<van-col span="22">
<p class="title">{{ kgInfo.name }}</p>
</van-col>
</van-row>
</div>
<div v-else style="height: 2.5rem;"></div>
<div style="position: relative;">
<div class="ding left"></div>
<div style="position: relative; z-index: 100;">
......@@ -111,7 +110,7 @@ const onClick = (item) => {
color: #222222;
display: inline-block;
vertical-align: super;
margin-left: 1rem;
margin-left: 2rem;
}
}
......
......@@ -11,10 +11,10 @@
<p>共读这么精彩的书籍</p>
</div>
<div v-if="book_id" style="padding: 0 15% 0.5rem 15%;">
<my-button @on-click="toDonate" type="plain">我要爱心捐书</my-button>
<my-button @on-click="toDonate" type="primary">我要爱心捐书</my-button>
</div>
<div style="padding: 0 15% 1rem 15%;">
<my-button @on-click="goBack" type="primary">返回</my-button>
<my-button @on-click="goBack" type="plain">返回</my-button>
</div>
</div>
......