Skip to content

H
hls-xcmg-vue-app
Commit 5d89a83b authored by Jennie Shi's avatar Jennie Shi
Browse files
Options

fix

parents df4c2ad5 731ab4d0
Pipeline #5012 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 5 additions and 25 deletions
      config/dev.env.js
      View file @ 5d89a83b
      ...@@ -8,7 +8,7 @@ module.exports = merge(prodEnv, { ...@@ -8,7 +8,7 @@ module.exports = merge(prodEnv, {
      debug: true, debug: true,
      isMobilePlatform: false, isMobilePlatform: false,
      loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ', 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"', rootPath: '"http://180.104.121.66:8088/r/api"',
      filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"', filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
      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="',
      ......
      src/pages/messageCenter/reject-detail.vue
      View file @ 5d89a83b
      ...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
      } }
      hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
      vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
      // vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
      if (res.result === 'S') { if (res.result === 'S') {
      vm.notice_detail = res.info.notice_body vm.notice_detail = res.info.notice_body
      } else { } else {
      ......
      src/pages/myInfo/my-info.vue
      View file @ 5d89a83b
      ...@@ -66,14 +66,7 @@ ...@@ -66,14 +66,7 @@
      <img src="@/assets/myInfo/under.png" > <img src="@/assets/myInfo/under.png" >
      <p>我担保的合同</p> <p>我担保的合同</p>
      </div> </div>
      <<<<<<< HEAD
      <div v-if="((user_bp_type==='AGENT')&&(multipleRole==='AGENT'))||(multipleRole==='AGENT')||((user_bp_type==='AGENT')&&(!multipleRole))||(user_bp_type==='OFFICE')" @click="goContract"> <div v-if="((user_bp_type==='AGENT')&&(multipleRole==='AGENT'))||(multipleRole==='AGENT')||((user_bp_type==='AGENT')&&(!multipleRole))||(user_bp_type==='OFFICE')" @click="goContract">
      =======
      <div
      v-if="((user_bp_type==='AGENT')&&(multipleRole==='AGENT'))||(multipleRole==='AGENT')||((user_bp_type==='AGENT')&&(!multipleRole))"
      @click="changeContract('AGENT')"
      >
      >>>>>>> jeshi
      <img src="@/assets/myInfo/agent.png" > <img src="@/assets/myInfo/agent.png" >
      <p>我办理的合同</p> <p>我办理的合同</p>
      </div> </div>
      ...@@ -105,13 +98,7 @@ ...@@ -105,13 +98,7 @@
      <img src="@/assets/myInfo/unSign.png" > <img src="@/assets/myInfo/unSign.png" >
      <p>待签约</p> <p>待签约</p>
      </div> </div>
      <!-- <div class="content-wrap" @click="goConfirm">
      <span
      :class="{'content-wrap-class-width':confirmCount>99, 'content-wrap-class':confirmCount<99}"
      >{{ confirmCount > 99 ? '99+' : confirmCount }}</span>
      <img src="@/assets/myInfo/unConfirm.png" >
      <p>待确认</p>
      </div>-->
      <div v-if="user_bp_type!=='FACTORY'" class="content-wrap" @click="goVideoSign"> <div v-if="user_bp_type!=='FACTORY'" class="content-wrap" @click="goVideoSign">
      <span <span
      v-if="faceSign > 0" v-if="faceSign > 0"
      ...@@ -163,15 +150,7 @@ ...@@ -163,15 +150,7 @@
      <img slot="left-icon" src="@/assets/myInfo/about.png" class="left-icon" > <img slot="left-icon" src="@/assets/myInfo/about.png" class="left-icon" >
      <div slot="name">关于徐工</div> <div slot="name">关于徐工</div>
      </item> </item>
      <!-- <item @click.native="updateVersion">
      <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
      <div slot="name">检查更新</div>
      </item>-->
      <!-- <item @click.native="openTest">
      <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
      <div slot="name">当前版本</div>
      <div slot="content">{{ currentVersion }}</div>
      </item>-->
      <item @click.native="logOut"> <item @click.native="logOut">
      <img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" > <img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" >
      <div slot="name">退出登录</div> <div slot="name">退出登录</div>
      ......
      www/index.html 0 → 100644
      View file @ 5d89a83b
      <!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.3e4289c3a03bc2b076ec4d914dfb4bba.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.d56dec0015f4cf7e8b3b.js></script><script type=text/javascript src=./static/js/app.da2cdd7ca6ffd4a9106e.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