手机号增加校验，合同明细下载pdf文件调整，pdf预览逻辑调整

config/prod.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
   fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
   appId: '"com.xcmg.app"',
-  currentVersion: '"0.3.2"'
+  currentVersion: '"0.3.3"'
 }

config/uat.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.0.8"'
+  currentVersion: '"3.1.1"'
 }

src/main.js

@@ -45,6 +45,11 @@ import hlsPopup from './scripts/hlsPopup'
  */
 import {post, get} from './scripts/hlsHttp'
 
+/**
+ * PDFJS
+ */
+import PDFJS from 'pdfjs-dist'
+
 /** 全局函数hlsUtil**/
 
 import hlsUtil from './scripts/hlsUtil'
@@ -95,6 +100,8 @@ let hlsHttp = {
 }
 Vue.prototype.hlsHttp = window.hlsHttp = hlsHttp
 
+Vue.prototype.PDFJS = window.PDFJS = PDFJS
+
 Vue.prototype.hlsUtil = window.hlsUtil = hlsUtil
 
 Vue.prototype.Jpush = window.Jpush = Jpush

src/pages/contractInquire/repay-detail.vue

@@ -151,7 +151,15 @@ export default {
         if (res.result === 'S') {
           vm.fileArray = res.info
           vm.fileArray.forEach(i => {
-            cordova.InAppBrowser.open(i.fileUrl, '_system', 'location=yes,hideurlbar=no,toolbarposition=top')
+            //cordova.InAppBrowser.open(i.fileUrl, '_system', 'location=yes,hideurlbar=no,toolbarposition=top')
+            //cordova.InAppBrowser.open(i.fileUrl, '_system', 'location=yes')
+            if(vum.Platform.isAndroid()) {  //android终端
+              window.open(i.fileUrl,"_system","location=yes")
+            }else if(vum.Platform.isIOS() || vum.Platform.isIPad()) {   //ios终端
+              window.location.href = i.fileUrl;
+            }else{
+              window.open(i.fileUrl,"_system","location=yes")
+            }
           })
           // vm.pdfDownload()
         } else {

src/pages/contractSigning/previewPdf.vue

@@ -12,7 +12,7 @@
   </h-view>
 </template>
 <script>
-import PDFJS from 'pdfjs-dist'
+//import PDFJS from 'pdfjs-dist'
 // const Base64 = require('js-base64').Base64
 
 export default {
@@ -76,7 +76,7 @@ export default {
     },
     _loadFile (url) {
       console.log('URL ==== ' + url)
-      PDFJS.getDocument(url).then((pdf) => {
+      this.PDFJS.getDocument(url).then((pdf) => {
         this.pdfDoc = pdf
         // debugger
         console.log('pdf ==== ' + pdf)

src/pages/userBindNew/np/base-info.vue

@@ -1055,6 +1055,8 @@ export default {
         vm.hlsPopup.showLongCenter('配偶联系地址不能为空！')
       } else if (!vm.hlsUtil.phoneNumber(vm.baseInfo.cell_phone)) {
         vm.hlsPopup.showLongCenter('手机号码有误!')
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.hlsUtil.phoneNumber(vm.baseInfo.spouse_phone)) {
+        vm.hlsPopup.showLongCenter('配偶手机号码有误!')
       } else {
         let bpId = await vm.saveProtocol()
         return true