Skip to content

polysoft-nafmii / polysoft-h5

Go to a project
Commit e19f580a by fanx
Options

fixed conlict

2 parents 4eee56fc ca9244a1
Inline Side-by-side
Showing 9 changed files with 97 additions and 43 deletions
src/assets/css/sprite.less
......@@ -5,35 +5,37 @@
.icon-bg-member-result { width: 1212px; height: 717px; background-position: 0px 0px; }
.icon-bg-member { width: 828px; height: 406px; background-position: -2080px -432px; }
.icon-bg-mine { width: 828px; height: 340px; background-position: -2080px -1238px; }
.icon-center-about { width: 36px; height: 36px; background-position: -2383px -1598px; }
.icon-center-collect { width: 36px; height: 36px; background-position: -2439px -1598px; }
.icon-center-feedback { width: 36px; height: 36px; background-position: -2495px -1598px; }
.icon-center-message { width: 36px; height: 36px; background-position: -2551px -1598px; }
.icon-center-question { width: 36px; height: 36px; background-position: -2607px -1598px; }
.icon-center-setting { width: 36px; height: 36px; background-position: -2663px -1598px; }
.icon-center-study { width: 36px; height: 36px; background-position: -2719px -1598px; }
.icon-center-about { width: 36px; height: 36px; background-position: -2453px -1598px; }
.icon-center-collect { width: 36px; height: 36px; background-position: -2509px -1598px; }
.icon-center-feedback { width: 36px; height: 36px; background-position: -2565px -1598px; }
.icon-center-message { width: 36px; height: 36px; background-position: -2621px -1598px; }
.icon-center-question { width: 36px; height: 36px; background-position: -2677px -1598px; }
.icon-center-setting { width: 36px; height: 36px; background-position: -2733px -1598px; }
.icon-center-study { width: 36px; height: 36px; background-position: -2789px -1598px; }
.icon-change-member { width: 90px; height: 90px; background-position: -1514px -526px; }
.icon-change-membership { width: 1155px; height: 303px; background-position: 0px -737px; }
.icon-change-name { width: 1155px; height: 303px; background-position: 0px -1060px; }
.icon-change-representive { width: 1155px; height: 303px; background-position: 0px -1383px; }
.icon-email { width: 36px; height: 36px; background-position: -2775px -1598px; }
.icon-empty { width: 36px; height: 36px; background-position: -2831px -1598px; }
.icon-icon-arrow-right { width: 10px; height: 18px; background-position: -2887px -1598px; }
.icon-icon-classify { width: 30px; height: 30px; background-position: -1396px -670px; }
.icon-icon-clock { width: 30px; height: 30px; background-position: -1446px -670px; }
.icon-email { width: 36px; height: 36px; background-position: -2845px -1598px; }
.icon-empty { width: 36px; height: 36px; background-position: -1910px -526px; }
.icon-filter { width: 44px; height: 50px; background-position: -2324px -1598px; }
.icon-icon-arrow-right { width: 10px; height: 18px; background-position: -1552px -670px; }
.icon-icon-classify { width: 30px; height: 30px; background-position: -1452px -670px; }
.icon-icon-clock { width: 30px; height: 30px; background-position: -1502px -670px; }
.icon-join-member { width: 90px; height: 90px; background-position: -1624px -526px; }
.icon-logo-2 { width: 118px; height: 112px; background-position: -1376px -526px; }
.icon-logo { width: 224px; height: 224px; background-position: -1175px -737px; }
.icon-password { width: 36px; height: 36px; background-position: -1910px -526px; }
.icon-message { width: 50px; height: 50px; background-position: -2254px -1598px; }
.icon-more { width: 10px; height: 18px; background-position: -1582px -670px; }
.icon-password { width: 36px; height: 36px; background-position: -1966px -526px; }
.icon-pdf { width: 46px; height: 60px; background-position: -1844px -526px; }
.icon-photo-default { width: 124px; height: 124px; background-position: -1232px -526px; }
.icon-question-icon { width: 36px; height: 36px; background-position: -1966px -526px; }
.icon-question-icon { width: 36px; height: 36px; background-position: -2022px -526px; }
.icon-quit-member { width: 90px; height: 90px; background-position: -1734px -526px; }
.icon-shtyxydm { width: 54px; height: 54px; background-position: -2180px -1598px; }
.icon-tel { width: 36px; height: 36px; background-position: -2022px -526px; }
.icon-time-update { width: 45px; height: 45px; background-position: -2318px -1598px; }
.icon-user-question { width: 32px; height: 36px; background-position: -1344px -670px; }
.icon-user { width: 36px; height: 36px; background-position: -1232px -670px; }
.icon-verification { width: 36px; height: 36px; background-position: -1288px -670px; }
.icon-tel { width: 36px; height: 36px; background-position: -1232px -670px; }
.icon-time-update { width: 45px; height: 45px; background-position: -2388px -1598px; }
.icon-user-question { width: 32px; height: 36px; background-position: -1400px -670px; }
.icon-user { width: 36px; height: 36px; background-position: -1288px -670px; }
.icon-verification { width: 36px; height: 36px; background-position: -1344px -670px; }
.icon-wechat { width: 80px; height: 78px; background-position: -2080px -1598px; }
\ No newline at end of file
.icon-filter { width: 44px; height: 50px; background-position: -2254px -1598px; }
\ No newline at end of file
src/assets/images/sprite.png
src/assets/images/sprite.png

1.47 MB | W: | H:

src/assets/images/sprite.png

1.47 MB | W: | H:

src/assets/images/sprite.png
src/assets/images/sprite.png
src/assets/images/sprite.png
src/assets/images/sprite.png
  • 2-up
  • Swipe
  • Onion skin
