修改切图和issue

ae8c07dc · Jennie Shi · e1a56224 · ae8c07dc · ae8c07dc · ae8c07dc
Commit ae8c07dc authored Jan 22, 2020 by Jennie Shi
55 changed files
--- a/config.xml
+++ b/config.xml
@@ -102,5 +102,6 @@
    <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" />
+    <engine name="ios" />
+    <engine name="android" spec="^6.2.0" />
 </widget>
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -12,6 +12,6 @@ module.exports = merge(prodEnv, {
  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&"',
  ocrPath: '"http://180.104.121.66:8088/r/api"',
-  appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.6.3"',
+  appId: '"com.xcmg.app"',
+  currentVersion: '"1.7.1"',
 })
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
    "js-base64": "^2.5.1",
    "pdfjs-dist": "^2.2.228",
    "vue": "^2.5.2",
+    "vue-pdf": "^4.0.7",
    "vue-router": "^3.0.1",
    "vuex": "^2.1.1",
    "vuex-i18n": "^1.3.1",

--- 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": "q4W0FynBkTd4v44ZM8m4MxUpuXBqGIqQ",
-            "IOS_KEY": "hhouKKwxALvC7MBZmnfwgSacHOfFOlNu",
-            "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-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-media-capture": {
-            "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": "bef4fd44dcf54b79b8ab27c3",
-            "PACKAGE_NAME": "com.xcmg.app.dev"
-        },
-        "jpush-phonegap-plugin": {
-            "APP_KEY": "bef4fd44dcf54b79b8ab27c3",
-            "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"
+    },
+    "cordova-plugin-baidumaplocation": {
+      "ANDROID_KEY": "q4W0FynBkTd4v44ZM8m4MxUpuXBqGIqQ",
+      "IOS_KEY": "hhouKKwxALvC7MBZmnfwgSacHOfFOlNu",
+      "IOS_LOCATION_DESC": "请点击'好'以允许访问。",
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-camera": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-compat": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "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"
+    },
+    "cordova-plugin-datepicker": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-device": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-dialogs": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-file": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-file-transfer": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-hls-cloudroom": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-hrms-faceidentify": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-image-picker": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-inappbrowser": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-jcore": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-media-capture": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-network-information": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-splashscreen": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-statusbar": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-touch-id": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-whitelist": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "ionic-plugin-keyboard": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "jmessage-phonegap-plugin": {
+      "APP_KEY": "bef4fd44dcf54b79b8ab27c3",
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "jpush-phonegap-plugin": {
+      "APP_KEY": "bef4fd44dcf54b79b8ab27c3",
+      "PACKAGE_NAME": "com.xcmg.app"
+    }
+  },
+  "dependent_plugins": {
+    "cordova-plugin-3dtouch": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-contacts": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-fingerprint": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-themeablebrowser": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "cordova-plugin-x-toast": {
+      "PACKAGE_NAME": "com.xcmg.app"
+    },
+    "es6-promise-plugin": {
+      "PACKAGE_NAME": "com.xcmg.app"
    }
+  }
 }
\ No newline at end of file
--- a/plugins/cordova-plugin-media-capture/plugin.xml
+++ b/plugins/cordova-plugin-media-capture/plugin.xml
@@ -34,7 +34,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
        <engine name="cordova-android" version=">=6.2.0" />
    </engines>

-    <dependency id="cordova-plugin-file" version="^6.0.0" />
+    <dependency id="cordova-plugin-file" version="^4.0.0" />

 	<js-module src="www/CameraConstants.js" name="MediaCapture">
        <clobbers target="MediaCapture" />

