add

config/dev.env.js

@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, {
   debug: true,
   isMobilePlatform: false,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
   ocrPath: '"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app.dev"',
   currentVersion: '"1.9.0"',

src/pages/contractCreate/sales-info.vue

@@ -253,12 +253,12 @@ export default {
         nowDate: (new Date()).format('yyyy-MM-dd'),
         format: format,
         callback: (date) => {
-          if (date >= (new Date()).format('yyyy-MM-dd')) {
-            vm.salesInfo.sale_date = date
-            window.localStorage.setItem('signDate', vm.salesInfo.sale_date)
-          } else {
-            hlsPopup.showLongCenter(`签约日期不能小于当天${(new Date()).format('yyyy-MM-dd')}`)
-          }
+          // if (date >= (new Date()).format('yyyy-MM-dd')) {
+          vm.salesInfo.sale_date = date
+          window.localStorage.setItem('signDate', vm.salesInfo.sale_date)
+          // } else {
+          // hlsPopup.showLongCenter(`签约日期不能小于当天${(new Date()).format('yyyy-MM-dd')}`)
+          // }
         },
       })
     },

src/pages/contractInquire/contract-records.vue

@@ -217,11 +217,20 @@ export default {
     // 合同记录
     recordQuery (status, arr) {
       let vm = this
-      let url = $config.basePath + 'con_contract_list'
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      // let url = $config.basePath + 'con_contract_list'
+      let url = $config.basePath + name
       let param = {
         user_phone: window.localStorage.user_phone,
         searchInput: vm.searchInput,
-        bp_type: vm.bp_type,
+        // bp_type: vm.bp_type,
         pagenum: 1,
         pagesize: 10,
         contract_status_n: status,
@@ -297,11 +306,20 @@ export default {
         vm.repayed_pagenum++
         vm.pageNum = vm.repayed_pagenum
       }
-      let url = $config.basePath + 'con_contract_list'
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      // let url = $config.basePath + 'con_contract_list'
+      let url = $config.basePath + name
       let param = {
         user_phone: window.localStorage.user_phone,
         searchInput: vm.searchInput,
-        bp_type: vm.bp_type,
+        // bp_type: vm.bp_type,
         pagenum: vm.pageNum,
         pagesize: 10,
         contract_status_n: vm.contract_status_n,
@@ -385,12 +403,21 @@ export default {
     },
     async searchAll () {
       let vm = this
-      let url = $config.basePath + 'con_contract_list'
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      // let url = $config.basePath + 'con_contract_list'
+      let url = $config.basePath + name
       let param = {
         contract_status_n: '全部',
         user_phone: window.localStorage.user_phone,
         searchInput: vm.searchInput,
-        bp_type: vm.bp_type,
+        // bp_type: vm.bp_type,
         pagenum: 1,
         pagesize: 10,
       }
@@ -416,12 +443,21 @@ export default {
     },
     async searchUnsign () {
       let vm = this
-      let url = $config.basePath + 'con_contract_list'
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      let url = $config.basePath + name
+      // let url = $config.basePath + 'con_contract_list'
       let param = {
         contract_status_n: '待首付',
         user_phone: window.localStorage.user_phone,
         searchInput: vm.searchInput,
-        bp_type: vm.bp_type,
+        // bp_type: vm.bp_type,
         pagenum: 1,
         pagesize: 10,
       }
@@ -447,12 +483,21 @@ export default {
 
     async searchUnrepay () {
       let vm = this
-      let url = $config.basePath + 'con_contract_list'
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      let url = $config.basePath + name
+      // let url = $config.basePath + 'con_contract_list'
       let param = {
         contract_status_n: '首付还款中',
         user_phone: window.localStorage.user_phone,
         searchInput: vm.searchInput,
-        bp_type: vm.bp_type,
+        // bp_type: vm.bp_type,
         pagenum: 1,
         pagesize: 10,
       }
@@ -478,12 +523,21 @@ export default {
 
     async searchRepaying () {
       let vm = this
-      let url = $config.basePath + 'con_contract_list'
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      let url = $config.basePath + name
+      // let url = $config.basePath + 'con_contract_list'
       let param = {
         contract_status_n: '还款中',
         user_phone: window.localStorage.user_phone,
         searchInput: vm.searchInput,
-        bp_type: vm.bp_type,
+        // bp_type: vm.bp_type,
         pagenum: 1,
         pagesize: 10,
       }
@@ -509,12 +563,21 @@ export default {
 
     searchRepayed () {
       let vm = this
-      let url = $config.basePath + 'con_contract_list'
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      let url = $config.basePath + name
+      // let url = $config.basePath + 'con_contract_list'
       let param = {
         contract_status_n: '已结清',
         user_phone: window.localStorage.user_phone,
         searchInput: vm.searchInput,
-        bp_type: vm.bp_type,
+        // bp_type: vm.bp_type,
         pagenum: 1,
         pagesize: 10,
       }

src/pages/contractInquire/repay-detail.vue

@@ -26,8 +26,8 @@
           <div slot="content">{{ detailInfo.project_number }}</div>
         </item>
         <item>
-          <div slot="name">经销商</div>
-          <div slot="content">{{ detailInfo.bp_agent_name }}</div>
+          <div slot="name">{{ detailInfo.bp_agent_name?'经销商':'办事处' }}</div>
+          <div slot="content">{{ detailInfo.bp_agent_name?detailInfo.bp_agent_name:detailInfo.office_name }}</div>
         </item>
         <item>
           <div slot="name">承租人</div>

src/pages/myInfo/my-info.vue

@@ -51,7 +51,7 @@
               <img src="@/assets/myInfo/under.png" >
               <p>我担保的合同</p>
             </div>
-            <div v-if="((user_bp_type==='AGENT')&&(multipleRole==='AGENT'))||(multipleRole==='AGENT')||((user_bp_type==='AGENT')&&(!multipleRole))" @click="changeContract('AGENT')">
+            <div v-if="((user_bp_type==='AGENT')&&(multipleRole==='AGENT'))||(multipleRole==='AGENT')||((user_bp_type==='AGENT')&&(!multipleRole))||(user_bp_type==='OFFICE')" @click="goContract">
               <img src="@/assets/myInfo/agent.png" >
               <p>我办理的合同</p>
             </div>
@@ -379,6 +379,13 @@ export default {
     typeCancle () {
       this.popSetectBox = false
     },
+    goContract () {
+      if (this.user_bp_type === 'OFFICE') {
+        this.changeContract('OFFICE')
+      } else {
+        this.changeContract('AGENT')
+      }
+    },
     // 监听用户状态
     watchBpStatus () {
       if (!this.bp_id && this.user_bp_status === 'NEW') {

src/pages/regiester2.vue

@@ -240,7 +240,7 @@ export default {
         if (res.result === 'S') {
           vm.hlsPopup.showSuccess('验证码已发送')
         } else {
-          vm.hlsPopup.showLongCenter(res.message)
+          vm.hlsPopup.showLongCenter(res.return.discription)
         }
       })
     },

src/pages/userBindNew/np/base-info.vue

@@ -935,9 +935,6 @@ export default {
         window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
         window.localStorage.setItem('bp_type', vm.baseInfo.bp_type)
         vm.bindCheck()
-        vm.$router.push({
-          name: 'NPInvoiceInfo',
-        })
         return res.bp_id
       } else {
         hlsPopup.hideLoading()