jeshi

ed766e46 · Jennie Shi · 447ba479 · 6dcb7a8e · ed766e46 · ed766e46
Commit ed766e46 authored Jan 14, 2020 by Jennie Shi
9 changed files
--- a/config.xml
+++ b/config.xml
@@ -102,4 +102,5 @@
    <plugin name="cordova-plugin-device" spec="2.0.2" />
    <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
    <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
+    <engine name="android" spec="~6.2.0" />
 </widget>
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@
  <script type="text/javascript" src="cordova.js"></script>
  <!-- 定位 -->
  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script>
-  <title>徐工融租</title>
+  <title>徐工金服</title>
 </head>
 <body>
 <div id="app-box"></div>

--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
    "crypto-js": "^3.1.9-1",
    "fastclick": "https://hel.hand-china.com/easyUI/fastclick.git",
    "hls-easy-ui": "https://hel.hand-china.com/easyUI/hls-easy-ui.git#keyboard",
+    "ionic-plugin-keyboard": "^2.2.1",
    "vue": "^2.5.2",
    "vue-router": "^3.0.1",
    "vuex": "^2.1.1",
@@ -112,7 +113,8 @@
  ],
  "cordova": {
    "platforms": [
-      "ios"
+      "ios",
+      "android"
    ],
    "plugins": {
      "cordova-plugin-camera": {},

--- a/plugins/android.json
+++ b/plugins/android.json
 {
-    "prepare_queue": {
-        "installed": [],
-        "uninstalled": []
-    },
-    "config_munge": {
-        "files": {}
-    },
-    "installed_plugins": {
-        "com.handmobile.cordovaplugin.hotpatch": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-baidumaplocation": {
-            "ANDROID_KEY": "YCDrAzwghWe3Ghps2QkIPBWANkDsgkOP",
-            "IOS_KEY": "q0niXfvEg9ToZSD1DvTvGTfeN2b6AbKT",
-            "IOS_LOCATION_DESC": "请点击'好'以允许访问。",
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-camera": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-compat": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-crosswalk-webview": {
-            "XWALK_VERSION": "22+",
-            "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
-            "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
-            "XWALK_MODE": "embedded",
-            "XWALK_MULTIPLEAPK": "true",
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-datepicker": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-device": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-dialogs": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-file": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-file-transfer": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-hls-cloudroom": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-hrms-faceidentify": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-image-picker": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-inappbrowser": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-jcore": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-network-information": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-splashscreen": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-statusbar": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-themeablebrowser": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-touch-id": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-whitelist": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "ionic-plugin-keyboard": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "jmessage-phonegap-plugin": {
-            "APP_KEY": "7675edf5efa043a1ce9449a2",
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "jpush-phonegap-plugin": {
-            "APP_KEY": "7675edf5efa043a1ce9449a2",
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        }
-    },
-    "dependent_plugins": {
-        "cordova-plugin-3dtouch": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-contacts": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-fingerprint": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "cordova-plugin-x-toast": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "es6-promise-plugin": {
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        }
+  "prepare_queue": {
+    "installed": [],
+    "uninstalled": []
+  },
+  "config_munge": {
+    "files": {}
+  },
+  "installed_plugins": {
+    "com.handmobile.cordovaplugin.hotpatch": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-baidumaplocation": {
+      "ANDROID_KEY": "YCDrAzwghWe3Ghps2QkIPBWANkDsgkOP",
+      "IOS_KEY": "q0niXfvEg9ToZSD1DvTvGTfeN2b6AbKT",
+      "IOS_LOCATION_DESC": "请点击'好'以允许访问。",
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-camera": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-compat": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-crosswalk-webview": {
+      "XWALK_VERSION": "22+",
+      "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
+      "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
+      "XWALK_MODE": "embedded",
+      "XWALK_MULTIPLEAPK": "true",
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-datepicker": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-device": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-dialogs": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-file": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-file-transfer": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-hls-cloudroom": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-hrms-faceidentify": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-image-picker": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-inappbrowser": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-jcore": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-network-information": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-splashscreen": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-statusbar": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-themeablebrowser": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-touch-id": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-whitelist": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "ionic-plugin-keyboard": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "jmessage-phonegap-plugin": {
+      "APP_KEY": "7675edf5efa043a1ce9449a2",
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "jpush-phonegap-plugin": {
+      "APP_KEY": "7675edf5efa043a1ce9449a2",
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    }
+  },
+  "dependent_plugins": {
+    "cordova-plugin-3dtouch": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-contacts": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-fingerprint": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-x-toast": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "es6-promise-plugin": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
    }
+  }
 }
\ No newline at end of file
--- a/src/pages/carConfirm/confirm-detail.vue
+++ b/src/pages/carConfirm/confirm-detail.vue
@@ -300,22 +300,24 @@ export default {
    },
    goContent (item) {
      // 详情
-      // window.open(url)
-      // cordova.InAppBrowser.open(url, '_self', 'location=yes')
-      cordova.ThemeableBrowser.open(item.attachment_file_path, '_blank', {})
-
+      // 合同状态更新保存
      let vm = this
+      vm.attachFlag = true
+      vm.attachUrl = item.attachment_file_path
      let url = process.env.basePath + 'prj_content_status_save'
      let param = {
-        master: {
-          content_id: item.content_id,
-          auth_credit_flag: 'Y',
+        parameter: {
+          master: {
+            content_id: item.content_id,
+            auth_credit_flag: 'Y',
+          },
        },
      }
      hlsPopup.showLoading('请稍候')
      vm.hlsHttp.post(url, param).then(res => {
        hlsPopup.hideLoading()
        if (res.result === 'S') {
+          vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
        } else {
          vm.hlsPopup.showLongCenter(res.message)
        }
@@ -659,8 +661,12 @@ export default {
    opacity: 0;
  }
  .aguremrnt-list {
-    display: flex;
+     display: flex;
+    display: -webkit-flex;
    flex-direction: row;
+    -webkit-flex-direction:row;
+    align-items:center;
+    -webkit-align-items:center;
    .unread {
      width: 34px;
      height: 20px;
@@ -682,8 +688,8 @@ export default {
    }

    .second {
-      height: 32px;
-      line-height: 32px;
+      // height: 32px;
+      // line-height: 32px;
      font-family: PingFangSC-Regular;
      font-size: 14px;
      margin-left: 16px;

--- a/src/pages/contractSigning/contract-detail.vue
+++ b/src/pages/contractSigning/contract-detail.vue
@@ -131,6 +131,10 @@
          </div>
        </item>
      </list-item>
+      <!-- <iframe
+        v-if="attachFlag" :src="attachUrl"
+        frameborder="0" scrolling="yes" width="100%"
+        height="100%" /> -->
    </h-content>
    <h-content v-if="num === 1">
      <list-item :item-height="44" class="second-part">
@@ -293,6 +297,8 @@ export default {
      isshow: false, // 提示框的显示与隐藏
      bp_flag: false, // 判断自然人和法人
      num: 0,
+      attachFlag: false,
+      attachUrl: null,
      tabNum: null,
      bp_name: '',
      read_status: 'N',
@@ -431,11 +437,10 @@ export default {
    },
    goContent (item) {
      // 详情
-      // window.open(url)
-      // cordova.InAppBrowser.open(url, '_self', 'location=yes')
-      cordova.ThemeableBrowser.open(item.attachment_file_path, '_blank', {})
      // 合同状态更新保存
      let vm = this
+      vm.attachFlag = true
+      vm.attachUrl = item.attachment_file_path
      let url = process.env.basePath + 'prj_content_status_save'
      let param = {
        parameter: {
@@ -449,6 +454,7 @@ export default {
      vm.hlsHttp.post(url, param).then(res => {
        hlsPopup.hideLoading()
        if (res.result === 'S') {
+          vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
        } else {
          vm.hlsPopup.showLongCenter(res.message)
        }
@@ -1031,7 +1037,6 @@ export default {
  .alert {
    padding-bottom: 30px;
    width: 100%;
-    //margin-top: -10px;
    background: #fbf2d2;
  }
  .alert-fund {
@@ -1333,10 +1338,13 @@ export default {
      letter-spacing: 0;
    }
  }
-
  .aguremrnt-list {
    display: flex;
+    display: -webkit-flex;
    flex-direction: row;
+    -webkit-flex-direction:row;
+    align-items:center;
+    -webkit-align-items:center;
    .unread{
      width:34px;
      height: 20PX;
@@ -1358,8 +1366,8 @@ export default {
    }

    .second {
-      height: 32px;
-      line-height: 32px;
+      // height: 32px;
+      // line-height: 32px;
      font-family: PingFangSC-Regular;
      font-size: 14px;
      margin-left: 16px;

--- a/src/pages/contractSigning/previewPdf.vue
+++ b/src/pages/contractSigning/previewPdf.vue
+<template>
+  <h-view class="previewPdf">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
+        <span>合同预览</span>
+      </div>
+    </h-header>
+    <iframe
+      :src="attachUrl"
+      frameborder="0" scrolling="yes" width="100%"
+      height="100%" />
+  </h-view>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      attachUrl: this.$route.params.attachUrl,
+    }
+  },
+}
+</script>
+<style lang="less" rel="stylesheet">
+</style>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -125,6 +125,7 @@ import PickLessee from '@/pages/contractCreate/pick-lessee'
 import CreateBaseInfo from '@/pages/contractCreate/create-base-info'
 import CreateRentInfo from '@/pages/contractCreate/creat-rent-info'
 import CreateEnclosureInfo from '@/pages/contractCreate/create-enclosure-info'
+import previewPdf from '@/pages/contractSigning/previewPdf'

 import About from '@/pages/myInfo/About'
 import UserAgree from '@/pages/myInfo/UserAgreement'
@@ -300,6 +301,7 @@ export default new Router({
    {path: '/create-base-info', component: CreateBaseInfo, name: 'CreateBaseInfo', 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: '/previewPdf', component: previewPdf, name: 'previewPdf', meta: {keepAlive: true}},
    // 我的发票
    {path: '/invoice', component: MyInvoice, name: 'MyInvoice', meta: {keepAlive: false}},
    {

--- a/www/index.html
+++ b/www/index.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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.319a48f0ae278016467a36c7c8fdc1b9.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3f20fa93928dc721ea21.js></script><script type=text/javascript src=./static/js/app.edf254bec46da36c7032.js></script></body></html>
\ No newline at end of file