hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-24 17:12:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FIX]【home.vue解决冲突】

Browse Source
This commit is contained in:
yuweiqi
2020-07-03 19:13:24 +08:00
parent b1a9c089fb
commit 7b6abf466f
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/app/Home.vue
View File

@@ -25,36 +25,18 @@
<li><router-link to="/customer/customerList">客户管理</router-link></li>
<li><router-link to="/my/UserIncome">收入</router-link></li>
<li><router-link to="/serve/list">保单列表</router-link></li>
<<<<<<< HEAD
<li><router-link to="/agentEenter/agentEenterBasicInfor">自助入司</router-link></li>
<li><router-link to="/nbs/list">nbs列表</router-link></li>
<li><router-link to="/agentEenter/approve/ApproveList">入司审批列表</router-link></li>
<li><router-link to="/survey/surveyList">问卷调查</router-link></li>
<li><router-link to="/renewalManage/list">续期管理列表</router-link></li>
<li><router-link to="/nbs/list">nbs列表</router-link></li>
<li><router-link to="/nbs/internal">nb内勤</router-link></li>
<li><router-link to="/manpower/DiscAnalysis/List">DISC性格分析</router-link></li>
<li><router-link to="/preserve/common/search?entry=BB">保全-搜索-联系方式变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=BC">保全-搜索-受益人变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=PC">保全-搜索-续期账户变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=CT">保全-搜索-退保</router-link></li>
<li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹豫期退保</router-link></li>
<!-- <li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹退</router-link></li> -->
<li><router-link to="/manpower/DiscAnalysis/List">DISC性格分析</router-link></li>
=======
<!-- <li><router-link to="/agentEenter/agentEenterBasicInfor">自助入司</router-link></li> -->
<!-- <li><router-link to="/nbs/list">nbs列表</router-link></li> -->
<!-- <li><router-link to="/agentEenter/approve/ApproveList">入司审批列表</router-link></li> -->
<!-- <li><router-link to="/survey/surveyList">问卷调查</router-link></li> -->
<!-- <li><router-link to="/renewalManage/list">续期管理列表</router-link></li> -->
>>>>>>> 302be13bed418cca61334d53767c756ffcd2f461
<li><router-link to="/preserve/common/search?entry=BB">保全-搜索-联系方式变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=BC">保全-搜索-受益人变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=PC">保全-搜索-续期账户变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=CT">保全-搜索-退保</router-link></li>
<li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹豫期退保</router-link></li>
<!-- <li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹退</router-link></li> -->
<!-- <li><router-link to="/manpower/DiscAnalysis/List">DISC性格分析</router-link></li> -->
<li><router-link to="/preserve/common/search?entry=BB">保全-搜索-联系方式变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=BC">保全-搜索-受益人变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=PC">保全-搜索-续期账户变更</router-link></li>
<li><router-link to="/preserve/common/search?entry=CT">保全-搜索-退保</router-link></li>
<li><router-link to="/preserve/common/search?entry=WT">保全-搜索-犹豫期退保</router-link></li>
</ul>
</li>
<li class="mt10">