fix:修改

README.md

@@ -54,39 +54,39 @@ For a detailed explanation on how things work, check out the [guide](http://vuej
 
 # 签名
  jarsigner -verbose -keystore xcmg.keystore -signedjar 租赁通.apk zlt.apk XCMGKEY
- 
- 
+
+
 #极光推送信息
   账户：15062177566@163.com
-  
+
   密码：Xcmg66966
   JPUSH_APPKEY
   开发环境：
-  
+
     应用名称：徐工金服dev  com.xcmg.app.dev
     AppKey：7675edf5efa043a1ce9449a2
     Screat: 216c67446abe6758ac4e35f0
-  
+
   生产环境：
-  
+
     应用名称：徐工金服 com.xcmg.app
     AppKey：bef4fd44dcf54b79b8ab27c3
     Screat: 53f26eee93e657fdcee00d1a
 
 #百度地图
  账户：15996971299
- 
+
  密码：guo15996971299
  com.baidu.lbsapi.API_KEY
  开发环境：
- 
+
     应用名称：徐工融租dev  com.xcmg.app.dev
     IOS_KEY：NYuANmOUjGo5q0n48qF97fShdjVwmhM6
     ANDROID_KEY: Y8gTWgN2GuDtvhBfiECaZiBtE6i0wQBG
     web端: Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU
-  
+
   生产环境：
-  
+
     应用名称：徐工融租 com.xcmg.app
     IOS_KEY：hhouKKwxALvC7MBZmnfwgSacHOfFOlNu
     ANDROID_KEY: q4W0FynBkTd4v44ZM8m4MxUpuXBqGIqQ
@@ -96,13 +96,13 @@ For a detailed explanation on how things work, check out the [guide](http://vuej
  各项目如果安装了 com.hls.plugins.barcode 扫码插件与cordova-plugin-open-camera 媒体插件
  两个插件之间存在一些冲突 请注释掉媒体插件 plugin.xml 第83行 <uses-feature android:name="android.hardware.camera" />
 
-# Android执行add环境后修改文件 
+# Android执行add环境后修改文件
  修改platforms/android/AndroidManifest.xml
- 
+
  在第6行 activity标签后面 添加 android:background="@color/white" 同时找到 android:windowSoftInputMode 修改它的值为 adjustResize
 
 # 热更新操作步骤
 1.修改对应环境的版本号
-2.执行npm run build:对应环境
+2.执行npm run build:对应环境 , 重新移除添加android平台 cordova platform rm android , cordova platform add android@6.3.0
 3.将压缩后的www文件夹里的文件覆盖到服务器上下载下来的对应文件
 4.去对应的业务系统环境内修改相应的版本号

config/prod.env.js

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

plugins/android.json

@@ -59,9 +59,6 @@
         }
     },
     "dependent_plugins": {
-        "cordova-plugin-compat": {
-            "PACKAGE_NAME": "com.hls.app"
-        },
         "cordova-plugin-contacts": {
             "PACKAGE_NAME": "com.hls.app"
         },

src/pages/contractSigning/contract-new.vue

@@ -971,10 +971,10 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.approverBpList = res.lists.map(item => {
-            if (item.bp_name === '李燕') {
-              vm.$set(vm.baseInfo, 'zm_approver_bp', item.bp_id)
-              vm.$set(vm.baseInfo, 'zm_approver_bp_n', item.bp_name)
-            }
+            // if (item.bp_name === '李燕') {
+            //   vm.$set(vm.baseInfo, 'zm_approver_bp', item.bp_id)
+            //   vm.$set(vm.baseInfo, 'zm_approver_bp_n', item.bp_name)
+            // }
             return {
               code: item.bp_id,
               code_name: item.bp_name,

src/pages/contractSigning/contract-signing.vue

@@ -10,11 +10,11 @@
     </h-header>
     <div class="tab-style has-header">
       <div :class="{ 'done': num === 1, 'undone': num !== 1 }" @click="num = 1; isRadio = false">
-        <img :src="num === 1 ? check1 : uncheck1" />
+        <img :src="num === 1 ? check1 : uncheck1" >
         <span>未审核方案</span>
       </div>
       <div :class="{ 'done': num === 2, 'undone': num !== 2 }" @click="num = 2; isRadio = false">
-        <img :src="num === 2 ? check2 : uncheck2" />
+        <img :src="num === 2 ? check2 : uncheck2" >
         <span>已审核方案</span>
       </div>
     </div>
@@ -443,6 +443,8 @@ export default {
     },
 
     goDetails (item) {
+      console.log('点击对象:', item)
+      console.log('是否该只读:', this.num)
       this.$router.push({
         name: 'ContractDetail',
         params: {
@@ -450,6 +452,7 @@ export default {
           user_bp_type: this.user_bp_type,
           num: this.num,
           check_id: item.check_id,
+          readOnly: this.num === 1 ? 'N' : 'Y',
         },
       })
     },

src/pages/myInfo/my-info.vue

@@ -825,7 +825,6 @@ export default {
         obj.picture = hlsUtil.convertImageUrl(imgUrl[0])
         obj.filePath = imgUrl[0]
         vm.upLoadObj = obj.picture
-        console.log('$$$$$$$$$$$$$$$1' + imgUrl[0])
         // 拍完一张立马执行保存图片逻辑
         vm.save_picture(obj)
       }

src/scripts/hlsUtil.js

@@ -297,11 +297,11 @@ export default {
     if (typeof successFunction === 'function' && typeof errorFunction === 'function') {
       window.imagePicker.getPictures(
         successFunction, errorFunction, {
-          maximumImagesCount: obj.maxCount || 10,
-          quality: obj.quality || 50,
-          width: obj.width || 1024,
-          height: obj.height || 768,
-        }
+        maximumImagesCount: obj.maxCount || 10,
+        quality: obj.quality || 50,
+        width: obj.width || 1024,
+        height: obj.height || 768,
+      }
       )
     } else {
       window.hlsPopup.showLongBottom('参数有误!')
@@ -310,9 +310,9 @@ export default {
 
   //转换iOS下的webview url
   convertImageUrl: function (url) {
-    if(vum.Platform.isAndroid()){
+    if (vum.Platform.isAndroid()) {
       return url
-    }else if (vum.Platform.isIOS()){
+    } else if (vum.Platform.isIOS()) {
       return window.Ionic.WebView.convertFileSrc(url)
     }
   },
@@ -320,16 +320,16 @@ export default {
   /**
    * 录制视频
    */
-  captureVideo: function(onSuccess, onError){
+  captureVideo: function (onSuccess, onError) {
     var option = {
       //本设置录制的视频尺寸为10s 4-5mb,清晰度较好
-      duration: 10*1000, //10s
+      duration: 10 * 1000, //10s
       cameraDirection: window.MediaCapture.CAMERA_FRONT
     }
 
     if (typeof onSuccess === 'function' && typeof onError === 'function') {
       navigator.device.capture.captureVideo(onSuccess, onError, option);
-    } else{
+    } else {
       window.hlsPopup.showLongBottom('参数有误!')
     }
   },
@@ -380,11 +380,11 @@ export default {
       }
     }
 
-    function uploadSuccess (result) {
+    function uploadSuccess(result) {
       success(JSON.parse(result.response))
     }
 
-    function fileError () {
+    function fileError() {
       window.hlsPopup.hideLoading()
       console.log('upload error source ' + error.source)
       console.log('upload error target ' + error.target)
@@ -398,9 +398,9 @@ export default {
    * @param success
    */
   fileUploadSvc: function (file, success) {
-    console.log('file',file)
-    if(file.pkvalue && file.source_type){
-      console.log('file1',file)
+    console.log('file', file)
+    if (file.pkvalue && file.source_type) {
+      console.log('file1', file)
       let path = file.filePath
       var name = path.substr(path.lastIndexOf('/') + 1)
       let url = encodeURI(process.env.fileUploadSvcPath + 'attachment_upload')
@@ -417,28 +417,28 @@ export default {
         'access_token': window.localStorage.access_token,
         'filePath': path,
       }
-      if(file.fileName){
+      if (file.fileName) {
         options.fileName = encodeURI(file.fileName) + name.substr(name.lastIndexOf('.'))
       }
-      else{
+      else {
         options.fileName = name
       }
       options.mimeType = 'multipart/form-date'
       let ft = new FileTransfer() // eslint-disable-line
-      function uploadSuccess (result) {
+      function uploadSuccess(result) {
         success(JSON.parse(result.response))
       }
-  
-      function fileError () {
+
+      function fileError() {
         window.hlsPopup.hideLoading()
         console.log('upload error source ' + error.source)
         console.log('upload error target ' + error.target)
       }
-  
+
       ft.upload(path, url, uploadSuccess, fileError, options)
     }
-    else{
-      console.log('file2',file)
+    else {
+      console.log('file2', file)
       hlsPopup.showLongCenter('上传失败！')
     }
   },
@@ -464,12 +464,12 @@ export default {
     options.mimeType = 'multipart/form-date'
     let ft = new FileTransfer() // eslint-disable-line
 
-    function uploadSuccess (message) {
+    function uploadSuccess(message) {
       let res = JSON.parse(message.response)
       success(res)
     }
 
-    function error (e) {
+    function error(e) {
       this.hlsPopup.showLongCenter('汉王识别失败')
     }
 
@@ -496,12 +496,12 @@ export default {
     options.fileName = name
     options.mimeType = 'multipart/form-date'
     let ft = new FileTransfer() // eslint-disable-line
-    function uploadSuccess (message) {
+    function uploadSuccess(message) {
       let res = JSON.parse(message.response)
       console.log(JSON.stringify(res, '', 2))
       success(res)
     }
-    function error (e) {
+    function error(e) {
       this.hlsPopup.showLongCenter('识别失败')
     }
     ft.upload(path, url, uploadSuccess, error, options)
@@ -529,12 +529,12 @@ export default {
     }
     let ft = new FileTransfer() // eslint-disable-line
 
-    function uploadSuccess (message) {
+    function uploadSuccess(message) {
       let res = JSON.parse(message.response)
       success(res)
     }
 
-    function error (e) {
+    function error(e) {
       this.hlsPopup.showLongCenter('识别失败')
     }
 
@@ -562,12 +562,12 @@ export default {
     }
     let ft = new FileTransfer() // eslint-disable-line
 
-    function uploadSuccess (message) {
+    function uploadSuccess(message) {
       let res = JSON.parse(message.response)
       success(res)
     }
 
-    function error (e) {
+    function error(e) {
       console.log('识别失败')
       hlsPopup.showLongCenter('识别失败')
     }
@@ -800,7 +800,7 @@ export default {
     })
     if (!positive || !negative) throw new Error('IRR requires at least one positive value and one negative value')
 
-    function npv (rate) {
+    function npv(rate) {
       numberOfTries++
       if (numberOfTries > 1000) {
         throw new Error('IRR can\'t find a result')