1、报价内容调整

2、国任状态为1和2的时候，显示更新状态按钮
3、安盛付款单二维码显示
4、国任付款单二维码显示

config/dev.env.js

@@ -5,9 +5,9 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
+  // BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
   // BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
-  // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
+  BASE_URL: '"http://192.168.0.115:8080/"' //凯森
 })
 
 

src/http/moudules/letter.js

@@ -581,6 +581,14 @@ export const orderStatusyongcheng = (id) => {
         method: "get",
     })
 }
+//国任缴费状态查询
+export const updateOrderInfoGuoren = (data) => {
+    return axios({
+        url: "/api/guoRen/updateOrderInfo" ,
+        method:"post",
+        data
+    })
+}
 /***
     爬虫统一调用模块
  */

src/views/Letter/Letter.vue

@@ -1468,17 +1468,17 @@
             <span>交强险</span>
             <span>￥{{ queryOrders.jqpremium }}</span>
           </div>
-          <div class="dis align jus" v-show="queryOrders.jypremium">
-            <span>驾意险</span>
-            <span>￥{{ queryOrders.jypremium }}</span>
+          <div class="dis align jus" v-show="queryOrders.taxamount">
+            <span>车船税</span>
+            <span>￥{{ queryOrders.taxamount }}</span>
           </div>
           <div class="dis align jus" v-show="queryOrders.sypremium">
             <span>车辆商业险</span>
             <span>￥{{ queryOrders.sypremium }}</span>
           </div>
-          <div class="dis align jus" v-show="queryOrders.taxamount">
-            <span>车船税</span>
-            <span>￥{{ queryOrders.taxamount }}</span>
+          <div class="dis align jus" v-show="queryOrders.jypremium">
+            <span>驾意险</span>
+            <span>￥{{ queryOrders.jypremium }}</span>
           </div>
           <div class="dis align jus" v-show="queryOrders.jqdiscountrate">
             <span>交强险优惠比例</span>
@@ -1551,7 +1551,7 @@
               <div v-show="['永安财险', '人保财险', '永诚财险', '中煤财险', '众安财险', '紫金财险', '国任财险'].includes(inscompany)" id="qrcode"
                 ref="qrcode">
               </div>
-              <img v-show="['恒邦财险'].includes(inscompany)" :src="paycodeimg" alt style="width:100%" />
+              <img v-show="['恒邦财险','安盛天平'].includes(inscompany)" :src="paycodeimg" alt style="width:100%" />
             </div>
           </div>
         </div>
@@ -2035,7 +2035,9 @@ import { getAgeByIdCard, searchkey, addressCode, getGenderByIdCard } from "@/uti
 import citydata from "@/assets/js/citydata.js";
 import  yongchengData from '../../assets/js/yongchengData';
 import { regionData, codeToText } from "element-china-area-data";