--- a/resources/android/splash/drawable-land-hdpi-screen.png
+++ b/resources/android/splash/drawable-land-hdpi-screen.png
--- a/resources/android/splash/drawable-land-ldpi-screen.png
+++ b/resources/android/splash/drawable-land-ldpi-screen.png
--- a/resources/android/splash/drawable-land-mdpi-screen.png
+++ b/resources/android/splash/drawable-land-mdpi-screen.png
--- a/resources/android/splash/drawable-land-xhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xhdpi-screen.png
--- a/resources/android/splash/drawable-land-xxhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xxhdpi-screen.png
--- a/resources/android/splash/drawable-land-xxxhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xxxhdpi-screen.png
--- a/resources/android/splash/drawable-port-hdpi-screen.png
+++ b/resources/android/splash/drawable-port-hdpi-screen.png
--- a/resources/android/splash/drawable-port-ldpi-screen.png
+++ b/resources/android/splash/drawable-port-ldpi-screen.png
--- a/resources/android/splash/drawable-port-mdpi-screen.png
+++ b/resources/android/splash/drawable-port-mdpi-screen.png
--- a/resources/android/splash/drawable-port-xhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xhdpi-screen.png
--- a/resources/android/splash/drawable-port-xxhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xxhdpi-screen.png
--- a/resources/android/splash/drawable-port-xxxhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xxxhdpi-screen.png
--- a/resources/ios/splash/Default-568h@2x~iphone.png
+++ b/resources/ios/splash/Default-568h@2x~iphone.png
--- a/resources/ios/splash/Default-667h.png
+++ b/resources/ios/splash/Default-667h.png
--- a/resources/ios/splash/Default-736h.png
+++ b/resources/ios/splash/Default-736h.png
--- a/resources/ios/splash/Default-Landscape-736h.png
+++ b/resources/ios/splash/Default-Landscape-736h.png
--- a/resources/ios/splash/Default-Landscape@2x~ipad.png
+++ b/resources/ios/splash/Default-Landscape@2x~ipad.png
--- a/resources/ios/splash/Default-Landscape@~ipadpro.png
+++ b/resources/ios/splash/Default-Landscape@~ipadpro.png
--- a/resources/ios/splash/Default-Landscape~ipad.png
+++ b/resources/ios/splash/Default-Landscape~ipad.png
--- a/resources/ios/splash/Default-Portrait@2x~ipad.png
+++ b/resources/ios/splash/Default-Portrait@2x~ipad.png
--- a/resources/ios/splash/Default-Portrait@~ipadpro.png
+++ b/resources/ios/splash/Default-Portrait@~ipadpro.png
--- a/resources/ios/splash/Default-Portrait~ipad.png
+++ b/resources/ios/splash/Default-Portrait~ipad.png
--- a/resources/ios/splash/Default@2x~iphone.png
+++ b/resources/ios/splash/Default@2x~iphone.png
--- a/resources/ios/splash/Default@2x~universal~anyany.png
+++ b/resources/ios/splash/Default@2x~universal~anyany.png
--- a/resources/ios/splash/Default~iphone.png
+++ b/resources/ios/splash/Default~iphone.png
--- a/resources/splash.png
+++ b/resources/splash.png
--- a/src/components/PDFDownload.vue
+++ b/src/components/PDFDownload.vue
+<template>
+  <div v-if="hidden" style="height: 75vh;overflow-y: auto;overflow-x: hidden;">
+    <pdf :src="src"/>
+  </div>
+</template>
+<script>
+import axios from 'axios'
+import pdf from 'vue-pdf'
+
+export default {
+  components: {pdf},
+  data () {
+    return {
+      src: '',
+      hidden: false,
+    }
+  },
+  methods: {
+    // 预览pdf
+    previewPDF (url) {
+      this.src = pdf.createLoadingTask(url)
+    },
+    // 下载PDF
+    downloadPDF (url, fileName) {
+      axios({
+        method: 'get',
+        responseType: 'arraybuffer',
+        url: url,
+      }).then(function (res) {
+        // 调用下载方法，把后端传过来的流传给fileDownload方法
+        this.fileDownload(res.data, fileName)
+      }.bind(this)
+      )
+        .catch(
+          function (error) {
+            hlsPopup.showLongCenter('网络请求出错')
+            console.log(error)
+          }
+        )
+    },
+    fileDownload: function (data, fileName) {
+      let blob = new Blob([data], {
+        // type类型后端返回来的数据中会有，根据自己实际进行修改
+        // type: 'application/vnd.ms-excel',
+        type: 'application/json',
+      })
+      let filename = fileName + '.pdf' || '合同.pdf'
+      if (typeof window.navigator.msSaveBlob !== 'undefined') {
+        window.navigator.msSaveBlob(blob, filename)
+      } else {
+        var blobURL = window.URL.createObjectURL(blob)
+        // 创建隐藏<a>标签进行下载
+        var tempLink = document.createElement('a')
+        tempLink.style.display = 'none'
+        tempLink.href = blobURL
+        tempLink.setAttribute('download', filename)
+        if (typeof tempLink.download === 'undefined') {
+          tempLink.setAttribute('target', '_blank')
+        }
+        document.body.appendChild(tempLink)
+        tempLink.click()
+        document.body.removeChild(tempLink)
+        window.URL.revokeObjectURL(blobURL)
+      }
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+
+</style>
--- a/src/main.js
+++ b/src/main.js
@@ -58,7 +58,7 @@ import Jpush from './scripts/jpushService'

 import Jmessage from './scripts/jmessageService'

-if (process.env.CONFIG_ENV === 'uat') {
+if (process.env.CONFIG_ENV === 'dev') {
  const VConsole = require('vconsole')
  new VConsole() // eslint-disable-line
 }

--- a/src/pages/carConfirm/confirm-detail.vue
+++ b/src/pages/carConfirm/confirm-detail.vue
@@ -129,39 +129,6 @@
          </div>
        </div>
      </div>
-      <!-- <div v-show="tabNum===1">
-        <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
-          <item :proportion="[7,1]">
-            <div slot="name" class="aguremrnt-list">
-              <img src="@/assets/constractSigning/npack.png" alt class="pics" >
-              <p class="second first">承租人确认意见</p>
-            </div>
-            <div slot="content" class="in-detail" @click="goContractContent('承租人确认意见')">
-              <img src="@/assets/constractSigning/detail.png" alt >
-            </div>
-          </item>
-          <item :proportion="[7,1]">
-            <div slot="name" class="aguremrnt-list">
-              <img src="@/assets/constractSigning/pack.png" alt class="pics" >
-              <p class="second">融资租赁合同</p>
-              <img :src="leasePic" alt class="read" >
-            </div>
-            <div slot="content" class="in-detail" @click="goContractContent('融资租赁合同')">
-              <img src="@/assets/constractSigning/detail.png" alt >
-            </div>
-          </item>
-          <item :proportion="[7,1]">
-            <div slot="name" class="aguremrnt-list">
-              <img src="@/assets/constractSigning/pack.png" alt class="pics" >
-              <p class="second">租赁物所有权转移及接收确认书</p>
-              <img :src="agentPic" alt class="read" >
-            </div>
-            <div slot="content" class="in-detail" @click="goContractContent('租赁物所有权转移及接收确认书')">
-              <img src="@/assets/constractSigning/detail.png" alt >
-            </div>
-          </item>
-        </list-item>
-      </div>-->
      <div v-show="tabNum===1">
        <list-item
          :item-height="56"
@@ -174,6 +141,13 @@
              <p class="second first">{{ item.attachment_file }}</p>
              <img v-if="item.read_status === 'N'" class="unread" src="@/assets/constractSigning/unread.png" >
              <img v-if="item.read_status === 'Y'" class="unread" src="@/assets/constractSigning/read.png" >
+              <div
+                v-if="item.template_code === 'PRE_ABC_PAYMENT'"
+                class="wrap-img"
+                @click="entryInfo"
+              >
+                <img src="@/assets/constractSigning/scan.png" >
+              </div>
            </div>
            <div slot="content" class="in-detail" @click="goContent(item,index)">
              <img src="@/assets/constractSigning/detail.png" alt >
@@ -307,11 +281,9 @@ export default {
      vm.attachUrl = item.attachment_file_path
      let url = process.env.basePath + 'prj_content_status_save'
      let param = {
-        parameter: {
-          master: {
-            content_id: item.content_id,
-            auth_credit_flag: 'Y',
-          },
+        master: {
+          content_id: item.content_id,
+          read_status: 'Y',
        },
      }
      hlsPopup.showLoading('请稍候')
@@ -664,17 +636,32 @@ export default {
  .trans-leave-active {
    opacity: 0;
  }
-  .aguremrnt-list {
-     display: flex;
+ .aguremrnt-list {
+    display: flex;
    display: -webkit-flex;
-    flex-direction: row;
-    -webkit-flex-direction:row;
-    align-items:center;
-    -webkit-align-items:center;
+    align-items: center;
+    -webkit-align-items: center;
+    width: 100%;
+    height: 100%;
    .unread {
      width: 34px;
      height: 20px;
-      margin: 8px 0 0 4px;
+      margin: 0 10px;
+    }
+    .wrap-img {
+      width: 12%;
+      height: 100%;
+      display: flex;
+      display: -webkit-flex;
+      align-items: center;
+      -webkit-align-items: center;
+      justify-content: center;
+      -webkit-justify-content:center;
+      background: rgb(254, 251, 233);
+      img {
+        width: 22px;
+        height: 20px;
+      }
    }
    .pic {
      margin-left: -3px;
@@ -703,6 +690,7 @@ export default {

    .first {
      margin-left: 13px;
+      width: 60%;
    }
  }


--- a/src/pages/contractCreate/contract-create-list.vue
+++ b/src/pages/contractCreate/contract-create-list.vue
@@ -345,6 +345,7 @@ export default {
        name: 'CreateBaseInfo',
        params: {
          bp_id: item.bp_id,
+          project_status: item.project_status,
        },
      })
    },

--- a/src/pages/contractCreate/creat-rent-info.vue
+++ b/src/pages/contractCreate/creat-rent-info.vue
@@ -282,8 +282,8 @@
                      <span>{{ item.int_rate_n }}</span>
                    </p>
                    <p>
-                      <span>期&nbsp;&nbsp;&nbsp;限</span>
-                      <span>{{ item.lease_times }}期</span>
+                      <!-- <span>期&nbsp;&nbsp;&nbsp;限</span>
+                      <span>{{ item.lease_times }}期</span> -->
                    </p>
                  </div>
                </div>
@@ -539,7 +539,8 @@ export default {
      vm.saveInfo.penalty_rate = e.penalty_rate
      vm.saveInfo.deposit_ratio = e.deposit_ratio
      vm.saveInfo.deposit_ratio_n = e.deposit_ratio_n
-      vm.saveInfo.lease_times = e.lease_times
+      // vm.saveInfo.lease_times = e.lease_times
+      vm.saveInfo.lease_times = ''
      setTimeout(() => {
        vm.showModalBusiness = false
      }, 100)

--- a/src/pages/contractCreate/create-base-info.vue
+++ b/src/pages/contractCreate/create-base-info.vue
@@ -152,22 +152,22 @@
              <div slot="name" class="required">设备价值</div>
              <span slot="content">{{ saveInfo.equip_value }}</span>
            </item>
-            <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
+            <item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checked=!checked">
              <div slot="name" class="required">农行代扣</div>
              <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
              <span v-if="!checked" slot="content" />
            </item>
-            <item v-if="fromPutted" class="check">
+            <item v-if="fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check">
              <div slot="name" class="required">农行代扣</div>
              <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
              <span v-if="!checked" slot="content" />
            </item>
-            <item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved">
+            <item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checkedApproved=!checkedApproved">
              <div slot="name" class="required">是否特批</div>
              <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
              <span v-if="!checkedApproved" slot="content" />
            </item>
-            <item v-if="fromPutted" class="check">
+            <item v-if="fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check">
              <div slot="name" class="required">是否特批</div>
              <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
              <span v-if="!checkedApproved" slot="content" />
@@ -299,22 +299,22 @@
              <div slot="name" class="required">设备价值</div>
              <input slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly >
            </item>
-            <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
+            <item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checked=!checked">
              <div slot="name">农行代扣</div>
              <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
              <span v-if="!checked" slot="content" />
            </item>
-            <item v-if="fromPutted" class="check">
+            <item v-if="fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check">
              <div slot="name" class="required">农行代扣</div>
              <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
              <span v-if="!checked" slot="content" />
            </item>
-            <item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved">
+            <item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checkedApproved=!checkedApproved">
              <div slot="name" class="required">是否特批</div>
              <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
              <span v-if="!checkedApproved" slot="content" />
            </item>
-            <item v-if="fromPutted" class="check">
+            <item v-if="fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check">
              <div slot="name" class="required">是否特批</div>
              <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
              <span v-if="!checkedApproved" slot="content" />
@@ -389,11 +389,13 @@ export default {
      checkedApproved: false, // 是否特批
      bp_class: '',
      showModalValue: false,
+      showSpecialFlag: false,
      fromPutted: false, // 为true为从已提交进来
      isClick: false,
      keyWord: '',
      bp_agent_id: '',
      pageNum: 1,
+      project_status: this.$route.params.project_status,
      pageNumSearch: 1,
      status: '', // 是否为已提交
      BussinessSituationList: [], // 行业情况
@@ -522,6 +524,7 @@ export default {
      } else if (from.name === 'ContractCreateList' && vm.status === 'false') {
        vm.fromPutted = false
        vm.saveInfo.bp_id = vm.$route.params.bp_id
+        vm.showSpecialFlag = true // 是否展示农行代扣和是否特批
        vm.selectUdertake = []
        setTimeout(() => {
          vm.getSaveInfo()
@@ -578,6 +581,7 @@ export default {
      vm.$post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
+          hlsPopup.showLongCenter('删除成功')
        } else {
          hlsPopup.showLongCenter(res.message)
        }
@@ -688,6 +692,19 @@ export default {
      }
    },
    save () {
+      let vm = this
+      // 校验是否特批
+      if (vm.checkedApproved) {
+        if (!vm.saveInfo.special_matter) {
+          hlsPopup.showLongCenter('请输入特批事项!')
+        } else {
+          vm.nextStep()
+        }
+      } else {
+        vm.nextStep()
+      }
+    },
+    nextStep () {
      let vm = this
      if (vm.fromPutted) {
        vm.$router.push({

--- a/src/pages/contractCreate/create-enclosure-info.vue
+++ b/src/pages/contractCreate/create-enclosure-info.vue
@@ -386,6 +386,9 @@ export default {
    loadItemList () {
      let vm = this
      let bp_id_tenant = window.localStorage.getItem('bp_id_tenant')
+      if (bp_id_tenant === 'undefined') {
+        bp_id_tenant = null
+      }
      let url = process.env.basePath + 'prj_cdd_check_list'
      let group = ''
      if (vm.bpClass === 'NP') {
@@ -545,8 +548,10 @@ export default {
      let vm = this
      let url = process.env.basePath + 'prj_project_submit'
      let param = {
-        project_id: window.localStorage.project_id,
-        phone: window.localStorage.getItem('user_phone'),
+        master: {
+          project_id: window.localStorage.project_id,
+          phone: window.localStorage.getItem('user_phone'),
+        },
      }
      vm.hlsPopup.showLoading('请稍候')
      vm.hlsHttp.post(url, param).then(function (res) {

--- a/src/pages/contractInquire/contract-records.vue
+++ b/src/pages/contractInquire/contract-records.vue
@@ -600,8 +600,10 @@ export default {
        }

        p.orange {
+          width: 30%;
          border: 1px solid #FDB62F;
          color: #FDB62F;
+          white-space: nowrap;
        }

        p.blue {

--- a/src/pages/contractInquire/repay-detail.vue
+++ b/src/pages/contractInquire/repay-detail.vue
@@ -15,7 +15,7 @@
      </div>
    </h-header>

-    <h-content class="repay-content">
+    <h-content ref="content" class="repay-content">
      <div class="header">
        合同单据
        <div class="download" @click="downLoad">电子版下载 <img src="@/assets/contractInquire/download.png" alt=""></div>
@@ -91,17 +91,18 @@
          </item>
        </list-item>
      </scroll>
-
    </h-content>
-
+    <PDFDown ref="pdf"/>
  </h-view>
 </template>

 <script>
+import PDFDown from '@/components/PDFDownload'

 export default {
  name: 'RepayDetail',
  components: {
+    PDFDown,
  },
  filters: {
    lengthCheck: function (value) {
@@ -116,7 +117,9 @@ export default {
    return {
      lists: [],
      pagenum: 1,
+      hidden: false,
      detailInfo: {},
+      fileArray: [],
    }
  },
  computed: {
@@ -154,12 +157,24 @@ export default {
      vm.hlsHttp.post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
-          vm.url = res.info.fileUrl
+          vm.fileArray = res.info
+          vm.pdfDownload()
        } else {
          hlsPopup.showLongCenter(res.message)
        }
      })
    },
+    pdfDownload () {
+      // 下载pdf文件
+      let vm = this
+      vm.fileArray.forEach(element => {
+        if (element.fileUrl) {
+          console.log('vm.$refs.pdf' + vm.$refs.pdf)
+          debugger
+          vm.$refs.pdf.downloadPDF(element.fileUrl, element.fileName)
+        }
+      })
+    },
    // 合同明细
    detailQuery () {
      let vm = this

--- a/src/pages/contractSigning/contract-detail.vue
+++ b/src/pages/contractSigning/contract-detail.vue
@@ -123,8 +123,23 @@
          <div slot="name" class="aguremrnt-list">
            <img src="@/assets/constractSigning/npack.png" alt class="pics" >
            <p class="second first">{{ item.attachment_file }}</p>
-            <img v-if="item.read_status === 'N'" class="unread" src="@/assets/constractSigning/unread.png" >
-            <img v-if="item.read_status === 'Y'" class="unread" src="@/assets/constractSigning/read.png" >
+            <img
+              v-if="item.read_status === 'N'"
+              class="unread"
+              src="@/assets/constractSigning/unread.png"
+            >
+            <img
+              v-if="item.read_status === 'Y'"
+              class="unread"
+              src="@/assets/constractSigning/read.png"
+            >
+            <div
+              v-if="item.template_code === 'PRE_ABC_PAYMENT'"
+              class="wrap-img"
+              @click="entryInfo"
+            >
+              <img src="@/assets/constractSigning/scan.png" >
+            </div>
          </div>
          <div slot="content" class="in-detail" @click="goContent(item,index)">
            <img src="@/assets/constractSigning/detail.png" alt >
@@ -134,7 +149,7 @@
      <!-- <iframe
        v-if="attachFlag" :src="attachUrl"
        frameborder="0" scrolling="yes" width="100%"
-        height="100%" /> -->
+      height="100%" />-->
    </h-content>
    <h-content v-if="num === 1">
      <list-item :item-height="44" class="second-part">
@@ -285,6 +300,7 @@ import unCheck3 from '@/assets/constractSigning/unLease.png'
 import LegalPerson from '@/pages/distributorSign/legal-person'
 import Personal from '@/pages/distributorSign/personal'
 import bodyCheck from './body-check'
+import axios from 'axios'
 export default {
  name: 'ContractDetail',
  components: {
@@ -435,7 +451,7 @@ export default {
        // vm.hlsPopup.showLongCenter(res.message)
      }
    },
-    goContent (item, index) {
+    async goContent (item, index) {
      // 详情
      // 合同状态更新保存
      let vm = this
@@ -443,25 +459,25 @@ export default {
      vm.attachUrl = item.attachment_file_path
      let url = process.env.basePath + 'prj_content_status_save'
      let param = {
-        parameter: {
-          master: {
-            content_id: item.content_id,
-            auth_credit_flag: 'Y',
-          },
+        master: {
+          content_id: item.content_id,
+          read_status: 'Y',
        },
      }
      hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(res => {
-        hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          let temp = vm.attachArray[index]
-          temp.read_status = 'Y'
-          vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
-          vm.attachArray.splice(vm.attachArray[index], 1, temp)
-        } else {
-          vm.hlsPopup.showLongCenter(res.message)
-        }
-      })
+      let res = await vm.hlsHttp.post(url, param)
+      hlsPopup.hideLoading()
+      if (res.result === 'S') {
+        let temp = vm.attachArray[index]
+        temp.read_status = 'Y'
+        vm.$router.push({
+          name: 'previewPdf',
+          params: { attachUrl: vm.attachUrl },
+        })
+        vm.attachArray.splice(vm.attachArray[index], 1, temp)
+      } else {
+        vm.hlsPopup.showLongCenter(res.message)
+      }
    },
    // 合同文本详情附件查询
    getAttachment () {
@@ -1344,14 +1360,29 @@ export default {
  .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;
-      margin:8px 0 0 4px;
+    align-items: center;
+    -webkit-align-items: center;
+    width: 100%;
+    height: 100%;
+    .unread {
+      width: 34px;
+      height: 20px;
+      margin: 0 10px;
+    }
+    .wrap-img {
+      width: 12%;
+      height: 100%;
+      display: flex;
+      display: -webkit-flex;
+      align-items: center;
+      -webkit-align-items: center;
+      justify-content: center;
+      -webkit-justify-content:center;
+      background: rgb(254, 251, 233);
+      img {
+        width: 22px;
+        height: 20px;
+      }
    }
    .pic {
      margin-left: -3px;
@@ -1380,6 +1411,7 @@ export default {

    .first {
      margin-left: 13px;
+      width: 60%;
    }
  }


--- a/src/pages/distributorSign/contract-details.vue
+++ b/src/pages/distributorSign/contract-details.vue
@@ -155,6 +155,36 @@
      </div>
    </h-content>
    <h-content v-if="tabNum === 2">
+      <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
+        <item v-for="(item,index) in attachArray" :proportion="[7,1]" :key="index+'attach'">
+          <div slot="name" class="aguremrnt-list">
+            <img src="@/assets/constractSigning/npack.png" alt class="pics" >
+            <p class="second first">{{ item.attachment_file }}</p>
+            <img
+              v-if="item.read_status === 'N'"
+              class="unread"
+              src="@/assets/constractSigning/unread.png"
+            >
+            <img
+              v-if="item.read_status === 'Y'"
+              class="unread"
+              src="@/assets/constractSigning/read.png"
+            >
+            <div
+              v-if="item.template_code === 'PRE_ABC_PAYMENT'"
+              class="wrap-img"
+              @click="entryInfo"
+            >
+              <img src="@/assets/constractSigning/scan.png" >
+            </div>
+          </div>
+          <div slot="content" class="in-detail" @click="goContent(item,index)">
+            <img src="@/assets/constractSigning/detail.png" alt >
+          </div>
+        </item>
+      </list-item>
+    </h-content>
+    <!-- <h-content v-if="tabNum === 2">
      <list-item :item-height="56">
        <item :proportion="[7,1]">
          <div slot="name" class="aguremrnt-list">
@@ -166,7 +196,7 @@
        </item>
      </list-item>

-    </h-content>
+    </h-content> -->
    <bottom-tab v-if="confirm_status!=='APPROVED'" class="add-box">
      <tab-button class="before" @click.native="takePhonto">
        <img src="@/assets/constractSigning/certification.png" >认证
@@ -198,10 +228,12 @@ export default {
      showModalValue: false,
      info: {}, // 租赁信息
      tabNum: 0,
+      num: 0,
      baseInfo: {}, // 基本信息
      project_id: '',
      bp_flag: false,
      guarantorInfo: [], // 担保人信息
+      attachArray: [], // 附件数组
      bp_class: '', // 商业伙伴类型
      confirm_status: '', // 签约状态
      faceListUpload: [], // 自拍照上传
@@ -253,6 +285,7 @@ export default {
          vm.getGuarantor()
        }
        vm.getLease()
+        vm.getAttachment()
      } else if (from.name === 'ContractContent') {
        vm.tabNum = 2
        vm.agentPic = vm.readed
@@ -261,6 +294,24 @@ export default {
  },
  created () {},
  methods: {
+    // 合同文本详情附件查询
+    getAttachment () {
+      let vm = this
+      let url = process.env.basePath + 'get_content_app'
+      let param = {
+        confirm_id: vm.confirm_id,
+        data_class: 'PRJ_PREVIEW',
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(res => {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.attachArray = res.attachments
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
    // 签约校验
    async signCheck () {
      let vm = this
@@ -326,7 +377,34 @@ export default {
        })
      }
    },
-
+    async goContent (item, index) {
+      // 详情
+      // 合同状态更新保存
+      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,
+          read_status: 'Y',
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      let res = await vm.hlsHttp.post(url, param)
+      hlsPopup.hideLoading()
+      if (res.result === 'S') {
+        let temp = vm.attachArray[index]
+        temp.read_status = 'Y'
+        vm.$router.push({
+          name: 'previewPdf',
+          params: { attachUrl: vm.attachUrl },
+        })
+        vm.attachArray.splice(vm.attachArray[index], 1, temp)
+      } else {
+        vm.hlsPopup.showLongCenter(res.message)
+      }
+    },
    takePhonto () {
      let vm = this
      hlsPopup.showConfirm({
@@ -786,32 +864,62 @@ export default {
 }
 .aguremrnt-list {
    display: flex;
-    flex-direction: row;
+    display: -webkit-flex;
+    align-items: center;
+    -webkit-align-items: center;
+    width: 100%;
+    height: 100%;
+    .unread {
+      width: 34px;
+      height: 20px;
+      margin: 0 10px;
+    }
+    .wrap-img {
+      width: 12%;
+      height: 100%;
+      display: flex;
+      display: -webkit-flex;
+      align-items: center;
+      -webkit-align-items: center;
+      justify-content: center;
+      -webkit-justify-content:center;
+      background: rgb(254, 251, 233);
+      img {
+        width: 22px;
+        height: 20px;
+      }
+    }
    .pic {
-        margin-left: -3px;
+      margin-left: -3px;
    }
+
    .pics {
-        //    width: 21px;
-           height: 30px;
-           }
+      //    width: 21px;
+      height: 30px;
+    }
+
    .read {
-        height: 16px;
-        margin-top: 8px;
-        margin-left: 12.5px;
+      height: 16px;
+      margin-top: 8px;
+      margin-left: 6px;
    }
+
    .second {
-        height: 32px;
-        line-height: 32px;
-        font-family: PingFangSC-Regular;
-        font-size: 14px;
-        margin-left: 21px;
-        color: #383F45;
-        letter-spacing: 0.43px;
+      // height: 32px;
+      // line-height: 32px;
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      margin-left: 16px;
+      color: #383f45;
+      letter-spacing: 0.43px;
    }
+
    .first {
-        margin-left: 13px;
+      margin-left: 13px;
+      width: 60%;
    }
-}
+  }
+
  .footer-button {
    .approve {
      width: 358.6px;

--- a/src/pages/distributorSign/personal.vue
+++ b/src/pages/distributorSign/personal.vue
@@ -33,7 +33,9 @@
      </item>
      <item>
        <div slot="name" class="font-color">联系地址</div>
-        <input slot="content" v-model="baseInfo.living_address" readonly>
+        <!-- <input slot="content" v-model="baseInfo.living_address" readonly> -->
+        <span slot="content">{{ baseInfo.living_address }}</span>
+
      </item>
      <item>
        <div slot="name" class="font-color">户籍地址</div>

--- a/src/pages/financingTrial/financing-details.vue
+++ b/src/pages/financingTrial/financing-details.vue
@@ -239,6 +239,7 @@ export default {
          vm.hlsPopup.hideLoading()
          if (res.result === 'S') {
            vm.info = res.info
+            vm.info.lease_times = '' // 租赁期数置空
            vm.annual_pay_times = res.info.annual_pay_times
          } else {
            hlsPopup.showLongCenter(res.message)

--- a/src/pages/financingTrial/financing-trial.vue
+++ b/src/pages/financingTrial/financing-trial.vue
@@ -48,8 +48,8 @@
              <span>{{ item.int_rate_n }}</span>
            </p>
            <p>
-              <span>期&nbsp;&nbsp;&nbsp;限</span>
-              <span>{{ item.lease_times }}期</span>
+              <!-- <span>期&nbsp;&nbsp;&nbsp;限</span>
+              <span>{{ item.lease_times }}期</span> -->
            </p>
          </div>
        </div>

--- a/src/pages/myInfo/my-info.vue
+++ b/src/pages/myInfo/my-info.vue
@@ -678,10 +678,18 @@ export default {
    getMultipleRole () {
      let vm = this
      let url = process.env.basePath + 'bp_role_query'
+      let bpId = window.localStorage.getItem('bp_id')
+      let bpType = window.localStorage.getItem('bp_type')
+      if (bpId === 'undefined') {
+        bpId = null
+      }
+      if (bpType === 'undefined') {
+        bpType = null
+      }
      let param = {
        master: {
-          bp_id: window.localStorage.getItem('bp_id'),
-          bp_type: window.localStorage.getItem('bp_type'),
+          bp_id: bpId,
+          bp_type: bpType,
        },
      }
      vm.hlsHttp.post(url, param).then(function (res) {
@@ -883,6 +891,7 @@ export default {
          vm.user_bp_class = res.info.user_bp_class
          vm.bp_id = res.info.user_bp_id
          vm.bp_identity = res.info.bp_identity
+          window.localStorage.removeItem('bp_id')
          window.localStorage.setItem('bp_id', res.info.user_bp_id)
          window.localStorage.setItem('user_bp_status', res.info.user_bp_status)
          window.localStorage.setItem('bp_name', res.info.user_bp_name)

--- a/src/pages/userBind/np/naturePerson.vue
+++ b/src/pages/userBind/np/naturePerson.vue
@@ -755,6 +755,9 @@ export default {
      let bpId = vm.from
        ? vm.$route.params.bp_id
        : window.localStorage.getItem('bp_id')
+      if (bpId === 'undefined') {
+        bpId = null
+      }
      let url = process.env.basePath + 'prj_cdd_check_list'
      let param = {
        master: {

--- a/src/pages/userBind/org/enterprise.vue
+++ b/src/pages/userBind/org/enterprise.vue
@@ -1649,6 +1649,9 @@ export default {
    loadItemList () {
      let vm = this
      let bpId = vm.from ? vm.$route.params.bp_id : vm.bp_id
+      if (bpId === 'undefined') {
+        bpId = null
+      }
      let url = process.env.basePath + 'prj_cdd_check_list'
      let param = {
        master: {

--- a/src/pages/userBindNew/np/accessory-info.vue
+++ b/src/pages/userBindNew/np/accessory-info.vue
@@ -874,6 +874,9 @@ export default {
      let vm = this
      vm.dowload_list = []
      let bpId = window.localStorage.getItem('bp_id')
+      if (bpId === 'undefined') {
+        bpId = null
+      }
      let url = process.env.basePath + 'prj_cdd_check_list'
      let param = {
        master: {

--- a/src/pages/userBindNew/np/base-info.vue
+++ b/src/pages/userBindNew/np/base-info.vue
@@ -681,6 +681,9 @@ export default {
    loadItemList () {
      let vm = this
      let bpId = window.localStorage.getItem('bp_id')
+      if (bpId === 'undefined') {
+        bpId = null
+      }
      let url = process.env.basePath + 'prj_cdd_check_list'
      let param = {
        master: {

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/src/pages/userBindNew/org/baseInfo.vue
@@ -1626,6 +1626,9 @@ export default {
    loadItemList () {
      let vm = this
      let bpId = vm.from ? vm.$route.params.bp_id : vm.bp_id
+      if (bpId === 'undefined') {
+        bpId = null
+      }
      let url = process.env.basePath + 'prj_cdd_check_list'
      let param = {
        master: {

--- a/src/pages/userBindNew/org/enclosure.vue
+++ b/src/pages/userBindNew/org/enclosure.vue
@@ -913,9 +913,13 @@ export default {
    loadItemList () {
      let vm = this
      let url = process.env.basePath + 'prj_cdd_check_list'
+      let bpId = vm.bp_id
+      if (bpId === 'undefined') {
+        bpId = null
+      }
      let param = {
        master: {
-          'document_id': vm.bp_id,
+          'document_id': bpId,
          'document_table': 'HLS_BP_MASTER',
          'tab_group': window.localStorage.authFlag ? 'HLS_ORG_NAUTH' : 'HLS_ORG_AUTH',
        },

--- a/src/scripts/filter.js
+++ b/src/scripts/filter.js

 export default (Vue) => {
  Vue.filter('currency', function (val) {
-    if (!val) return '0.00'
+    if (!val) return '¥0.00'
    // var intPart = Number(val).toFixed(0) // 获取整数部分
    var intPart = val.toString().split('.')[0]
    var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
@@ -14,12 +14,12 @@ export default (Vue) => {
      floatPart = value2Array[1].toString() // 拿到小数部分

      if (floatPart.length === 1) { // 补0,实际上用不着
-        return intPartFormat + '.' + floatPart + '0'
+        return '¥' + intPartFormat + '.' + floatPart + '0'
      } else {
-        return intPartFormat + '.' + floatPart
+        return '¥' + intPartFormat + '.' + floatPart
      }
    } else {
-      return intPartFormat + floatPart
+      return '¥' + intPartFormat + floatPart
    }
  })
  Vue.filter('datetime', timestamp => {

--- 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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.d9d652113ef586c3a6d929a9a74e4e32.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.75679805cfd6269119a3.js></script><script type=text/javascript src=./static/js/vendor.5967fb6c1e3ff49ccff1.js></script><script type=text/javascript src=./static/js/app.35e44e25fa61dd015374.js></script></body></html>
\ No newline at end of file