Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/views/app/Home.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="home-container pb150">
+  <div class="home-container">
     <div class="pv10 text-center">ebiz h5 standard frame</div>
     <ul class="fs14 p20">
       <li class="fs18 mb10">基础工程项目：</li>

src/views/ebiz/agentEenter/AgentEenterBasicImage.vue

@@ -404,7 +404,6 @@ export default {
         this.$toast('您需要同时上传担保人身份证正面及反面图像，请上传')
         return
       }
-
       this.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击

src/views/ebiz/common/MainRiskList.vue

@@ -39,7 +39,8 @@ export default {
       list: [],
       result: '',
       delList: [],
-      radioVal: ''
+      radioVal: '',
+      isFrom: localStorage.isFrom
     }
   },
   async mounted() {
@@ -76,7 +77,16 @@ export default {
     //获取主险列表
     async getMainRiskList() {
       let mainRiskCodes = localStorage.mainRiskCodes && JSON.parse(localStorage.mainRiskCodes)
-      let resultData = await mainRiskList({ platform: localStorage.isFrom == 'proposal' ? 'proposal' : 'app' })
+      let mainListDate = { platform: 'app' }
+      switch (this.isFrom){
+        case 'proposal':
+          mainListDate.platform = 'proposal'
+          break;
+        case 'sale':
+          mainListDate.platform = 'app'
+          break;
+      }
+      let resultData = await mainRiskList(mainListDate)
       if (resultData.result == 0) {
         resultData.mainRiskDTOS.forEach(item => {
           //已选主险不能再选、险种互斥

src/views/ebiz/nbs/CrewList.vue

@@ -231,7 +231,7 @@ export default {
     }
   },
   async created() {
-    this.nbsAgentGrade = window.localStorage.getItem('nbsAgentGrade')
+    this.nbsAgentGrade = Number(window.localStorage.getItem('nbsAgentGrade'))
     setTimeout(() => {
       this.filterBtn() // 初始化下载按钮
       window.appCallBack = this.appCallBack //app回调
@@ -463,10 +463,11 @@ div.max {
   .status,
   .name,
   .date {
-    height: 27px;
     font-size: 14px;
     text-align: center;
-    line-height: 27px;
+    word-wrap: break-word;
+    word-break: normal;
+    line-height: 1.5em;
   }
   .status,
   .name {
@@ -568,4 +569,8 @@ div.max {
   justify-content: center;
   padding-top: 100px;
 }
+
+/deep/ .van-icon {
+  vertical-align: middle;
+}
 </style>

src/views/ebiz/nbs/InternalService.vue

@@ -13,7 +13,7 @@
       </div>
       <unit-nav :total="tableData.total"></unit-nav>
     </van-sticky>
-    <unit-list v-if="tableData" level="1" :dataLoading="tableData.list" :list="tableData.list" url="/nbs/internalItem"></unit-list>
+    <unit-list v-if="tableData" level="1" :dataLoading="tableData.list" :list="tableData.list" url="/#/nbs/internalItem"></unit-list>
     <van-popup v-model="showTime" position="bottom">
       <van-datetime-picker
         v-model="currentDate"

src/views/ebiz/nbs/InternalServiceItem.vue

@@ -6,7 +6,7 @@
       </div>
       <unit-nav :titleArr="titleArr" :key="changeKey"></unit-nav>
     </van-sticky>
-    <unit-list v-if="tableData" :list="searchList" :dataLoading="tableData.list" :level="level" url="/nbs/internalItem_2"></unit-list>
+    <unit-list v-if="tableData" :list="searchList" :dataLoading="tableData.list" :level="level" url="/#/nbs/internalItem_2"></unit-list>
   </div>
 </template>
 <script>

src/views/ebiz/nbs/InternalServiceItem_2.vue

@@ -6,7 +6,7 @@
       </div>
       <unit-nav :titleArr="titleArr" :key="changeKey"></unit-nav>
     </van-sticky>
-    <unit-list v-if="tableData" :list="searchList" :dataLoading="tableData.list" :level="level" url="/nbs/internalItem_2"></unit-list>
+    <unit-list v-if="tableData" :list="searchList" :dataLoading="tableData.list" :level="level" url="/#/nbs/internalItem_2"></unit-list>
   </div>
 </template>
 <script>