设计修改

刘淇
1 parent 62839810
Showing 6 changed files with 51 additions and 19 deletions
src/router/index.js
src/utils/utils.js
src/views/eInvoice/common/fill.vue
src/views/eInvoice/invoiceOpt/invoiceOpt.vue
src/views/eInvoice/parkInvoice/parkInvoice.vue
src/views/mySelf/selfNav.vue
@@ -25,7 +25,10 @@ export default new Router({
     {
       path: '/parkRecord',
       name: 'parkRecord',
-      component: () => import("@/views/parkPay/parkRecord.vue")
+      component: () => import("@/views/parkPay/parkRecord.vue"),
+      meta:{
+        title:'停车缴费'
+      }
     },
     {
       path: '/plateNumber',
@@ -39,35 +42,50 @@ export default new Router({
     {
       path: '/orderPay',
       name: 'orderPay',
-      component: () => import("@/views/parkPay/orderPay.vue")
+      component: () => import("@/views/parkPay/orderPay.vue"),
+      meta:{
+        title:'停车缴费'
+      }
     },
  
     //  ---------------- 电子发票导航
     {
       path: '/eInvoiceWrap',
       name: 'eInvoiceWrap',
-      component: () => import("@/views/eInvoice/eInvoiceWrap.vue")
+      component: () => import("@/views/eInvoice/eInvoiceWrap.vue"),
+      meta:{
+        title:'电子发票'
+      }
     },
  
     //  ---------------- 停车发票
     {
       path: '/parkInvoice',
       name: 'parkInvoice',
-      component: () => import("@/views/eInvoice/parkInvoice/parkInvoice.vue")
+      component: () => import("@/views/eInvoice/parkInvoice/parkInvoice.vue"),
+      meta:{
+        title:'电子发票'
+      }
     },
  
     //  ---------------- 填写发票
     {
       path: '/fill',
       name: 'fill',
-      component: () => import("@/views/eInvoice/common/fill.vue")
+      component: () => import("@/views/eInvoice/common/fill.vue"),
+      meta:{
+        title:'电子发票'
+      }
     },
  
     //  ---------------- 发票操作
     {
       path: '/invoiceOpt',
       name: 'invoiceOpt',
-      component: () => import("@/views/eInvoice/invoiceOpt/invoiceOpt.vue")
+      component: () => import("@/views/eInvoice/invoiceOpt/invoiceOpt.vue"),
+      meta:{
+        title:'电子发票'
+      }
     },
  
  
@@ -75,28 +93,40 @@ export default new Router({
     {
       path: '/checkEdit',
       name: 'checkEdit',
-      component: () => import("@/views/eInvoice/invoiceOpt/checkEdit.vue")
+      component: () => import("@/views/eInvoice/invoiceOpt/checkEdit.vue"),
+      meta:{
+        title:'电子发票'
+      }
     },
  
     //  ---------------- 个人发票历史记录
     {
       path: '/invoiceRecord',
       name: 'invoiceRecord',
-      component: () => import("@/views/eInvoice/invoiceRecord/invoiceRecord.vue")
+      component: () => import("@/views/eInvoice/invoiceRecord/invoiceRecord.vue"),
+      meta:{
+        title:'电子发票'
+      }
     },
  
     //  ---------------- 个人发票历史查看
     {
       path: '/invoiceDetail',
       name: 'invoiceDetail',
-      component: () => import("@/views/eInvoice/invoiceRecord/invoiceDetail.vue")
+      component: () => import("@/views/eInvoice/invoiceRecord/invoiceDetail.vue"),
+      meta:{
+        title:'电子发票'
+      }
     },
  
     //  ---------------- 电子包含交易
     {
       path: '/exchange',
       name: 'exchange',
-      component: () => import("@/views/eInvoice/invoiceRecord/exchange.vue")
+      component: () => import("@/views/eInvoice/invoiceRecord/exchange.vue"),
+      meta:{
+        title:'电子发票'
+      }
     },
  
  
@@ -209,7 +209,7 @@ export default {
       deviceInfo: this.myDeviceInfo,
       salt: salt,
       sign_type: "md5",
-      token:  sessionStorage.getItem("wx_Token"),  //c23849735f3442f3b95f7bec816317ae  "63a193ae1db543fab63052348cbcfa1d"   sessionStorage.getItem("wx_Token")
+      token:  sessionStorage.getItem("wx_Token"),  //9fd5ac0540fc4ad8b3bdd8b11c237ef4    sessionStorage.getItem("wx_Token")
       orgId: this.myOrgId
     };
     return reqData;
@@ -37,7 +37,7 @@
       </swiper>
  
       <div style="padding: 15px">
-        <x-button type="warn" @click.native="fillBtn">确定</x-button>
+        <x-button type="primary" @click.native="fillBtn">确定</x-button>
       </div>
  
     </div>
@@ -33,7 +33,7 @@
         </div>
       </group>
     </div>
-    <x-button type="warn" style="border-radius: 0" @click.native="toFill">新增抬头</x-button>
+    <x-button type="primary" style="border-radius: 0" @click.native="toFill">新增抬头</x-button>
  
     <div transfer-dom>
       <confirm v-model="deleShow"
@@ -5,7 +5,7 @@
       <p>暂无发票抬头,请添加发票抬头才可以发票哦</p>
  
       <div style="padding: 10px;">
-        <x-button type="warn" @click.native="$router.push('fill')">添加发票抬头</x-button>
+        <x-button type="primary" @click.native="$router.push('fill')">添加发票抬头</x-button>
       </div>
     </div>
     <div class="inovice-main" v-else>
@@ -74,7 +74,7 @@
             <check-icon :value.sync="isAllChecked"> 全选</check-icon>
           </div>
  
-          <x-button type="warn" style="width: 160px;float: right;height: 60px;border-radius: 0"
+          <x-button type="primary" style="width: 160px;float: right;height: 60px;border-radius: 0"
                     @click.native="openTicket">提交开票
           </x-button>
         </div>
@@ -156,9 +156,9 @@ export default {
           remark: data.remark, //备注谢谢
           custName: data.name, // 发票抬头
           custEmail:data.email, // 邮箱
-          invoiceTotalFee: this.totalPrice, // 总金额
+          invoiceTotalFee: this.totalPrice.toString(), // 总金额
           invoiceKind: "0",
-          orderList: finalArr
+          orderList: JSON.stringify(finalArr)
         };
       }else{
         obj = {
@@ -167,7 +167,7 @@ export default {
           custName:  data.name, // 发票抬头
           custCardNo:  data.cardNo, // 开户账户
           custPhone: data.phone, // 电话
-          invoiceTotalFee: this.totalPrice, // 总金额
+          invoiceTotalFee: this.totalPrice.toString(), // 总金额
           custEmail: data.email, // 邮箱
           custAddress: data.address, // 地址
           custBankName: data.bankName, // 开户银行
@@ -183,6 +183,7 @@ export default {
         console.log(response);
  
         if(response.code==0){
+          this.queryCustInvoiceInfoList(); //  获取抬头
           this.queryRntPayOrderForInvoice()
           this.$vux.toast.text(response. message, 'top')
         }else{
@@ -259,7 +259,8 @@ export default {
       let _token = sessionStorage.getItem("wx_Token");
       if (_token) {
         if(path=='plateNumber'){
-          window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/WuXi/gzh/index.html'
+          window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/WUXIZLYH/GZH/index.html'
+         // http://wxgzh.renniting.cn/wechatwuxi/WUXIZLYH/GZH/index.html#/selfNav
         }else{
           this.$router.push({
             path: path