Skip to content

polysoft-nafmii / polysoft-h5

Go to a project
Commit 2c79b404 by fanx
Options

fixed conflict

2 parents 4731788f d72b9bbb
Inline Side-by-side
Showing 6 changed files with 27 additions and 17 deletions
src/i18n/lang/qulification/index.js
...@@ -15,6 +15,7 @@ const qulificationEn = { ...@@ -15,6 +15,7 @@ const qulificationEn = {
}, },
product: 'Product', // 非法人产品 product: 'Product', // 非法人产品
org: 'Organization', // 机构 org: 'Organization', // 机构
orgType: 'Organization Type', // 机构类型
productInput: "Please input the products' name/manage person", // 请输入产品名/管理人 productInput: "Please input the products' name/manage person", // 请输入产品名/管理人
orgInput: "Please input the organizations' name", // 请输入机构名称 orgInput: "Please input the organizations' name", // 请输入机构名称
history: 'Search History', // 搜索历史 history: 'Search History', // 搜索历史
...@@ -44,6 +45,7 @@ const qulificationZh = { ...@@ -44,6 +45,7 @@ const qulificationZh = {
}, },
product: '非法人产品', // 非法人产品 product: '非法人产品', // 非法人产品
org: '机构', // 机构 org: '机构', // 机构
orgType: '机构类型', // 机构类型
productInput: "请输入产品名/管理人", // 请输入产品名/管理人 productInput: "请输入产品名/管理人", // 请输入产品名/管理人
orgInput: "请输入机构名称", // 请输入机构名称 orgInput: "请输入机构名称", // 请输入机构名称
history: '搜索历史', // 搜索历史 history: '搜索历史', // 搜索历史
......
src/views/member/progress/change/index.vue
<template> <template>
<div class="change_container"> <div class="change_container">
<NafmHeader navClass="nafmii-head-bg3" :title="$t('mprogress.quitProgress')" /> <NafmHeader navClass="nafmii-head-bg3" :title="$t('mprogress.changeProgress')" />
<main class="change_content"> <main class="change_content">
<progress-component :steps-info="steps" :progress-title="$t('mprogress.changeProgress')"> <progress-component :steps-info="steps" :progress-title="$t('mprogress.changeProgress')">
<template slot="title">单位名称</template> <template slot="title">单位名称</template>
......
src/views/member/progress/progress.vue
...@@ -97,6 +97,7 @@ export default { ...@@ -97,6 +97,7 @@ export default {
transparent transparent
); );
background-size: 100% 4px; background-size: 100% 4px;
margin-left: -1px;
} }
::v-deep .van-hairline::after { ::v-deep .van-hairline::after {
border: none; border: none;
......
src/views/qulification/agreement/master.vue
...@@ -31,20 +31,24 @@ ...@@ -31,20 +31,24 @@
<li>《债券回购主协议》非法人产品管理人名单自2018年起进行公示</li> <li>《债券回购主协议》非法人产品管理人名单自2018年起进行公示</li>
</ul> </ul>
</section> </section>
{{$t('agreement')}}
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { computed: {
return { barList() {
barList: [{ return [{
title: '按时间', title: this.$t('agreement.time'),
id: 'time' id: 'time'
}, { }, {
title: '按首字母', title: this.$t('agreement.letter'),
id: 'letter' id: 'letter'
}], }]
}
},
data() {
return {
actNav: 'time', actNav: 'time',
letterAgreements: [{ letterAgreements: [{
title: 'A', title: 'A',
......
src/views/qulification/detail.vue
...@@ -5,30 +5,30 @@ ...@@ -5,30 +5,30 @@
<van-cell-group class=""> <van-cell-group class="">
<van-cell> <van-cell>
<span slot="title" class="detail_title">{{qulificationDetail.name}}</span> <span slot="title" class="detail_title">{{qulificationDetail.name}}</span>
<span class="org_type">机构类型：{{qulificationDetail.orgType}}</span> <span class="org_type">{{$t('qulification.orgType')}}：{{qulificationDetail.orgType}}</span>
</van-cell> </van-cell>
<van-cell> <van-cell>
<span slot="title" class="label">是否会员</span> <span slot="title" class="label">{{$t('qulification.membership')}}</span>
<span class="info">是</span> <span class="info">是</span>
</van-cell> </van-cell>
<van-cell> <van-cell>
<span slot="title" class="label">会籍类别</span> <span slot="title" class="label">{{$t('qulification.membershipType')}}</span>
<span class="info">{{qulificationDetail.memberType}}</span> <span class="info">{{qulificationDetail.memberType}}</span>
</van-cell> </van-cell>
<van-cell> <van-cell>
<span slot="title" class="label">主承销商类型</span> <span slot="title" class="label">{{$t('qulification.underwriterType')}}</span>
<span class="info">{{qulificationDetail.memberType}}</span> <span class="info">{{qulificationDetail.memberType}}</span>
</van-cell> </van-cell>
<van-cell> <van-cell>
<span slot="title" class="label">做市商</span> <span slot="title" class="label">{{$t('qulification.marketmaker')}}</span>
<span class="info">{{qulificationDetail.memberType}}</span> <span class="info">{{qulificationDetail.memberType}}</span>
</van-cell> </van-cell>
<van-cell> <van-cell>
<span slot="title" class="label">信用风险缓释工具</span> <span slot="title" class="label">{{$t('qulification.mitigation')}}</span>
<span class="info">{{qulificationDetail.memberType}}</span> <span class="info">{{qulificationDetail.memberType}}</span>
</van-cell> </van-cell>
<van-cell> <van-cell>
<span slot="title" class="label">已签署备案主协议</span> <span slot="title" class="label">{{$t('qulification.masterAgree')}}</span>
<span class="info"> <span class="info">
<div class="master_agreement" @click="toMasterAgreement">《NAFMII主协议》</div> <div class="master_agreement" @click="toMasterAgreement">《NAFMII主协议》</div>
{{qulificationDetail.memberType}} {{qulificationDetail.memberType}}
......
src/views/qulification/search.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</section> </section>
<section class="search_history"> <section class="search_history">
<div class="history_header"> <div class="history_header">
<span>搜索历史</span> <span>{{$t('qulification.history')}}</span>
<span class="delete_circle"> <span class="delete_circle">
<van-icon name="delete" /> <van-icon name="delete" />
</span> </span>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
</section> </section>
</main> </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="$t('button.cancel')" close-on-click-action @select="onSelect" />
</div> </div>
</template> </template>
<script> <script>
...@@ -133,6 +133,9 @@ export default { ...@@ -133,6 +133,9 @@ export default {
// width: 285px; // width: 285px;
color: #999999; color: #999999;
padding: 10px 0; padding: 10px 0;
overflow: hidden; /*超出部分隐藏*/
white-space: nowrap; /*不换行*/
text-overflow: ellipsis; /*超出部分文字以...显示*/
span { span {
padding-left: 15px; padding-left: 15px;
border-left: 0.5px solid #999999; border-left: 0.5px solid #999999;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!