-
+import {
+  base64ToPath
+} from '@/common/image-tools-base64.js';
 export default {
   inject: ["reload"],
   name: "qrCode",
@@ -3411,7 +3413,9 @@ export default {
       };
       this.$api.letter.queryQuoteHistory(params).then(res => {
         res.data.forEach(item => {
-          item.accidentInfo.constructor=== Object?[res.data.accidentInfo]:res.data.accidentInfo
+          if( res.data.accidentInfo){
+            res.data.accidentInfo.constructor === Object?[res.data.accidentInfo]:res.data.accidentInfo
+          }
           item.username = this.paramsEdit.username+'('+this.paramsEdit.userid+')'
         })
         this.HistoryList = res.data;
@@ -3795,7 +3799,9 @@ export default {
       };
       this.$api.letter.queryQuoteHistory(params).then(res => {
         res.data.forEach(item => {
-          item.accidentInfo.constructor=== Object?[res.data.accidentInfo]:res.data.accidentInfo
+          if( item.accidentInfo){
+            item.accidentInfo.constructor === Object?[item.accidentInfo]:item.accidentInfo
+          }
           item.username = this.paramsEdit.username+'('+this.paramsEdit.userid+')'
         })
         this.HistoryList = res.data;
@@ -6657,7 +6663,13 @@ export default {
             case "永诚财险":
             case "众安财险":
             case "紫金财险":
+              this.$nextTick(() => {
+                this.creatQrCode(res.data.paymentLink);
+              });
+              break;
             case "国任财险":
+            this.paycodeimg = res.data.paymentLink;
+              break;
             case "中国人寿":
               this.$nextTick(() => {
                 this.creatQrCode(res.data.paymentLink);
@@ -6666,6 +6678,14 @@ export default {
             case "恒邦财险":
               this.paycodeimg = res.data.paymentLink;
               break;
+              case "安盛天平":
+              let anresult = res.data.paymentLink.replace(/[\r\n]/g, "");
+              let animgBase64 = `data:image/png;base64,${anresult}`;
+              base64ToPath(animgBase64)
+                .then(path => {
+                  this.paycodeimg = path;
+                })
+              break;
             default:
               this.$message({
                 message: "识别不到保险公司，请检查",

src/views/Letter/Orderlist.vue

@@ -98,6 +98,13 @@
                 <el-button size="mini" type="text"
                 v-if="item.orderstatus == '1' && item.inscompany=='永诚财险'"
                 @click="refreshStatus(item)" style="color:#f56c6c">更新订单</el-button>
+                <el-button size="mini" type="text"
+                v-if="item.orderstatus == '2' && item.inscompany=='国任财险'"
+                @click="refreshStatusGuoren(item)" style="color:#f56c6c">状态更新</el-button>
+                <el-button size="mini" type="text"
+                v-if="item.orderstatus == '1' && item.inscompany=='国任财险'"
+                @click="refreshStatusGuoren(item)" style="color:#f56c6c">更新订单</el-button>
+                
               <el-button size="mini" type="text" v-if="item.orderstatus == '2' && ['紫金财险'].includes(item.inscompany)"
                 @click="cancelorder(item)" style="color:#f56c6c">撤单</el-button>
               <el-button size="mini" type="text" v-if="item.orderstatus == '2'" @click="carcode(scope.row, item)"
@@ -156,10 +163,10 @@
         <div style="padding:0 20px">
           <div class="ORcode ">
             <div style="padding:5px;position: relative;">
-              <div v-if="['永安财险', '人保财险', '永诚财险', '中煤财险', '众安财险', '紫金财险', '中国人寿','国任财险'].includes(inscompany)" id="qrcode"
+              <div v-if="['永安财险', '人保财险', '永诚财险', '中煤财险', '众安财险', '紫金财险', '中国人寿'].includes(inscompany)" id="qrcode"
                 ref="qrcode">
               </div>
-              <img v-if="['恒邦财险', '安盛天平'].includes(inscompany)" :src="paycodeimg" alt="" style="width:100%">
+              <img v-if="['恒邦财险', '安盛天平','国任财险'].includes(inscompany)" :src="paycodeimg" alt="" style="width:100%">
             </div>
           </div>
         </div>
@@ -1442,17 +1449,17 @@
             <span>交强险</span>
             <span>￥{{ queryOrders.jqpremium }}</span>
           </div>
-          <div class="dis align jus" v-show="queryOrders.jypremium">
-            <span>驾意险</span>
-            <span>￥{{ queryOrders.jypremium }}</span>
+          <div class="dis align jus" v-show="queryOrders.taxamount">
+            <span>车船税</span>
+            <span>￥{{ queryOrders.taxamount }}</span>
           </div>
           <div class="dis align jus" v-show="queryOrders.sypremium">
             <span>车辆商业险</span>
             <span>￥{{ queryOrders.sypremium }}</span>
           </div>
-          <div class="dis align jus" v-show="queryOrders.taxamount">
-            <span>车船税</span>
-            <span>￥{{ queryOrders.taxamount }}</span>
+          <div class="dis align jus" v-show="queryOrders.jypremium">
+            <span>驾意险</span>
+            <span>￥{{ queryOrders.jypremium }}</span>
           </div>
           <div class="dis align jus" v-show="queryOrders.jqdiscountrate">
             <span>交强险优惠比例</span>
@@ -1891,6 +1898,32 @@ export default {
         }
       })
     },
+    // 国任查询缴费状态
+    refreshStatusGuoren(item){
+      this.$api.letter.updateOrderInfoGuoren( {companyId:item.id} ).then(res => {
+        if(res.code==200){
+          this.$message({ message:res.msg?res.msg:'已刷新状态', type: "success" })
+          this.loading = true;
+            this.$api.letter.queryOrders(this.pageRequest).then((res) => {
+              if (res.code == "200") {
+                this.loading = false;
+                this.pageResult = res.data.content;
+                this.pageNum = res.data.pageNum;
+                this.totalSize = res.data.totalSize;
+                this.pageResult.forEach(val => {
+                  this.$set(val, "expanded", false);
+                });
+              } else {
+                this.loading = false;
+              }
+            })
+        }
+        else{
+          this.$message({ message:res.msg, type: "error" })
+        }
+      })
+    },
+    
     //查询缴费状态
     querystatus(item) {
       if (item.inscompany == '紫金财险') {
@@ -1980,14 +2013,20 @@ export default {
             case "人保财险":
             case "中煤财险":
             case "永诚财险":
-            case "中国人寿":
             case "众安财险":
             case "国任财险":
+            this.paycodeimg = res.data.paymentLink;
+              break;
             case "紫金财险":
               this.$nextTick(() => {
                 this.creatQrCode(res.data.paymentLink);
               });
               break;
+              case "中国人寿":
+              this.$nextTick(() => {
+                this.creatQrCode(res.data.paymentLink);
+              });
+              break;
             case "恒邦财险":
               this.paycodeimg = res.data.paymentLink;
               break;
@@ -2035,7 +2074,9 @@ export default {
         if (res.code == 200) {
           this.licenseNo = res.data.licenseno;//车牌号
           this.inscompany = res.data.inscompany;//保险公司
-          res.data.accidentInfo.constructor === Object?[res.data.accidentInfo]:res.data.accidentInfo
+          if( res.data.accidentInfo){
+            res.data.accidentInfo.constructor === Object?[res.data.accidentInfo]:res.data.accidentInfo
+          }
           Object.assign(this.orderInfo, res.data);
           for (let i = 0; i < this.orderInfo.riskinfo.length; i++) {
             if (this.orderInfo.riskinfo[i].riskCode == "0510") {