Merge branch 'liuin' into uat

src/pages/contractCreate/creat-rent-info.vue

@@ -727,8 +727,9 @@ export default {
       let param = {
         project_id: vm.saveInfo.project_id,
       }
-      // hlsPopup.showLoading('请稍候')
+      hlsPopup.showLoading('请稍候')
       let res = await vm.$post(url, param)
+      vm.hlsPopup.hideLoading()
       if (res.result === 'S') {
         if (res.info.success_flag === 'Y') {
           return true

src/pages/contractCreate/create-base-info.vue

@@ -567,6 +567,7 @@ export default {
       } else if (from.name === 'ContractCreateList' && vm.status === 'false') {
         vm.fromPutted = false
         vm.saveInfo.bp_id = vm.$route.params.bp_id
+        vm.project_status = vm.$route.params.project_status
         vm.showSpecialFlag = true // 是否展示农行代扣和是否特批
         vm.selectUdertake = []
         setTimeout(() => {

src/pages/contractCreate/create-enclosure-info.vue

@@ -72,8 +72,8 @@
         </div>
       </div>
       <div class="userInfo">补充资料</div>
-      <p v-if="npFlag" class="titles">抵押证书</p>
-      <div class="house spec">
+      <p v-if="npFlag" class="title">抵押证书</p>
+      <div v-if="npFlag" class="house spec">
         <!--抵押 待上传图片列表-->
         <div
           v-for="(item, index) in mort_upload_list"
@@ -101,7 +101,7 @@
         </div>
       </div>
       <br>
-      <p class="titles">特批申请书</p>
+      <p class="title">特批申请书</p>
       <div class="house spec">
         <!--待上传图片列表-->
         <div
@@ -192,10 +192,10 @@ export default {
         vm.mort_dowload_list = []
         vm.spec_dowload_list = []
         vm.cddItemList = []
-        vm.bpClass = window.localStorage.bp_class
+        vm.bpClass = window.localStorage.bp_class_tenant
         vm.status = window.localStorage.user_bp_status
         vm.fromPage = window.localStorage.fromPage
-        if (window.localStorage.bp_class === 'NP') {
+        if (window.localStorage.bp_class_tenant === 'NP') {
           vm.npFlag = true
         } else {
           vm.npFlag = false
@@ -663,6 +663,11 @@ export default {
       no-repeat;
     background-size: 20px 20px;
   }
+.title{
+ color: #656464;
+        margin-left: 16px;
+        font-size: 13px;
+  }
   .hls-list-item {
     margin-bottom: 0px !important;
   }