Skip to content

H
hls-xcmg-vue-app
Commit 9273b6c4 authored by linxin's avatar linxin
Browse files
Options

Merge branch 'uat' into develop

parents 63ffc923 3b2ed3aa
Pipeline #4904 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 9 additions and 9 deletions
      config/uat.env.js
      View file @ 9273b6c4
      ......@@ -11,5 +11,5 @@ module.exports = {
      ocrPath:'"http://180.104.121.66:8088/r/api"',
      fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
      appId: '"com.xcmg.app"',
      currentVersion: '"1.6.0"'
      currentVersion: '"1.6.2"'
      }
      src/pages/carConfirm/confirm-detail.vue
      View file @ 9273b6c4
      ......@@ -539,11 +539,10 @@ export default {
      vm.$post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      vm.equip = res.lists
      vm.hlsPopup.showSuccess('发车成功')
      setTimeout(() => {
      vm.$router.push({
      name: 'ConfirmList',
      name: 'MyInfo',
      })
      }, 2000)
      } else {
      ......
      src/pages/carConfirm/confirm-list.vue
      View file @ 9273b6c4
      ......@@ -25,7 +25,7 @@
      <div class="right-bottom">
      <ul>
      <li>
      承租人
      {{ item.bp_type_n }}
      <span>{{ item.bp_name }}</span>
      </li>
      <li>
      ......
      src/pages/contractCreate/creat-rent-info.vue
      View file @ 9273b6c4
      ......@@ -638,6 +638,7 @@ export default {
      vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
      vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
      vm.saveInfo.deposit_ratio = (vm.saveInfo.deposit_ratio_n.replace('%', '') / 100).toFixed(2)
      vm.saveInfo.int_rate = (vm.saveInfo.int_rate_n.replace('%', '') / 100).toFixed(2)
      vm.saveInfo.finance_amount = vm.finance_amount
      vm.saveInfo.credit_id = window.localStorage.credit_id
      let param = {
      ......
      src/pages/contractCreate/create-enclosure-info.vue
      View file @ 9273b6c4
      ......@@ -101,8 +101,8 @@
      </div>
      </div>
      <br>
      <div class="house">
      <p class="titles">特批申请书</p>
      <p class="titles">特批申请书</p>
      <div class="house spec">
      <!--待上传图片列表-->
      <div
      v-for="(item, index) in spec_upload_list"
      ......@@ -834,7 +834,7 @@ overflow:normal !important;
      }
      }
      .house:last-child, .house:nth-last-child(2){
      margin-top: 0;
      // margin-top: 0;
      div {
      float: left;
      }
      ......
      src/styles/public-style.less
      View file @ 9273b6c4
      ......@@ -23,7 +23,7 @@
      }
      .weui-toast_text .weui-toast__content{
      line-height: 22px;
      color: #ccc;;
      color: #ccc;
      img{
      width: 20px;
      }
      ......
      www/index.html
      View file @ 9273b6c4
      <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.65e262c0abe2783f66e1d28576afc0cd.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.24f57dd5a62e4a80a1b9.js></script></body></html>
      \ No newline at end of file
      <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.7b18e4303b47db667a28d8210dd4d0d0.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.d318a3d3c8ee9f0417fe.js></script></body></html>
      \ No newline at end of file
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment