Skip to content

polysoft-nafmii / polysoft-h5

Go to a project
Commit 6387f177 by amateur
Options

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

2 parents cbba3ff7 53d03826
Inline Side-by-side
Showing 14 changed files with 252 additions and 93 deletions
src/assets/css/sprite.less
.icon-sprite { display: inline-block; background-image: url(../images/sprite.png); background-size: 2908px 1686px; }
.icon-bg-common { width: 828px; height: 360px; background-position: -2080px -858px; }
.icon-sprite { display: inline-block; background-image: url(../images/sprite.png); background-size: 2060px 1529px; }
.icon-bg-common { width: 828px; height: 360px; background-position: 0px -1169px; }
.icon-bg-login-2 { width: 828px; height: 506px; background-position: -1232px 0px; }
.icon-bg-login { width: 828px; height: 412px; background-position: -2080px 0px; }
.icon-bg-login { width: 828px; height: 412px; background-position: 0px -737px; }
.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: -2523px -1598px; }
.icon-center-collect { width: 36px; height: 36px; background-position: -2579px -1598px; }
.icon-center-feedback { width: 36px; height: 36px; background-position: -2635px -1598px; }
.icon-center-message { width: 36px; height: 36px; background-position: -2691px -1598px; }
.icon-center-question { width: 36px; height: 36px; background-position: -2747px -1598px; }
.icon-center-setting { width: 36px; height: 36px; background-position: -2803px -1598px; }
.icon-center-study { width: 36px; height: 36px; background-position: -2859px -1598px; }
.icon-bg-member { width: 828px; height: 406px; background-position: -848px -737px; }
.icon-bg-mine { width: 828px; height: 340px; background-position: -848px -1169px; }
.icon-center-about { width: 36px; height: 36px; background-position: -1297px -670px; }
.icon-center-collect { width: 36px; height: 36px; background-position: -1353px -670px; }
.icon-center-feedback { width: 36px; height: 36px; background-position: -1409px -670px; }
.icon-center-message { width: 36px; height: 36px; background-position: -1465px -670px; }
.icon-center-question { width: 36px; height: 36px; background-position: -1521px -670px; }
.icon-center-setting { width: 36px; height: 36px; background-position: -1577px -670px; }
.icon-center-study { width: 36px; height: 36px; background-position: -1633px -670px; }
.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: -1910px -526px; }
.icon-empty { width: 36px; height: 36px; background-position: -1966px -526px; }
.icon-filter { width: 44px; height: 50px; background-position: -2394px -1598px; }
.icon-icon-arrow-right { width: 10px; height: 18px; background-position: -1608px -670px; }
.icon-icon-classify { width: 30px; height: 30px; background-position: -1508px -670px; }
.icon-icon-clock { width: 30px; height: 30px; background-position: -1558px -670px; }
.icon-join-member { width: 90px; height: 90px; background-position: -1624px -526px; }
.icon-change-membership { width: 90px; height: 90px; background-position: -1624px -526px; }
.icon-change-name { width: 90px; height: 90px; background-position: -1734px -526px; }
.icon-change-representive { width: 90px; height: 90px; background-position: -1844px -526px; }
.icon-email { width: 36px; height: 36px; background-position: -1689px -670px; }
.icon-empty { width: 36px; height: 36px; background-position: -1745px -670px; }
.icon-filter { width: 44px; height: 50px; background-position: -1910px -981px; }
.icon-icon-arrow-right { width: 10px; height: 18px; background-position: -2050px -737px; }
.icon-icon-classify { width: 30px; height: 30px; background-position: -2030px -981px; }
.icon-icon-clock { width: 30px; height: 30px; background-position: -1874px -1055px; }
.icon-join-member { width: 90px; height: 90px; background-position: -1954px -526px; }
.icon-logo-2 { width: 118px; height: 112px; background-position: -1376px -526px; }
.icon-logo { width: 224px; height: 224px; background-position: -1175px -737px; }
.icon-message { width: 50px; height: 50px; background-position: -2254px -1598px; }
.icon-more { width: 10px; height: 18px; background-position: -1638px -670px; }
.icon-password { width: 36px; height: 36px; background-position: -2022px -526px; }
.icon-pdf { width: 46px; height: 60px; background-position: -1844px -526px; }
.icon-logo { width: 224px; height: 224px; background-position: -1696px -737px; }
.icon-message { width: 50px; height: 50px; background-position: -1770px -981px; }
.icon-more { width: 10px; height: 18px; background-position: -2050px -775px; }
.icon-password { width: 36px; height: 36px; background-position: -1801px -670px; }
.icon-pdf { width: 46px; height: 60px; background-position: -1696px -1055px; }
.icon-photo-default { width: 124px; height: 124px; background-position: -1232px -526px; }
.icon-question-icon { width: 36px; height: 36px; background-position: -1232px -670px; }
.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: -1288px -670px; }
.icon-time-update { width: 45px; height: 45px; background-position: -2458px -1598px; }
.icon-trash { width: 50px; height: 50px; background-position: -2324px -1598px; }
.icon-user-question { width: 32px; height: 36px; background-position: -1456px -670px; }
.icon-user { width: 36px; height: 36px; background-position: -1344px -670px; }
.icon-verification { width: 36px; height: 36px; background-position: -1400px -670px; }
.icon-wechat { width: 80px; height: 78px; background-position: -2080px -1598px; }
\ No newline at end of file
.icon-progress-act { width: 36px; height: 36px; background-position: -1857px -670px; }
.icon-progress-normal { width: 36px; height: 36px; background-position: -1913px -670px; }
.icon-question-icon { width: 36px; height: 36px; background-position: -1969px -670px; }
.icon-quit-member { width: 90px; height: 90px; background-position: -1940px -737px; }
.icon-shtyxydm { width: 54px; height: 54px; background-position: -1696px -981px; }
.icon-tel { width: 36px; height: 36px; background-position: -1974px -981px; }
.icon-time-update { width: 45px; height: 45px; background-position: -1232px -670px; }
.icon-trash { width: 50px; height: 50px; background-position: -1840px -981px; }
.icon-user-question { width: 32px; height: 36px; background-position: -2025px -670px; }
.icon-user { width: 36px; height: 36px; background-position: -1762px -1055px; }
.icon-verification { width: 36px; height: 36px; background-position: -1818px -1055px; }
.icon-wechat { width: 80px; height: 78px; background-position: -1940px -847px; }
\ No newline at end of file
src/assets/icon/change_membership.png
src/assets/icon/change_membership.png

