From 2b13c35bcf3c5a50c85f9d25f76e7a16945073eb Mon Sep 17 00:00:00 2001
From: "pang.lizong" <pang.lizong>
Date: Thu, 19 Sep 2019 13:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=B8=AA=E4=BA=BA=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/main.js                                   |  4 ++--
 src/views/ebiz/my/UserIncome.vue              |  6 +++---
 src/views/ebiz/sale/SignatureConfirmation.vue | 21 ++++++++++++-------
 src/views/ebiz/sale/SignatureOfElectronic.vue |  2 +-
 vue.config.js                                 |  4 ++--
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.env.development b/.env.development
index 0f3aa8d52..765783424 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # env
-NODE_ENV = 'development'
+NODE_ENV = 'production'
 
 # flag
 VUE_APP_FLAG='development'
diff --git a/src/main.js b/src/main.js
index d1d6d613a..80b7c2783 100644
--- a/src/main.js
+++ b/src/main.js
@@ -49,11 +49,11 @@ Vue.prototype.$jump = Jump
 Vue.prototype.$utils = utils
 
 //混合开发调试工具
-if (process.env.NODE_ENV == 'development') {
+if (process.env.VUE_APP_FLAG == 'development') {
   // let Eruda = require('eruda')
   // Eruda.init()
   Vue.prototype.$rootUrl = location.origin
-} else if (process.env.NODE_ENV == 'production') {
+} else if (process.env.VUE_APP_FLAG == 'production') {
   Vue.prototype.$rootUrl = location.origin + '/ebiz-h5'
 }
 let Eruda = require('eruda')
diff --git a/src/views/ebiz/my/UserIncome.vue b/src/views/ebiz/my/UserIncome.vue
index 943ef5c0a..fabfd4a4b 100644
--- a/src/views/ebiz/my/UserIncome.vue
+++ b/src/views/ebiz/my/UserIncome.vue
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-// import echarts from 'echarts'
+import echarts from 'echarts'
 import { Collapse, CollapseItem, Cell, CellGroup, DatetimePicker, Popup, Row, Col, Tab, Tabs } from 'vant'
 import { getAgentIncome } from '@/api/ebiz/my/my.js'
 export default {
@@ -256,12 +256,12 @@ export default {
       this.showDatePicker = false
     },
     async getIncomeInfo(monthDate) {
-      console.log(monthDate)
+      // console.log('--获取代理人收入明细,请求:', monthDate)
       // 获取代理人收入明细
       const res = await getAgentIncome({
         monthDate
       })
-      console.log(res)
+      // console.log('--获取代理人收入明细,响应:', JSON.stringify(res))
       if (res.result == 0) {
         // 当月实收
         this.monthActualPay = res.monthActualPay
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 40a23d393..9f9c556ea 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -261,7 +261,7 @@ export default {
           // let number = window.localStorage.getItem('idNo')
           // console.log(that.saleInsuredInfo.idNo)
           // marked by panglizong:跳过人脸识别  begin...
-            console.log('--跳过人脸识别...')
+          console.log('--投保人-跳过人脸识别...')
           // EWebBridge.webCallAppInJs('face_auth', {
           //   number: that.saleInsuredInfo.idNo, //身份证号码
           //   name: that.saleInsuredInfo.name //姓名
@@ -312,11 +312,18 @@ export default {
           window.localStorage.setItem('sign-val', val)
           window.localStorage.setItem('sign-insured', JSON.stringify(that.insuredSign))
 
-          EWebBridge.webCallAppInJs('face_auth', {
-            //身份证号码
-            number: that.saleInsuredPersonInfo.idNo,
-            //姓名
-            name: that.saleInsuredPersonInfo.name
+          // marked by panglizong:跳过人脸识别  begin...
+          console.log('--被保人-跳过人脸识别...')
+          // EWebBridge.webCallAppInJs('face_auth', {
+          //   //身份证号码
+          //   number: that.saleInsuredPersonInfo.idNo,
+          //   //姓名
+          //   name: that.saleInsuredPersonInfo.name
+          // })
+          // marked by panglizong:跳过人脸识别  end
+          new Promise(resolve => {
+            console.log('--被保人-跳过人脸识别--返回识别成功')
+            resolve(JSON.stringify({ state: '1' }))
           }).then(data => {
             if (JSON.parse(data).state == '1') {
               if (that.insuredSign.readStatus == '0') {
@@ -481,6 +488,7 @@ export default {
         orderNo: window.localStorage.getItem('orderNo')
       }
       getOrderDetail(data).then(res => {
+        console.log('--签名确认页-获取订单详情，结果', JSON.stringify(res))
         if (res.result == '0') {
           this.$toast.clear()
           that.recmd = res.orderDTO.recmdDTO
@@ -494,7 +502,6 @@ export default {
 
           res.orderDTO.signDTOS.map(item => {
             if (item.signType == '0') {
-              console.log(item)
               that.appntSign = item
             } else if (item.signType == '1') {
               that.insuredSign = item
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index 4e7ffe296..7a08d20b4 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -454,7 +454,7 @@ export default {
 
     // 获取投保人信息
     that.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo'))
-    console.log(this.detailJump)
+    console.log('--投保单签名页-detailJump：', this.detailJump)
 
     if (this.detailJump != '1') {
       // 投被保人是否同人
diff --git a/vue.config.js b/vue.config.js
index 6ccb1c8a6..f804fabd7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,8 +2,8 @@ const autoprefixer = require('autoprefixer')
 const pxtoviewport = require('postcss-px-to-viewport')
 
 module.exports = {
-  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
-  lintOnSave: process.env.NODE_ENV === 'development', //是否开启代码检查
+  publicPath: process.env.VUE_APP_FLAG === 'production' ? '/' : '/',
+  lintOnSave: process.env.VUE_APP_FLAG === 'development', //是否开启代码检查
   outputDir: 'dist', //打包输出目录
   productionSourceMap: false,
   css: {