Skip to content

polysoft-nafmii / polysoft-h5

Go to a project
Commit b0785da9 by amateur
Options

Merge branch 'dev' of http://gitlab.polyhome.net/polysoft-nafmii/polysoft-h5 into dev

2 parents ca8cf1a9 9192076f
Inline Side-by-side
Showing 9 changed files with 174 additions and 35 deletions
src/i18n/lang/member/index.js
...@@ -30,6 +30,16 @@ const memberEn = { ...@@ -30,6 +30,16 @@ const memberEn = {
representative: 'Company Representative Name', // 单位代表姓名 representative: 'Company Representative Name', // 单位代表姓名
businessSituation: 'Business Situation', // 业务开展情况 businessSituation: 'Business Situation', // 业务开展情况
contactList: 'Contact List' // 联系人列表 contactList: 'Contact List' // 联系人列表
},
memberservice: {
tip: 'Tip: Please login the Membership System if you want to do some changes', // 提示：如需变更请登入会员系统办理
more: 'more', // 查看更多
join: 'Join', // 入会
quit: 'Quit', // 退会
change: 'Change' // 变更
},
mbusiness: {
updateTime: 'update time', // 更新时间
} }
} }
...@@ -65,6 +75,16 @@ const memberZh = { ...@@ -65,6 +75,16 @@ const memberZh = {
representative: '单位代表姓名', // 单位代表姓名 representative: '单位代表姓名', // 单位代表姓名
businessSituation: '业务开展情况', // 业务开展情况 businessSituation: '业务开展情况', // 业务开展情况
contactList: '联系人列表' // 联系人列表 contactList: '联系人列表' // 联系人列表
},
memberservice: {
tip: '提示：如需变更请登入会员系统办理', // 提示：如需变更请登入会员系统办理
more: '查看更多', // 查看更多
join: '入会', // 入会
quit: '退会', // 退会
change: '变更' // 变更
},
mbusiness: {
updateTime: '更新时间', // 更新时间
} }
} }
export default { export default {
......
src/router/modules/member.js
...@@ -70,7 +70,7 @@ const memberRouter = [{ ...@@ -70,7 +70,7 @@ const memberRouter = [{
title: '变更' title: '变更'
}, },
component: () => import( /* webpackChunkName: "changeList" */ '@/views/member/progress/change/list.vue') // 变更列表 component: () => import( /* webpackChunkName: "changeList" */ '@/views/member/progress/change/list.vue') // 变更列表
}, , },
{ {
path: '/member/changeProgress', path: '/member/changeProgress',
name: 'ChangeProgress', name: 'ChangeProgress',
...@@ -78,6 +78,14 @@ const memberRouter = [{ ...@@ -78,6 +78,14 @@ const memberRouter = [{
title: '变更进度' title: '变更进度'
}, },
component: () => import( /* webpackChunkName: "changeProgress" */ '@/views/member/progress/change') // 变更进度 component: () => import( /* webpackChunkName: "changeProgress" */ '@/views/member/progress/change') // 变更进度
},
{
path: '/member/projectDetail',
name: 'ProjectDetail',
meta: {
title: '项目详情'
},
component: () => import( /* webpackChunkName: "projectDetail" */ '@/views/member/projectDetail') // 项目详情
} }
] ]
......
src/views/member/business/index.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<p slot="label" class="info"> <p slot="label" class="info">
<span class="update_time"> <span class="update_time">
<van-icon :name="timeIcon" /> <van-icon :name="timeIcon" />
更新日期：{{item.update_time}} {{$t('mbusiness.updateTime')}}：{{item.update_time}}
</span> </span>
<span class="org">{{item.org}}</span> <span class="org">{{item.org}}</span>
</p> </p>
......
src/views/member/result/index.vue
...@@ -7,28 +7,28 @@ ...@@ -7,28 +7,28 @@
<h3 slot="title" class="title">{{memberInfo.name}}</h3> <h3 slot="title" class="title">{{memberInfo.name}}</h3>
<div slot="label"> <div slot="label">
<p> <p>
<span>社会统一信用代码：</span> <span>{{$t('mdetail.socialCode')}}：</span>
<span class="info">{{memberInfo.shtyxydm}}</span> <span class="info">{{memberInfo.shtyxydm}}</span>
</p> </p>
<p> <p>
<span>会员状态：</span> <span>{{$t('mdetail.memberStatus')}}：</span>
<span class="info">{{memberInfo.status}}</span> <span class="info">{{memberInfo.status}}</span>
</p> </p>
<p> <p>
<span>会员级别：</span> <span>{{$t('mdetail.memberLevel')}}：</span>
<span class="info">{{memberInfo.level}}</span> <span class="info">{{memberInfo.level}}</span>
</p> </p>
<p> <p>
<span>会籍类别：</span> <span>{{$t('mdetail.memberType')}}：</span>
<span class="info">{{memberInfo.type}}</span> <span class="info">{{memberInfo.type}}</span>
</p> </p>
</div> </div>
</van-cell> </van-cell>
<van-cell> <van-cell>
<p slot="default" class="tip_more"> <p slot="default" class="tip_more">
<span class="warning_tip"> 提示：如需变更请登录会员系统办理 </span> <span class="warning_tip"> {{$t('memberservice.tip')}} </span>
<span class="more" @click="toOtherRouter('MemberDetail')"> <span class="more" @click="toOtherRouter('MemberDetail')">
查看更多 {{$t('memberservice.more')}}
<van-icon :name="moreIcon" /> <van-icon :name="moreIcon" />
</span> </span>
</p> </p>
...@@ -38,21 +38,21 @@ ...@@ -38,21 +38,21 @@
<div class="in"> <div class="in">
<van-cell is-link :icon="joinIcon" @click="toOtherRouter('JoinProgress')"> <van-cell is-link :icon="joinIcon" @click="toOtherRouter('JoinProgress')">
<template #title> <template #title>
<span class="oper_title">入会</span> <span class="oper_title">{{$t('memberservice.join')}}</span>
</template> </template>
</van-cell> </van-cell>
</div> </div>
<div class="out"> <div class="out">
<van-cell is-link :icon="quitIcon" @click="toOtherRouter('QuitProgress')"> <van-cell is-link :icon="quitIcon" @click="toOtherRouter('QuitProgress')">
<template #title> <template #title>
<span class="oper_title">退会</span> <span class="oper_title">{{$t('memberservice.quit')}}</span>
</template> </template>
</van-cell> </van-cell>
</div> </div>
<div class="change"> <div class="change">
<van-cell is-link :icon="changeIcon" @click="toOtherRouter('ChangeList')"> <van-cell is-link :icon="changeIcon" @click="toOtherRouter('ChangeList')">
<template #title> <template #title>
<span class="oper_title">变更</span> <span class="oper_title">{{$t('memberservice.change')}}</span>
</template> </template>
</van-cell> </van-cell>
</div> </div>
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
} }
.member_basic { .member_basic {
width: 396px; width: 396px;
height: 231px; // height: 231px;
margin: 10px auto; margin: 10px auto;
border-radius: 8px; border-radius: 8px;
background: url("../../../assets/icon/bg_member_result.png") no-repeat; background: url("../../../assets/icon/bg_member_result.png") no-repeat;
...@@ -126,10 +126,13 @@ export default { ...@@ -126,10 +126,13 @@ export default {
font-size: 12px; font-size: 12px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center;
.warning_tip { .warning_tip {
color: #ea5c6d; color: #ea5c6d;
} }
.more { .more {
display: inline-block;
width: 20%;
color: #666666; color: #666666;
align-items: center; align-items: center;
} }
......
src/views/qulification/agreement/components/letterItem.vue
<template> <template>
<section class="agreement_item"> <section class="agreement_item">
<h3 class="item_title">{{navItem.title}}</h3>
<main v-if="navItem.children" class="item_content"> <main v-if="navItem.children" class="item_content">
<p v-for="(item, index) in navItem.children" :key="index"> <p v-for="(item, index) in navItem.children" :key="index">
<span class="title">{{item.title}}</span> <span class="title">{{item.title}}</span>
......
src/views/qulification/agreement/master.vue
<template> <template>
<div class="master_agreement"> <div class="agreement_container">
<NafmHeader title="《NAGMII主协议》" /> <NafmHeader navClass="nafmii-head-bg3" title="《NAGMII主协议》">
<nav class="bav_bar"> <template slot="bottom">
<nav class="tab_bar">
<div v-for="navItem in barList" :key="navItem.id" :class="actNav === navItem.id ? 'act_item' : 'nav_item'" @click="navSwitch(navItem.id)"> <div v-for="navItem in barList" :key="navItem.id" :class="actNav === navItem.id ? 'act_item' : 'nav_item'" @click="navSwitch(navItem.id)">
<p>{{navItem.title}}</p> <p>{{navItem.title}}</p>
<div v-show="actNav === navItem.id" class="under_line"></div> <div v-show="actNav === navItem.id" class="under_line"></div>
</div> </div>
</nav> </nav>
<main v-if="actNav === 'time'"> </template>
</NafmHeader>
<main class="agreement_content">
<section v-if="actNav === 'time'">
<time-item v-for="(item, index) in timeAgreements" :key="index" :agreement-item="item"> <time-item v-for="(item, index) in timeAgreements" :key="index" :agreement-item="item">
</time-item> </time-item>
</main> </section>
<main v-if="actNav === 'letter'"> <section v-if="actNav === 'letter'">
<letter-item v-for="(item, index) in letterAgreements" :key="index" :nav-item="item"> <van-index-bar :sticky-offset-top="80">
</letter-item> <div v-for="item in letterAgreements" :key="item.title">
<van-index-anchor :index="item.title" />
<letter-item :nav-item="item"></letter-item>
</div>
</van-index-bar>
</section>
</main> </main>
<section class="remark"> <section class="remark">
<h3 class="title">备注：</h3> <h3 class="title">备注：</h3>
...@@ -54,6 +63,78 @@ export default { ...@@ -54,6 +63,78 @@ export default {
title: 'XXXXXXXXXXXXX公司', title: 'XXXXXXXXXXXXX公司',
time: '2020-03-07' time: '2020-03-07'
}] }]
}, {
title: 'B',
children: [{
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-03'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-04'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-05'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-06'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-07'
}]
}, {
title: 'C',
children: [{
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-03'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-04'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-05'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-06'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-07'
}]
}, {
title: 'D',
children: [{
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-03'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-04'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-05'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-06'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-07'
}]
}, {
title: 'E',
children: [{
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-03'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-04'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-05'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-06'
}, {
title: 'XXXXXXXXXXXXX公司',
time: '2020-03-07'
}]
}], }],
timeAgreements: [{ timeAgreements: [{
time: '2021-03-03', time: '2021-03-03',
...@@ -82,17 +163,18 @@ export default { ...@@ -82,17 +163,18 @@ export default {
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.master_agreement { .agreement_container {
padding: 0 20px;
}
.bav_bar {
width: 384px; width: 384px;
margin: 0 auto; margin: 0 auto;
}
.tab_bar {
width: 384px;
margin: 6px auto;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
font-size: 15px; font-size: 15px;
color: #ffffff; color: #ffffff;
background: blue; background: transparent;
.act_item { .act_item {
font-size: 19px; font-size: 19px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
...@@ -117,5 +199,21 @@ export default { ...@@ -117,5 +199,21 @@ export default {
color: #999999; color: #999999;
} }
} }
::v-deep .van-index-bar__sidebar {
border: 0.5px solid #dadada;
background-color: #f2f2f2;
margin-right: 10px;
padding: 10px 0;
border-radius: 11px;
.van-index-bar__index {
display: block;
padding: 0;
width: 20px;
line-height: 22px;
text-align: center;
font-size: 10px;
color: #777879;
}
}
</style> </style>
src/views/qulification/detail.vue
<template> <template>
<div> <div class="detail_container">
<NafmHeader navClass="nafmii-head-bg3" title="资质查询" /> <NafmHeader navClass="nafmii-head-bg3" title="资质查询" />
<section class="detail_content"> <section class="detail_content">
<van-cell-group class=""> <van-cell-group class="">
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
</template> </template>
<script> <script>
export default { export default {
name: 'QulificationDetail',
data() { data() {
return { return {
qulificationDetail: { qulificationDetail: {
......
src/views/qulification/list.vue
<template> <template>
<div> <div class="list_container">
<NafmHeader navClass="nafmii-head-bg3" title="资质查询" /> <NafmHeader navClass="nafmii-head-bg3" title="资质查询">
<template slot="bottom">
<div class="search_bar"> <div class="search_bar">
<van-field v-model="searchName" placeholder="请输入机构名称"> <van-field v-model="searchName" placeholder="请输入机构名称">
<template #label> <template #label>
...@@ -12,6 +13,9 @@ ...@@ -12,6 +13,9 @@
</template> </template>
</van-field> </van-field>
</div> </div>
</template>
</NafmHeader>
<main class="list_content">
<section class="content"> <section class="content">
<van-cell-group> <van-cell-group>
<van-cell v-for="item in searchList" :key="item.id" icon="search"> <van-cell v-for="item in searchList" :key="item.id" icon="search">
...@@ -23,10 +27,12 @@ ...@@ -23,10 +27,12 @@
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
</section> </section>
</main>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'QulificationList',
data() { data() {
return { return {
searchName: 'aaa', searchName: 'aaa',
...@@ -38,8 +44,8 @@ export default { ...@@ -38,8 +44,8 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.search_bar { .search_bar {
background: cyan; width: 384px;
padding: 20px; padding: 10px 15px;
.van-cell { .van-cell {
border-radius: 50px; border-radius: 50px;
background-color: rgba(255, 255, 255, 0.3); background-color: rgba(255, 255, 255, 0.3);
......
src/views/qulification/search.vue
<template> <template>
<div class="qulification_search"> <div class="qulification_search_container">
<NafmHeader navClass="nafmii-head-bg3" title="资质查询" /> <NafmHeader navClass="nafmii-head-bg3" title="资质查询" />
<main class="qulification_content">
<section class="logo"> <section class="logo">
</section> </section>
<h3 class="search_title">会员及市场参与者情况查询</h3> <h3 class="search_title">会员及市场参与者情况查询</h3>
...@@ -25,11 +26,13 @@ ...@@ -25,11 +26,13 @@
<span class="history_item" v-for=" item in historyItems" :key="item.id" @click="toDetail">{{item.name}}</span> <span class="history_item" v-for=" item in historyItems" :key="item.id" @click="toDetail">{{item.name}}</span>
</div> </div>
</section> </section>
</main>
<van-action-sheet v-model="showSheet" :actions="actions" cancel-text="取消" close-on-click-action @select="onSelect" /> <van-action-sheet v-model="showSheet" :actions="actions" cancel-text="取消" close-on-click-action @select="onSelect" />
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'QulificationSearch',
data() { data() {
return { return {
actions: [ actions: [
...@@ -67,8 +70,9 @@ export default { ...@@ -67,8 +70,9 @@ export default {
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.qulification_search { .qulification_search_container {
padding: 20px; width: 384px;
margin: 0 auto;
.logo { .logo {
display: block; display: block;
width: 100px; width: 100px;
...@@ -112,7 +116,7 @@ export default { ...@@ -112,7 +116,7 @@ export default {
} }
} }
.visual_input { .visual_input {
width: 285px; // width: 285px;
color: #999999; color: #999999;
padding: 10px 0; padding: 10px 0;
span { span {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!