Merge branch 'liuin' into uat

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/contractRepayment/refund.vue

@@ -16,19 +16,19 @@
               <th>款项</th>
               <th>应还金额</th>
               <th>还款金额</th>
-              <th>支付方式</th>
+              <!-- <th>支付方式</th> -->
             </tr>
             <tr>
               <td>本金</td>
               <td>{{ pop.principal|currency }}</td>
               <td>{{ pop.received_principal|currency }}</td>
-              <td>{{ pop.pay_method }}</td>
+              <!-- <td>{{ pop.pay_method }}</td> -->
             </tr>
             <tr>
               <td>利息</td>
               <td>{{ pop.interest|currency }}</td>
               <td>{{ pop.received_interest|currency }}</td>
-              <td>{{ pop.pay_method }}</td>
+              <!-- <td>{{ pop.pay_method }}</td> -->
             </tr>
           </table>
         </div>
@@ -69,23 +69,25 @@
           <div class="name">
             <p>
               现金流项目
-              <span>支付方式</span>
+              <!-- <span>支付方式</span> -->
+              <span>已还金额</span>
+
             </p>
             <p>
               {{ item.cf_item_name }}
-              <span>{{ item.pay_method }}</span>
+              <!-- <span>{{ item.pay_method }}</span> -->
+              <span
+                :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
+              >{{ item.received_amount|currency }}</span>
             </p>
           </div>
           <div class="name">
             <p>
               应还金额
-              <span>已还金额</span>
             </p>
             <p>
               {{ parseFloat(item.due_amount).toFixed(2)|currency }}
-              <span
-                :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
-              >{{ item.received_amount|currency }}</span>
+
             </p>
           </div>
         </div>

src/pages/contractSigning/contract-detail.vue

@@ -746,7 +746,7 @@ export default {
           window.localStorage.setItem('backFlag', true)
           vm.$routeGo()
         } else {
-          vm.hlsPopup.showSuccess(res.message)
+          vm.hlsPopup.showLongCenter(res.message)
         }
       })
     },

src/pages/contractSigning/entry-info.vue

@@ -245,7 +245,7 @@ export default {
           vm.hlsPopup.hideLoading()
           if (res.result === 'S') {
             vm.hlsPopup.showSuccess('保存成功')
-            vm.$routeGo()
+            vm.checkBank()
             // vm.$router.push({
             //   name: 'ContractDetail',
             //   // params: {
@@ -258,6 +258,23 @@ export default {
         })
       }
     },
+    checkBank () {
+      let vm = this
+      let url = $config.basePath + 'abc_bank_sign'
+      let param = {
+        project_id: vm.bank_lists.project_id,
+        trans_type: 0,
+      }
+      vm.hlsPopup.showLoading('请稍后')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$routeGo()
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     bankCardQuery () {
       let vm = this
       let url = $config.basePath + 'con_bank_query'