305 KB | W: | H:

src/assets/icon/change_membership.png

5.59 KB | W: | H:

src/assets/icon/change_membership.png
src/assets/icon/change_membership.png
src/assets/icon/change_membership.png
src/assets/icon/change_membership.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/icon/change_name.png
src/assets/icon/change_name.png

329 KB | W: | H:

src/assets/icon/change_name.png

8.49 KB | W: | H:

src/assets/icon/change_name.png
src/assets/icon/change_name.png
src/assets/icon/change_name.png
src/assets/icon/change_name.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/icon/change_representive.png
src/assets/icon/change_representive.png

319 KB | W: | H:

src/assets/icon/change_representive.png

6.49 KB | W: | H:

src/assets/icon/change_representive.png
src/assets/icon/change_representive.png
src/assets/icon/change_representive.png
src/assets/icon/change_representive.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/images/sprite.png
src/assets/images/sprite.png

1.48 MB | W: | H:

src/assets/images/sprite.png

711 KB | 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/i18n/lang/member/index.js
......@@ -17,16 +17,16 @@ const memberEn = {
mobilePhone: 'Mobile Phone' // 移动电话
},
mdetail: {
socialCode: 'Uniform Social Credit Code', // 社会统一信用代码
socialCode: 'Uniform Social Credit Code', // 统一社会信用代码
orgCode: 'Organization Code', // 组织机构代码
memberStatus: 'Membership Status', // 会员状态
memberLevel: 'Membership Level', // 会员级别
memberType: 'Membership Type', // 会籍类别
orgType: 'Organization Type', // 机构类型
establishedTime: 'Established Time', // 成立时间
corporateRepresentative: 'Corporate Representative', // 法人代表
registeredCapital: 'Registered Capital(Ten Thousand)', // 注册资本（万元）
orgType: 'Organization Type', // 机构类型
address: 'Address', // 通讯地址
memberStatus: 'Membership Status', // 会员状态
memberLevel: 'Membership Level', // 会员级别
memberType: 'Membership Type', // 会籍类别
representative: 'Company Representative Name', // 单位代表姓名
businessSituation: 'Business Situation', // 业务开展情况
contactList: 'Contact List' // 联系人列表
......@@ -71,16 +71,16 @@ const memberZh = {
mobilePhone: '移动电话' // 移动电话
},
mdetail: {
socialCode: '社会统一信用代码', // 社会统一信用代码
socialCode: '统一社会信用代码', // 统一社会信用代码
orgCode: '组织机构代码', // 组织机构代码
memberStatus: '会员状态', // 会员状态
memberLevel: '会员级别', // 会员级别
memberType: '会籍类别', // 会籍类别
orgType: '机构类型', // 机构类型
establishedTime: '成立时间', // 成立时间
corporateRepresentative: '法人代表', // 法人代表
registeredCapital: '注册资本（万元）', // 注册资本（万元）
orgType: '机构类型', // 机构类型
address: '通讯地址', // 通讯地址
memberStatus: '会员状态', // 会员状态
memberLevel: '会员级别', // 会员级别
memberType: '会籍类别', // 会籍类别
representative: '单位代表姓名', // 单位代表姓名
businessSituation: '业务开展情况', // 业务开展情况
contactList: '联系人列表' // 联系人列表
......
src/views/member/progress/change/index.vue
......@@ -3,7 +3,7 @@
<NafmHeader navClass="nafmii-head-bg3" :title="$t('mprogress.changeProgress')" />
<main class="change_content">
<progress-component :steps-info="steps" :progress-title="$t('mprogress.changeProgress')">
<template slot="title">单位名称</template>
<template slot="title">变更记录</template>
</progress-component>
</main>
</div>
......@@ -31,3 +31,10 @@ export default {
}
</script>
<style lang="less" scoped>
.change_container {
width: 100%;
height: 100%;
background-color: #fafafa;
}
</style>
src/views/member/progress/change/list.vue
......@@ -5,6 +5,7 @@
<section class="name list_item">
<van-cell is-link to="/member/changeProgress">
<div slot="title" class="item_info">
<div class="item_icon"></div>
<span>{{$t('mprogress.organizationName')}}</span>
</div>
</van-cell>
......@@ -12,6 +13,7 @@
<section class="represent list_item">
<van-cell is-link to="/member/changeProgress">
<div class="item_info">
<div class="item_icon"></div>
<span>{{$t('mprogress.organizationRepresentive')}}</span>
</div>
</van-cell>
......@@ -19,6 +21,7 @@
<section class="type list_item">
<van-cell is-link to="/member/changeProgress">
<div class="item_info">
<div class="item_icon"></div>
<span>{{$t('mprogress.membershipType')}}</span>
</div>
</van-cell>
......@@ -44,27 +47,45 @@ export default {
width: 100%;
margin-bottom: 10px;
&.name {
background-color: #E7EFFF;
background-color: #e7efff;
.item_icon {
background: url("../../../../assets/icon/change_name.png") no-repeat;
}
}
&.represent {
background-color: #F8F1DF;
background-color: #f8f1df;
.item_icon {
background: url("../../../../assets/icon/change_representive.png")
no-repeat;
}
}
&.type {
background-color: #F8E8EB;
background-color: #f8e8eb;
.item_icon {
background: url("../../../../assets/icon/change_membership.png")
no-repeat;
}
}
::v-deep .van-cell {
background-color: transparent;
}
::v-deep .van-icon {
height: 66px;
line-height: 66px;
height: 50px;
line-height: 50px;
}
.item_info {
line-height: 66px;
line-height: 30px;
padding: 10px 0;
display: flex;
align-items: center;
color: #444444;
font-size: 16px;
.item_icon {
width: 30px;
height: 30px;
background-size: contain;
margin-right: 10px;
}
span {
font-family: PingFangSC-Semibold;
}
......
src/views/member/progress/join.vue
......@@ -29,3 +29,15 @@ export default {
}
</script>
<<<<<<< HEAD
<style lang="less" scoped>
.join_container {
width: 100%;
height: 100%;
background-color: #fafafa;
}
</style>
=======
>>>>>>> a461f2c16c56d28a6dbe476c3a3e56bbd7f10e88
src/views/member/progress/progress.vue
......@@ -3,32 +3,68 @@
<main class="progress_content">
<section class="progress_own">
<h3 class="section_title">{{progressTitle}}</h3>
<div class="section_content">
<van-steps direction="vertical" :active="1">
<van-step v-for="stepItem in stepsInfo" :key="stepItem.id">
<div slot="active-icon" class="circle_outer">
<div class="circle_inner"></div>
</div>
<van-icon slot="active-icon" :name="actIcon" />
<van-icon slot="inactive-icon" :name="normalIcon" />
<van-icon slot="finish-icon" :name="normalIcon" />
<div class="step_content">
<span class="step_left">
<h3 class="step_title">{{stepItem.title}}</h3>
<a href="" class="step_link" v-if="stepItem.link">{{stepItem.link}}</a>
<div class="step_action" v-if="stepItem.expand"></div>
</span>
<span class="step_right">{{stepItem.time}}</span>
</div>
</van-step>
</van-steps>
</div>
</section>
<section class="progress_expand">
<section v-if="progressTitle === '变更进度'" class="progress_expand">
<h3 class="section_title">
<slot name="title">
</slot>
</h3>
<main>
<main class="section_content">
<slot name="content">
</slot>
</main>
</section>
<section class="progress_dialogue">
<h3 class="section_title">
留言
</h3>
<main>
<h3 class="dialogue_time">
2021.05.31 14:00:00
</h3>
<div class="association">
<div class="avator">
</div>
<div class="left">
<h4 class="dialogue_name">aaaaaaa</h4>
<div class="dialogue_content">
<span class="arrow"></span>
你打开手机都是宝宝辅食的吧
</div>
</div>
</div>
<div class="member_org">
<div class="right">
<h4 class="dialogue_name">bbbbbb</h4>
<div class="dialogue_content">
<span class="arrow"></span>
城市的见客户反馈技术的开发计划第三空间发挥打开手机话费快结束的
</div>
</div>
<div class="avator">
</div>
</div>
</main>
</section>
</main>
</div>
</template>
......@@ -51,14 +87,15 @@ export default {
},
data() {
return {
actIcon: require('@/assets/icon/progress_act.png'),
normalIcon: require('@/assets/icon/progress_normal.png')
}
},
}
</script>
<style lang="less" scoped>
.progress_container {
padding: 15px;
margin: 15px;
.section_title {
font-size: 16px;
line-height: 16px;
......@@ -67,13 +104,20 @@ export default {
font-family: PingFangSC-Semibold;
border-left: 2.5px solid #135faa;
}
.section_content {
margin: 15px 0;
background-color: #ffffff;
border-radius: 8px;
box-shadow: 0px 0px 6px 0px rgba(2, 15, 41, 0.06);
}
}
.van-steps {
border-radius: 8px;
}
::v-deep .van-step--vertical {
opacity: 0.3;
.van-step__circle {
width: 6px;
height: 6px;
background-color: #106abc;
.van-step__circle-container {
margin-left: 0.9px;
}
.van-step__line {
opacity: 0.3;
......@@ -97,7 +141,6 @@ export default {
transparent
);
background-size: 100% 4px;
margin-left: -1px;
}
::v-deep .van-hairline::after {
border: none;
......@@ -125,17 +168,81 @@ export default {
line-height: 17px;
}
}
.circle_outer {
padding: 3px;
border-radius: 50%;
background-color: #cbe3f9;
.circle_inner {
width: 6px;
height: 6px;
.progress_dialogue {
.dialogue_time {
font-size: 10px;
font-family: PingFangSC-Regular;
color: #999999;
margin: 15px 0;
text-align: center;
}
.association {
margin-right: 46px;
}
.member_org {
margin-left: 46px;
}
.association,
.member_org {
display: flex;
justify-content: space-between;
.avator {
width: 36px;
height: 36px;
border-radius: 50%;
background-color: #106abc;
border: 1px solid red;
}
.dialogue_name {
font-size: 11px;
font-family: PingFangSC-Regular;
color: #737373;
}
.dialogue_content {
width: 290px;
padding: 10px;
font-size: 14px;
color: #202020;
line-height: 20px;
margin-bottom: 15px;
position: relative;
border-radius: 4px;
box-shadow: 0px 0px 6px 0px rgba(2, 15, 41, 0.06);
z-index: 5;
.arrow {
display: block;
position: absolute;
top: 10px;
width: 10px;
height: 10px;
background-color: #ffffff;
}
}
.left {
.dialogue_name {
text-align: left;
}
.dialogue_content {
background-color: #ffffff;
.arrow {
left: -5px;
background-color: #ffffff;
transform: rotate(-45deg);
}
}
}
.right {
.dialogue_name {
text-align: right;
}
.dialogue_content {
background-color: #ecf2ff;
.arrow {
right: -5px;
background-color: #ecf2ff;
transform: rotate(45deg);
}
}
}
}
}
</style>
src/views/member/progress/quit.vue
......@@ -29,3 +29,13 @@ export default {
}
</script>
<<<<<<< HEAD
<style lang="less" scoped>
.quit_container {
width: 100%;
height: 100%;
background-color: #fafafa;
}
</style>
=======
>>>>>>> a461f2c16c56d28a6dbe476c3a3e56bbd7f10e88
src/views/member/result/memberDetail.vue
......@@ -19,50 +19,50 @@
</van-cell>
<van-cell>
<p slot="default">
<span>{{$t('mdetail.memberStatus')}}</span>
<span>{{memberInfo.status || '--'}}</span>
<span>{{$t('mdetail.orgType')}}</span>
<span>{{memberInfo.orgType || '--'}}</span>
</p>
</van-cell>
<van-cell>
<p slot="default">
<span>{{$t('mdetail.memberLevel')}}</span>
<span>{{memberInfo.level || '--'}}</span>
<span>{{$t('mdetail.establishedTime')}}</span>
<span>{{memberInfo.createTime || '--'}}</span>
</p>
</van-cell>
<van-cell>
<p slot="default">
<span>{{$t('mdetail.memberType')}}</span>
<span>{{memberInfo.type || '--'}}</span>
<span>{{$t('mdetail.corporateRepresentative')}}</span>
<span>{{memberInfo.legalRepresentative || '--'}}</span>
</p>
</van-cell>
<van-cell>
<p slot="default">
<span>{{$t('mdetail.establishedTime')}}</span>
<span>{{memberInfo.createTime || '--'}}</span>
<span>{{$t('mdetail.registeredCapital')}}</span>
<span>{{memberInfo.registeredCapital || '--'}}</span>
</p>
</van-cell>
<van-cell>
<p slot="default">
<span>{{$t('mdetail.corporateRepresentative')}}</span>
<span>{{memberInfo.legalRepresentative || '--'}}</span>
<span>{{$t('mdetail.address')}}</span>
<span>{{memberInfo.address || '--'}}</span>
</p>
</van-cell>
<van-cell>
<p slot="default">
<span>{{$t('mdetail.registeredCapital')}}</span>
<span>{{memberInfo.registeredCapital || '--'}}</span>
<span>{{$t('mdetail.memberStatus')}}</span>
<span>{{memberInfo.status || '--'}}</span>
</p>
</van-cell>
<van-cell>
<p slot="default">
<span>{{$t('mdetail.orgType')}}</span>
<span>{{memberInfo.orgType || '--'}}</span>
<span>{{$t('mdetail.memberLevel')}}</span>
<span>{{memberInfo.level || '--'}}</span>
</p>
</van-cell>
<van-cell>
<p slot="default">
<span>{{$t('mdetail.address')}}</span>
<span>{{memberInfo.address || '--'}}</span>
<span>{{$t('mdetail.memberType')}}</span>
<span>{{memberInfo.type || '--'}}</span>
</p>
</van-cell>
<van-cell>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!