src/components/DataListItem.vue
......@@ -78,16 +78,15 @@ export default {
display: flex;
flex-wrap: wrap;
align-items: center;
line-height: 25px;
position: relative;
.title-tag {
position: absolute;
left: 0;
top: 0;
bottom: 0;
// margin-right: 10px;
display: flex;
align-items: center;
height: 25px;
}
.title-content {
font-size: 16px;
......
src/i18n/lang/home/index.js 0 → 100644
const En = {
home: {
searchPlaceholder: 'Please enter the content you want to search',
more: 'More',
recommend: 'Recommend',
top: 'Top',
updateDate: 'Update Date：',
disclosureDate: 'Disclosure Date：',
disclosure: 'Information Disclosure',
news: 'News',
registered: 'Registered Issue',
}
}
const Zh = {
home: {
searchPlaceholder: '请输入您想搜索的内容',
more: '更多',
recommend: '推荐',
top: '置顶',
updateDate: '更新日期：',
disclosureDate: '披露日期：',
disclosure: '信息披露',
news: '新闻动态',
registered: '注册发行',
}
}
export default { En, Zh }
\ No newline at end of file
src/i18n/lang/index.js
......@@ -10,6 +10,7 @@ import person from './user/person'
import feedback from './feedback/index'
import question from './question/index'
import member from './member/index'
import home from './home/index'
const messages = {
en: {
lang: 'English',
......@@ -22,7 +23,8 @@ const messages = {
...person.personEn,
...feedback.feedbackEn,
...question.questionEn,
...member.memberEn
...member.memberEn,
...home.En
},
zh: {
lang: "中文",
......@@ -35,7 +37,8 @@ const messages = {
...person.personZh,
...feedback.feedbackZh,
...question.questionZh,
...member.memberZh
...member.memberZh,
...home.Zh
}
}
export default messages
src/views/home/components/DataModule.vue
......@@ -3,16 +3,17 @@
<div class="module-top-container">
<div class="module-top-left">
<span class="module-name">{{name}}</span>
<span v-if="isTop" class="module-top-btn">置顶</span>
<span v-if="!isTop" class="module-top-btn" @click="$emit('clickTop')">{{$t('home.top')}}</span>
</div>
<div class="module-more">
<span>更多</span>
<span>{{$t('home.more')}}</span>
<img src="@/assets/icon/more.png" alt="">
</div>
</div>
<div class="module-content-container">
<DataListItem v-for="(item, idx) in data.list" :key="idx" :data="item" :dateText="dateText">
<template v-if="item.isRecommend" v-slot:tag>
<span class="item-recommend">推荐</span>
<span class="item-recommend">{{$t('home.recommend')}}</span>
</template>
</DataListItem>
</div>
......@@ -27,15 +28,12 @@ export default {
props: {
name: {
type: String,
default: '协会动态'
},
isTop: {
type: Boolean,
default: false
},
dateText: {
type: String,
default: '更新日期：'
}
},
data () {
......@@ -113,18 +111,27 @@ export default {
}
.module-more {
display: flex;
align-items: center;
font-size: 12px;
color: #999999;
img {
margin-left: 5px;
margin-top: 2px;
width: auto;
height: 9px;
}
}
}
}
.module-content-container {
.item-recommend {
height: 18px;
height: 18x;
line-height: 18px;
font-size: 10px;
color: white;
padding: 0 7px;
padding-bottom: 1px;
border-radius: 8px;
background: #ff4038;
text-align: center;
......
src/views/home/index.vue
......@@ -2,32 +2,36 @@
<div class="home nafmii-head-bg1">
<nafm-header :leftArrow="false" navClass="nafmii-head-bg1">
<div class="head-custom-container">
<div class="search-input-box" @click="handleSearch">
<div src="" alt="" class="search-icon" />
<span class="search-placeholder">请输入您想搜索的内容</span>
</div>
<SearchFirst :placeholder="$t('home.searchPlaceholder')" @jumpPage="handleSearch" />
<div class="head-message-box">
<img src="@/assets/icon/message.png" alt="">
</div>
</div>
</nafm-header>
<main>
<HomeBanner />
<MenuModule />
<DataModule />
<DataModule />
<DataModule />
<DataModule v-for="item in modules" :key="item.type" v-bind="item" @clickTop="handleTop(item)" />
</main>
</div>
</template>
<script>
import SearchFirst from '@/components/SearchFirst'
import HomeBanner from './components/HomeBanner'
import MenuModule from './components/MenuModule'
import DataModule from './components/DataModule'
export default {
name: "Home",
components: { HomeBanner, MenuModule, DataModule },
components: { HomeBanner, MenuModule, DataModule, SearchFirst },
data () {
return {};
console.log();
return {
modules: [
{ type: '1', name: this.$t('home.disclosure'), dateText: this.$t('home.disclosureDate'), isTop: true },
{ type: '2', name: this.$t('home.news'), dateText: this.$t('home.updateDate'), isTop: false },
{ type: '3', name: this.$t('home.registered'), dateText: this.$t('home.updateDate'), isTop: false }
]
};
},
methods: {
jumpLogin () {
......@@ -37,6 +41,16 @@ export default {
},
handleSearch () { },
handleTop (module) {
const modules = []
for (const item of this.modules) {
const isTop = item.type == module.type
isTop ? modules.unshift(item) : modules.push(item)
Object.assign(item, { isTop })
}
this.modules = modules
}
},
};
</script>
......@@ -86,7 +100,6 @@ export default {
width: @MessageBoxSize;
height: @MessageBoxSize;
margin-left: @PaddingSize;
background: white;
}
}
</style>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!