Skip to content

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

add

parents d07f9f7f 61386bbb
Pipeline #5453 canceled with stages
      Expand all Show whitespace changes
      Inline Side-by-side
      Showing with 582 additions and 253 deletions
      config/dev.env.js
      View file @ 8ede6c19
      ...@@ -21,7 +21,3 @@ module.exports = merge(prodEnv, { ...@@ -21,7 +21,3 @@ module.exports = merge(prodEnv, {
      config/prod.env.js
      View file @ 8ede6c19
      ...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
      ocrPath:'"http://www.xcmgfs.com:8087/r/api"', ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
      fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="', fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
      appId: '"com.xcmg.app"', appId: '"com.xcmg.app"',
      currentVersion: '"0.0.5"' currentVersion: '"0.1.1"'
      } }
      config/uat.env.js
      View file @ 8ede6c19
      ...@@ -11,6 +11,6 @@ module.exports = { ...@@ -11,6 +11,6 @@ module.exports = {
      ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
      fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
      appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
      currentVersion: '"1.9.0"' currentVersion: '"2.1.6"'
      } }
      index.html
      View file @ 8ede6c19
      ...@@ -22,16 +22,28 @@ ...@@ -22,16 +22,28 @@
      <body> <body>
      <div id="app-box"></div> <div id="app-box"></div>
      <!-- built files will be auto injected --> <!-- built files will be auto injected -->
      <!--<script> <!-- <script>
      if (window.history && window.history.pushState) { // if (window.history && window.history.pushState) {
      // 往历史记录里面添加一条新的当前页面的url // // 往历史记录里面添加一条新的当前页面的url
      history.pushState(null, null, document.URL) // history.pushState(null, null, document.URL)
      // 给 popstate 绑定一个方法 监听页面刷新 // // 给 popstate 绑定一个方法 监听页面刷新
      window.addEventListener('popstate', function(){ // window.addEventListener('popstate', function(){
      history.pushState(null, null, location.href ); // history.pushState(null, null, location.href );
      alert('请点击左上角返回按钮返回') // alert('请点击左上角返回按钮返回')
      }, false) // false阻止默认事件 // }, false) // false阻止默认事件
      } // }
      </script>--> // const u = navigator.userAgent;
      // if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) { //安卓手机
      // window.addEventListener('resize', function () {
      // // Document 对象的activeElement 属性返回文档中当前获得焦点的元素。
      // if (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'TEXTAREA') {
      // console.log('安卓触发', document.activeElement.tagName)
      // window.setTimeout(function() {
      // document.activeElement.scrollIntoView(true);
      // }, 50);
      // }
      // })
      // }
      </script> -->
      </body> </body>
      </html> </html>
      src/main.js
      View file @ 8ede6c19
      ...@@ -57,8 +57,9 @@ import hlsUtil from './scripts/hlsUtil' ...@@ -57,8 +57,9 @@ import hlsUtil from './scripts/hlsUtil'
      import Jpush from './scripts/jpushService' import Jpush from './scripts/jpushService'
      import Jmessage from './scripts/jmessageService' import Jmessage from './scripts/jmessageService'
      //
      if (process.env.CONFIG_ENV === 'uat' || process.env.CONFIG_ENV === 'dev') { // || process.env.CONFIG_ENV === 'prod'
      if (process.env.CONFIG_ENV === 'dev' || process.env.CONFIG_ENV === 'uat') {
      const VConsole = require('vconsole') const VConsole = require('vconsole')
      new VConsole() // eslint-disable-line new VConsole() // eslint-disable-line
      } }
      ...@@ -181,7 +182,19 @@ vum.$vumPlatform.registerBackButtonAction(function (e) { ...@@ -181,7 +182,19 @@ vum.$vumPlatform.registerBackButtonAction(function (e) {
      e.preventDefault() e.preventDefault()
      return false return false
      }, 101) }, 101)
      // input遮挡
      const u = navigator.userAgent
      if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) { // 安卓手机
      window.addEventListener('resize', function () {
      // Document 对象的activeElement 属性返回文档中当前获得焦点的元素。
      if (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'TEXTAREA') {
      console.log('安卓触发', document.activeElement.tagName)
      window.setTimeout(function () {
      document.activeElement.scrollIntoView(false)
      }, 50)
      }
      })
      }
      /* eslint-disable no-new */ /* eslint-disable no-new */
      new Vue({ new Vue({
      data () { data () {
      ......
      src/pages/contractCreate/add-undertake.vue
      View file @ 8ede6c19
      <template> <template>
      <h-view v-if="showFlag" id="add-person"> <h-view id="add-person">
      <h-header :proportion="[1,4,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
      <span slot="center" style="color:#fff">添加担保人</span> <div slot="left" class="h-header-btn">
      <span slot="right" style="color:#fff" @click="showFlag=false">取消</span> <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
      <span>合同创建</span>
      </div>
      </h-header> </h-header>
      <div class="search has-header"> <div class="search has-header">
      <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" > <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" >
      ...@@ -26,12 +28,12 @@ ...@@ -26,12 +28,12 @@
      </template> </template>
      <script> <script>
      export default { export default {
      props: { // props: {
      bp_agent_id: { // bp_agent_id: {
      type: String, // type: String,
      default: '', // default: '',
      }, // },
      }, // },
      data () { data () {
      return { return {
      undertakeList: [], // 担保人列表 undertakeList: [], // 担保人列表
      ...@@ -39,10 +41,17 @@ export default { ...@@ -39,10 +41,17 @@ export default {
      pagenum: 1, pagenum: 1,
      keyWord: '', keyWord: '',
      showFlag: false, showFlag: false,
      bp_agent_id: this.$route.params.bp_agent_id,
      } }
      }, },
      watch: { watch: {
      },
      beforeRouteEnter (to, from, next) {
      next(vm => {
      vm.init()
      vm.getUndertake()
      })
      }, },
      methods: { methods: {
      show () { show () {
      ...@@ -50,7 +59,7 @@ export default { ...@@ -50,7 +59,7 @@ export default {
      }, },
      init () { init () {
      this.undertakeList = [] this.undertakeList = []
      this.selectUdertake = [] this.selectUdertake = {}
      this.pagenum = 1 this.pagenum = 1
      this.keyWord = '' this.keyWord = ''
      }, },
      ...@@ -105,10 +114,17 @@ export default { ...@@ -105,10 +114,17 @@ export default {
      }) })
      }, },
      addUndertake (e) { addUndertake (e) {
      let vm = this
      this.selectUdertake = e this.selectUdertake = e
      this.$emit('addUnder', this.selectUdertake) // this.$emit('addUnder', this.selectUdertake)
      setTimeout(() => { setTimeout(() => {
      this.showFlag = false vm.$router.replace({
      name: 'CreateBaseInfo',
      params: {
      selectUdertake: vm.selectUdertake,
      },
      })
      vm.$router.go(-1)
      }, 100) }, 100)
      }, },
      getUndertake () { // 担保人查询 getUndertake () { // 担保人查询
      ...@@ -164,6 +180,7 @@ export default { ...@@ -164,6 +180,7 @@ export default {
      margin: 0 auto; margin: 0 auto;
      } }
      .search { .search {
      position: absolute;
      background-color: #fff; background-color: #fff;
      padding: 8px 12px; padding: 8px 12px;
      width: 100%; width: 100%;
      ...@@ -197,20 +214,27 @@ export default { ...@@ -197,20 +214,27 @@ export default {
      border: 2px solid #bcc6ff; border: 2px solid #bcc6ff;
      } }
      } }
      .content {
      position: absolute;
      top: 0;
      }
      .scrollContent {
      padding-top: 2rem;
      padding-bottom: 20px;
      }
      } }
      .platform-ios { .platform-ios {
      #person { #add-person {
      .scrollContent { .scrollContent {
      padding-top: 1.4rem; padding-top: 2.4rem;
      } }
      } }
      } }
      @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) { @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
      .platform-ios { .platform-ios {
      #person { #add-person {
      .scrollContent { .scrollContent {
      padding-top: 1.8rem; padding-top: 2.8rem;
      } }
      } }
      } }
      ...@@ -218,9 +242,9 @@ export default { ...@@ -218,9 +242,9 @@ export default {
      // iPhoneXR适配 // iPhoneXR适配
      @media (device-width: 414px) and (device-height: 896px) { @media (device-width: 414px) and (device-height: 896px) {
      .platform-ios { .platform-ios {
      #person { #add-person {
      .scrollContent { .scrollContent {
      padding-top: 1.8rem; padding-top: 2.8rem;
      } }
      .search { .search {
      input { input {
      ......
      src/pages/contractCreate/creat-rent-info.vue
      View file @ 8ede6c19
      ...@@ -846,7 +846,8 @@ export default { ...@@ -846,7 +846,8 @@ export default {
      }, */ }, */
      setTime () { setTime () {
      if (!this.saveInfo.lease_start_date) { if (!this.saveInfo.lease_start_date) {
      let signDate = new Date(window.localStorage.getItem('signDate').replace(/-/, '/')) let date = window.localStorage.getItem('signDate').replace(/-/g, '/')
      let signDate = new Date(date)
      let iToDay = signDate.getDate() let iToDay = signDate.getDate()
      let iToMon = signDate.getMonth() let iToMon = signDate.getMonth()
      let iToYear = signDate.getFullYear() let iToYear = signDate.getFullYear()
      ...@@ -856,13 +857,15 @@ export default { ...@@ -856,13 +857,15 @@ export default {
      }, },
      showTime (format) { // 预计付款日 showTime (format) { // 预计付款日
      let vm = this let vm = this
      let signDate = new Date(window.localStorage.getItem('signDate').replace(/-/, '/')) let date = window.localStorage.getItem('signDate').replace(/-/g, '/')
      let signDate = new Date(date)
      let iToDay = signDate.getDate() let iToDay = signDate.getDate()
      let iToMon = signDate.getMonth() let iToMon = signDate.getMonth()
      let iToYear = signDate.getFullYear() let iToYear = signDate.getFullYear()
      let newDay = new Date(iToYear, iToMon, (iToDay + 30)) let newDay = new Date(iToYear, iToMon, (iToDay + 30))
      hlsPopup.showTime({ hlsPopup.showTime({
      nowDate: newDay.format('yyyy-MM-dd'), // nowDate: newDay.format('yyyy-MM-dd'),
      nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'),
      format: format, format: format,
      callback: (date) => { callback: (date) => {
      if (date >= (new Date()).format('yyyy-MM-dd')) { if (date >= (new Date()).format('yyyy-MM-dd')) {
      ......
      src/pages/contractCreate/create-base-info.vue
      View file @ 8ede6c19
      ...@@ -382,15 +382,15 @@ ...@@ -382,15 +382,15 @@
      <tab-button class="before" @click.native="$routeGo()">上一步</tab-button> <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
      <tab-button class="next" @click.native="save">下一步</tab-button> <tab-button class="next" @click.native="save">下一步</tab-button>
      </bottom-tab> </bottom-tab>
      <AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder" /> <!-- <AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder" /> -->
      </h-view> </h-view>
      </template> </template>
      <script> <script>
      import AddUnderTake from '../../pages/contractCreate/add-undertake' // import AddUnderTake from '../../pages/contractCreate/add-undertake'
      export default { export default {
      components: { // components: {
      AddUnderTake, // AddUnderTake,
      }, // },
      data () { data () {
      return { return {
      salesEnter: '', // 页面进入标识，该字段作用：第一次创建时即从销售页面进入进本信息、租赁信息、附件信息。用于判断后面页面录入数据后未保存则点击上一步，再次进入该页面数据丢失问题 salesEnter: '', // 页面进入标识，该字段作用：第一次创建时即从销售页面进入进本信息、租赁信息、附件信息。用于判断后面页面录入数据后未保存则点击上一步，再次进入该页面数据丢失问题
      ...@@ -585,6 +585,10 @@ export default { ...@@ -585,6 +585,10 @@ export default {
      vm.getSaveInfo() vm.getSaveInfo()
      vm.getBaseInfo() vm.getBaseInfo()
      }, 0) }, 0)
      } else if (from.name === 'Addundertake') {
      if (vm.$route.params.selectUdertake) {
      vm.addUnder(vm.$route.params.selectUdertake)
      }
      } }
      }) })
      }, },
      ...@@ -664,17 +668,25 @@ export default { ...@@ -664,17 +668,25 @@ export default {
      } }
      }, },
      addPerson () { addPerson () {
      this.$refs.addperson.init() // this.$refs.addperson.init()
      this.$refs.addperson.getUndertake() // this.$refs.addperson.getUndertake()
      this.$refs.addperson.show() // this.$refs.addperson.show()
      this.$router.push({
      name: 'Addundertake',
      params: {
      bp_agent_id: this.bp_agent_id,
      },
      })
      }, },
      makeData () { makeData () {
      let obj = {} let obj = {}
      if (this.selectUdertake.length > 0) {
      this.selectUdertake.forEach((i, index, arr) => { this.selectUdertake.forEach((i, index, arr) => {
      obj[`bp_id_guta_${index + 1}`] = i.bp_guta_id obj[`bp_id_guta_${index + 1}`] = i.bp_guta_id
      }) })
      return obj return obj
      }
      }, },
      getAgentInfo () { getAgentInfo () {
      let vm = this let vm = this
      ...@@ -1202,47 +1214,6 @@ export default { ...@@ -1202,47 +1214,6 @@ export default {
      } }
      } }
      } }
      #add-person {
      .item {
      width: 359px;
      margin: 0 auto;
      }
      .search {
      background-color: #fff;
      padding: 8px 12px;
      width: 100%;
      height: 1.02rem;
      z-index: 100;
      margin-bottom: 8px;
      input {
      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
      background-size: 16px 16px;
      background-color: rgba(239, 239, 239, 0.55);
      padding-left: 12px;
      height: 36px;
      line-height: 36px;
      border-radius: 4px;
      width: 100%;
      font-family: PingFangSC-Regular;
      font-size: 14px;
      color: #888c8f;
      }
      input::placeholder {
      font-family: PingFangSC-Regular;
      font-size: 14px;
      color: #888c8f;
      letter-spacing: 0;
      }
      input:focus {
      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
      background-size: 16px 16px;
      background-color: rgba(239, 239, 239, 0.55);
      border: 2px solid #bcc6ff;
      }
      }
      }
      @media (device-width: 414px) and (device-height: 896px) { @media (device-width: 414px) and (device-height: 896px) {
      .platform-ios { .platform-ios {
      #add-person { #add-person {
      ......
      src/pages/contractCreate/sales-info.vue
      View file @ 8ede6c19
      ...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
      type="text" type="text"
      readonly readonly
      placeholder="请选择" placeholder="请选择"
      @click="selectFactory"
      > >
      </item> </item>
      <item> <item>
      ...@@ -179,20 +178,20 @@ export default { ...@@ -179,20 +178,20 @@ export default {
      } }
      }, },
      watch: { watch: {
      'salesInfo.factory': { // 'salesInfo.factory': {
      handler (newVal, oldVal) { // handler (newVal, oldVal) {
      this.factoty.forEach(i => { // this.factoty.forEach(i => {
      if (i.bp_factory_id === this.salesInfo['factory']) { // if (i.bp_factory_id === this.salesInfo['factory']) {
      this.inflow_line = i.inflow_line // this.inflow_line = i.inflow_line
      this.inflow_used = i.inflow_used // this.inflow_used = i.inflow_used
      this.inflow_reset = i.inflow_reset // this.inflow_reset = i.inflow_reset
      this.salesInfo.credit_id = i.credit_id // this.salesInfo.credit_id = i.credit_id
      window.localStorage.setItem('credit_id', i.credit_id) // window.localStorage.setItem('credit_id', i.credit_id)
      } // }
      }) // })
      }, // },
      immediate: true, // immediate: true,
      }, // },
      // '$route' (to, from) { // '$route' (to, from) {
      // debugger // debugger
      // if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') { // if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') {
      ...@@ -236,8 +235,8 @@ export default { ...@@ -236,8 +235,8 @@ export default {
      } }
      vm.businessQuery().then(res => { vm.businessQuery().then(res => {
      vm.agentQuery().then(res => { vm.agentQuery().then(res => {
      vm.factoryQuery().then(res => { // vm.factoryQuery().then(res => {
      }) // })
      }) })
      }) })
      } else if (from.name === 'CreateBaseInfo') { } else if (from.name === 'CreateBaseInfo') {
      ...@@ -328,6 +327,7 @@ export default { ...@@ -328,6 +327,7 @@ export default {
      vm.office_name = res.info.bp_agent_name vm.office_name = res.info.bp_agent_name
      vm.salesInfo.office_id = res.info.bp_agent_id vm.salesInfo.office_id = res.info.bp_agent_id
      vm.salesInfo.bp_id_agent = '' vm.salesInfo.bp_id_agent = ''
      vm.factoryQuery()
      } else { } else {
      vm.salesInfo.bp_id_agent = res.info.bp_agent_id vm.salesInfo.bp_id_agent = res.info.bp_agent_id
      } }
      ...@@ -344,18 +344,28 @@ export default { ...@@ -344,18 +344,28 @@ export default {
      let vm = this let vm = this
      let url = process.env.basePath + 'prj_factory_list' let url = process.env.basePath + 'prj_factory_list'
      let param = { let param = {
      office_id: vm.salesInfo.office_id,
      phone: window.localStorage.getItem('user_phone'), phone: window.localStorage.getItem('user_phone'),
      } }
      vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
      return vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
      vm.factoty = res.lists // vm.factoty = res.lists
      if (res.result === 'S') { if (res.result === 'S') {
      vm.factoryLists = res.lists.map(item => { // vm.factoryLists = res.lists.map(item => {
      return { // return {
      code: item.bp_factory_id, // code: item.bp_factory_id,
      code_name: item.bp_factory_name, // code_name: item.bp_factory_name,
      } // }
      // })
      res.lists.forEach(i => {
      vm.inflow_line = i.inflow_line
      vm.inflow_used = i.inflow_used
      vm.inflow_reset = i.inflow_reset
      vm.salesInfo.factory = i.bp_factory_id
      vm.salesInfo.credit_id = i.credit_id
      vm.factory_name = i.bp_factory_name
      window.localStorage.setItem('credit_id', i.credit_id)
      }) })
      } }
      }) })
      ...@@ -439,6 +449,7 @@ export default { ...@@ -439,6 +449,7 @@ export default {
      returnItem: function (index, obj) { returnItem: function (index, obj) {
      vm.salesInfo.office_id = obj.office_type vm.salesInfo.office_id = obj.office_type
      vm.office_name = obj.office_type_n vm.office_name = obj.office_type_n
      vm.factoryQuery()
      }, },
      }) })
      }, },
      ......
      src/pages/home/home-page.vue
      View file @ 8ede6c19
      ...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
      <div slot="content" class="item-content"> <div slot="content" class="item-content">
      <div class="top">{{ list.product_name }}</div> <div class="top">{{ list.product_name }}</div>
      <img src="@/assets/homePage/hot.png" class="hot"> <img src="@/assets/homePage/hot.png" class="hot">
      <div class="center"><span class="firsts">经销商</span> <span class="seconds">{{ list.bp_name }}</span></div> <div class="center"><span class="firsts">{{ !list.office_id&&!list.agent_id?"-":(list.office_id?'办事处':'经销商') }}</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?"-":(list.office_id?list.office_name:list.agent_name) }}</span></div>
      <div class="center"><span class="firsts">产品型号</span> <span class="seconds">{{ list.product_code }}</span></div> <div class="center"><span class="firsts">产品型号</span> <span class="seconds">{{ list.product_code }}</span></div>
      <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ list.province_id_n === list.city_id_n?list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n + list.district_id_n }}</span></div> <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?( list.province_id_n === list.city_id_n?(list.district_id_n?list.city_id_n + list.district_id_n:list.city_id_n):(list.district_id_n?list.province_id_n + list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n )):(list.office_id? (list.office_province === list.office_city?(list.office_district?list.office_city + list.office_district:list.office_city ):(list.office_district?list.office_province + list.office_city + list.office_district:list.office_province + list.office_city)):(list.agent_province === list.agent_city?(list.agent_district?list.agent_city + list.agent_district:list.agent_city):(list.agent_district?list.agent_province + list.agent_city + list.agent_district:list.agent_province + list.agent_city))) }}</span></div>
      </div> </div>
      </item> </item>
      </list-item> </list-item>
      ...@@ -102,27 +102,27 @@ export default { ...@@ -102,27 +102,27 @@ export default {
      // 定位 // 定位
      getLocation () { getLocation () {
      let vm = this let vm = this
      if (vum.Platform.isAndroid()) { // 安卓采用jsapi // if (vum.Platform.isAndroid()) { // 安卓采用jsapi
      var geolocation = new BMap.Geolocation() // var geolocation = new BMap.Geolocation()
      vm.hlsPopup.showLoading('数据加载中') // vm.hlsPopup.showLoading('数据加载中')
      geolocation.getCurrentPosition(function (res) { // geolocation.getCurrentPosition(function (res) {
      vm.hlsPopup.hideLoading() // vm.hlsPopup.hideLoading()
      if (this.getStatus() === 0) { // if (this.getStatus() === 0) {
      // 判断是否是手动选择过定位 // // 判断是否是手动选择过定位
      if (window.localStorage.getItem('province')) { // if (window.localStorage.getItem('province')) {
      vm.city = window.localStorage.getItem('city') // vm.city = window.localStorage.getItem('city')
      vm.province = window.localStorage.getItem('province') // vm.province = window.localStorage.getItem('province')
      vm.guessingQuery(vm.city) // vm.guessingQuery(vm.city)
      } else { // } else {
      // 没有就定位当前位置 // // 没有就定位当前位置
      console.log(res) // console.log(res)
      vm.city = res.address.city // vm.city = res.address.city
      vm.province = res.address.province // vm.province = res.address.province
      vm.guessingQuery(res.address.city) // vm.guessingQuery(res.address.city)
      } // }
      } // }
      }, {enableHighAccuracy: true}) // }, {enableHighAccuracy: true})
      } else { // ios使用插件定位 // } else { // ios使用插件定位
      console.log('&&&&&&&&&&&&___ios') console.log('&&&&&&&&&&&&___ios')
      baidumap_location.getCurrentPosition(function (result) { baidumap_location.getCurrentPosition(function (result) {
      if (window.localStorage.getItem('province')) { if (window.localStorage.getItem('province')) {
      ...@@ -136,7 +136,7 @@ export default { ...@@ -136,7 +136,7 @@ export default {
      } }
      }, function (error) { }, function (error) {
      }) })
      } // }
      // setTimeout(vm.guessingQuery(), 0) // setTimeout(vm.guessingQuery(), 0)
      }, },
      goFunctionHome (data) { goFunctionHome (data) {
      ......
      src/pages/home/location.vue
      View file @ 8ede6c19
      ...@@ -95,22 +95,22 @@ export default { ...@@ -95,22 +95,22 @@ export default {
      // 重新定位到当前位置 // 重新定位到当前位置
      relocation () { relocation () {
      let vm = this let vm = this
      if (vum.Platform.isAndroid()) { // 安卓采用jsapi // if (vum.Platform.isAndroid()) { // 安卓采用jsapi
      var geolocation = new BMap.Geolocation() // var geolocation = new BMap.Geolocation()
      geolocation.getCurrentPosition(function (res) { // geolocation.getCurrentPosition(function (res) {
      if (this.getStatus() === 0) { // if (this.getStatus() === 0) {
      window.localStorage.setItem('province', res.address.province) // window.localStorage.setItem('province', res.address.province)
      window.localStorage.setItem('city', res.address.city) // window.localStorage.setItem('city', res.address.city)
      vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city') // vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city')
      vm.province = '请选择省' // vm.province = '请选择省'
      vm.city = '请选择市' // vm.city = '请选择市'
      vm.flag = false // vm.flag = false
      vm.province_flag = true // vm.province_flag = true
      } // }
      }, function (error) { // }, function (error) {
      console.log(error) // console.log(error)
      }, {enableHighAccuracy: true}) // }, {enableHighAccuracy: true})
      } else { // ios使用插件定位 // } else { // ios使用插件定位
      baidumap_location.getCurrentPosition(function (result) { baidumap_location.getCurrentPosition(function (result) {
      console.log('*********** ' + JSON.stringify(result)) console.log('*********** ' + JSON.stringify(result))
      window.localStorage.setItem('province', result.province) window.localStorage.setItem('province', result.province)
      ...@@ -123,7 +123,7 @@ export default { ...@@ -123,7 +123,7 @@ export default {
      }, function (error) { }, function (error) {
      console.log('errorerrorerrorerror ' + error) console.log('errorerrorerrorerror ' + error)
      }) })
      } // }
      }, },
      // 省份查询 // 省份查询
      ......
      src/pages/login.vue
      View file @ 8ede6c19
      ...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
      </transition> </transition>
      <div class="bird-icon" /> <div class="bird-icon" />
      <div class="login-wrap"> <div class="login-wrap">
      <img class="title" src="../assets/login/logintitle.png" > <img class="title" src="../assets/login/right-title.png" >
      <div class="pwd"> <div class="pwd">
      <div class="pwd-input"> <div class="pwd-input">
      <input <input
      ......
      src/pages/pay/firstPay/pay-entry.vue
      View file @ 8ede6c19
      ...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
      <div class="info"> <div class="info">
      <div class="info-item"> <div class="info-item">
      <span>还款金额</span> <span>还款金额</span>
      <span>¥{{ parseFloat(money).toFixed(2) |currency }}</span> <span>{{ parseFloat(money).toFixed(2) |currency }}</span>
      </div> </div>
      <div class="interest"> <div class="interest">
      <span>本次交易收取{{ rate }}%手续费</span> <span>本次交易收取{{ rate }}%手续费</span>
      ......
      src/pages/regiester2.vue
      View file @ 8ede6c19
      ...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
      </div> </div>
      <div class="box"> <div class="box">
      <div class="box-content"> <div class="box-content">
      <img class="register-title" src="../assets/login/regester.png" > <img class="register-title" src="../assets/login/right-register.png" >
      <div class="reg-item"> <div class="reg-item">
      <img src="../assets/login/reg-user.png" class="left-icon" > <img src="../assets/login/reg-user.png" class="left-icon" >
      <input v-model="phone_number" placeholder="请输入手机号码" > <input v-model="phone_number" placeholder="请输入手机号码" >
      ......
      src/pages/userBindNew/np/accessory-info.vue
      View file @ 8ede6c19
      ...@@ -587,22 +587,22 @@ export default { ...@@ -587,22 +587,22 @@ export default {
      } }
      }, },
      attachmentCheck () { attachmentCheck () {
      let vm = this // let vm = this
      let url = process.env.basePath + 'bp_attachment_check' // let url = process.env.basePath + 'bp_attachment_check'
      let param = { // let param = {
      bp_id: window.localStorage.getItem('bp_id'), // bp_id: window.localStorage.getItem('bp_id'),
      } // }
      vm.hlsPopup.showLoading('正在校验数据') // vm.hlsPopup.showLoading('正在校验数据')
      vm.hlsHttp.post(url, param).then(function (res) { // vm.hlsHttp.post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading() // vm.hlsPopup.hideLoading()
      if (res.result === 'S') { // if (res.result === 'S') {
      vm.$router.push({ this.$router.push({
      name: 'NPBankInfo', name: 'NPBankInfo',
      }) })
      } else { // } else {
      hlsPopup.showError(res.message) // hlsPopup.showError(res.message)
      } // }
      }) // })
      }, },
      async getHouseInfo () { async getHouseInfo () {
      let vm = this let vm = this
      ......
      src/pages/userBindNew/org/bankInfo.vue
      View file @ 8ede6c19
      ...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
      </div> </div>
      </div> </div>
      <bottom-tab class="footer-button"> <bottom-tab class="footer-button">
      <tab-button class="save" @click.native="handSubmit">提交</tab-button> <tab-button class="save" @click.native="addCheck">提交</tab-button>
      </bottom-tab> </bottom-tab>
      <h-modal ref="modal" v-model="showModalValue" position="bottom"> <h-modal ref="modal" v-model="showModalValue" position="bottom">
      <h-view> <h-view>
      ...@@ -169,6 +169,29 @@ export default { ...@@ -169,6 +169,29 @@ export default {
      }) })
      }, },
      methods: { methods: {
      // 提交前校验
      addCheck () {
      let vm = this
      let url = process.env.basePath + 'bp_attachment_check'
      let param = {
      bp_id: vm.$route.params.bp_id,
      }
      if (window.localStorage.getItem('authFlag') === 'true') {
      console.log(11111111111)
      vm.handSubmit()
      } else {
      console.log(2222222222)
      hlsPopup.showLoading('请稍候')
      vm.$post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      vm.handSubmit()
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      })
      }
      },
      // 银行卡查询 // 银行卡查询
      getBankInfo () { getBankInfo () {
      let vm = this let vm = this
      ...@@ -276,7 +299,7 @@ export default { ...@@ -276,7 +299,7 @@ export default {
      } }
      }, },
      putData () { putData () {
      this.throttle(this.handSubmit(), 3000) this.throttle(this.addCheck(), 3000)
      }, },
      // 提交 // 提交
      async handSubmit () { async handSubmit () {
      ...@@ -372,8 +395,9 @@ export default { ...@@ -372,8 +395,9 @@ export default {
      vm.authUrl = res.info.data.authUrl vm.authUrl = res.info.data.authUrl
      return vm.authUrl return vm.authUrl
      } else if ((res.info.code === 0) && (res.info.data.openId)) { } else if ((res.info.code === 0) && (res.info.data.openId)) {
      vm.authUrl = res.info.data.openId // vm.authUrl = res.info.data.openId
      return vm.authUrl // return vm.authUrl
      return false
      } else { } else {
      // hlsPopup.showError(res.info.msg) // hlsPopup.showError(res.info.msg)
      // vm.errorMsg = res.info.msg // vm.errorMsg = res.info.msg
      ......
      src/pages/userBindNew/org/baseInfo.vue
      View file @ 8ede6c19
      This diff is collapsed.
      src/pages/userBindNew/org/enclosure.vue
      View file @ 8ede6c19
      ...@@ -563,23 +563,6 @@ export default { ...@@ -563,23 +563,6 @@ export default {
      }) })
      }, },
      methods: { methods: {
      // 附件信息保存前校验
      addCheck () {
      let vm = this
      let url = process.env.basePath + 'bp_attachment_check'
      let param = {
      bp_id: vm.bp_id,
      }
      hlsPopup.showLoading('请稍候')
      vm.$post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      })
      },
      addRow (e, event) { addRow (e, event) {
      // let num = Math.ceil((el.target.scrollHeight - 42) / 20) // let num = Math.ceil((el.target.scrollHeight - 42) / 20)
      // if (num > 0) { // if (num > 0) {
      ......
      src/router/index.js
      View file @ 8ede6c19
      ...@@ -126,6 +126,7 @@ import CreateBaseInfo from '@/pages/contractCreate/create-base-info' ...@@ -126,6 +126,7 @@ import CreateBaseInfo from '@/pages/contractCreate/create-base-info'
      import CreateRentInfo from '@/pages/contractCreate/creat-rent-info' import CreateRentInfo from '@/pages/contractCreate/creat-rent-info'
      import CreateEnclosureInfo from '@/pages/contractCreate/create-enclosure-info' import CreateEnclosureInfo from '@/pages/contractCreate/create-enclosure-info'
      import previewPdf from '@/pages/contractSigning/previewPdf' import previewPdf from '@/pages/contractSigning/previewPdf'
      import Addundertake from '@/pages/contractCreate/add-undertake'
      import About from '@/pages/myInfo/About' import About from '@/pages/myInfo/About'
      import UserAgree from '@/pages/myInfo/UserAgreement' import UserAgree from '@/pages/myInfo/UserAgreement'
      ...@@ -302,6 +303,8 @@ export default new Router({ ...@@ -302,6 +303,8 @@ export default new Router({
      {path: '/create-rent-info', component: CreateRentInfo, name: 'CreateRentInfo', meta: {keepAlive: true}}, {path: '/create-rent-info', component: CreateRentInfo, name: 'CreateRentInfo', meta: {keepAlive: true}},
      {path: '/create-enclosure-info', component: CreateEnclosureInfo, name: 'CreateEnclosureInfo', meta: {keepAlive: true}}, {path: '/create-enclosure-info', component: CreateEnclosureInfo, name: 'CreateEnclosureInfo', meta: {keepAlive: true}},
      {path: '/previewPdf', component: previewPdf, name: 'previewPdf', meta: {keepAlive: false}}, {path: '/previewPdf', component: previewPdf, name: 'previewPdf', meta: {keepAlive: false}},
      {path: '/add-undertake', component: Addundertake, name: 'Addundertake', meta: {keepAlive: false}},
      // 我的发票 // 我的发票
      {path: '/invoice', component: MyInvoice, name: 'MyInvoice', meta: {keepAlive: false}}, {path: '/invoice', component: MyInvoice, name: 'MyInvoice', meta: {keepAlive: false}},
      { {
      ......
      www.zip 0 → 100644
      View file @ 8ede6c19
      File added
      www/index.html
      View file @ 8ede6c19
      <!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.86fcba644d8041457ce897f4067d5333.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.df6dc5efef3e34ce596d.js></script></body></html> <!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.d089c3d6affb6993374aa520f9b599cf.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.adf9b230a1046c0fc990.js></script><script type=text/javascript src=./static/js/app.8001ee304fb16957d18d.js></script></body></html>
      \ No newline at end of file \ 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