新增订单预览页面

src/components/PersonalCenter/OrderInvoiceTwo.vue

+<style>
+@import "../../assets/mall/OrderInvoice.css";
+</style>
+
+<template>
+  <el-row class="OrderInvoice" v-loading="loadingDataList">
+    <el-col :span="20" :offset="2" class="_content">
+      <trade
+        :ID="ID"
+        :tcid="tcid"
+        :numPeople="numPeople"
+        v-if="tcid && ID"
+      ></trade>
+      <div class="baidumap" id="allmap"></div>
+    </el-col>
+  </el-row>
+</template>
+<script>
+import trade from '../trade/order/indexTwo'
+import bus from '../../plugins/event-bus'
+export default {
+  components: {
+    trade,
+  },
+  data() {
+    return {
+      ID: null,
+      tcid: null,
+      numPeople: JSON.parse(this.$route.query.numPeople),
+      value: "1",
+      input10: "",
+      radio: "1",
+      type: 2,
+      addId: 2,
+      CustomerInfo: {},
+      city: 0,
+      pre: '',
+      clickDate: '',
+      loadingDataList: false,
+      priceList: [],
+      dataList: [],
+    };
+  },
+  computed: {},
+  created() {
+    this.ID = decodeURIComponent(this.$route.query.id)
+    this.tcid = decodeURIComponent(this.$route.query.tcid)
+    this.numPeople = JSON.parse(this.$route.query.numPeople)
+  },
+  mounted() {
+    this.b2b_get_GetCustomerInfo();
+  },
+  methods: {
+    b2b_get_GetCustomerInfo() {
+      let msg = {};
+      this.apipost(
+        "b2b_get_GetCustomerInfo",
+        msg,
+        r => {
+          if (r.data.resultCode == 1) {
+            this.CustomerInfo = r.data.data;
+          } else {
+            this.$message.error(r.data.message);
+          }
+        },
+        null
+      );
+    },
+    
+  }
+};
+</script>
\ No newline at end of file

src/components/global/pay.vue

@@ -23,7 +23,7 @@
 				<div v-show="isShowPic">
 					<img :src="payPic" style="float: left; margin-right: 15px; width: 150px; height: 150px; border: 1px solid #ccc;" />
 					<p style="padding-right: 10px; font-size: 12px; line-height: 20px; margin-bottom: 10px;">
-						<span style="color: #E95252;">{{payWay=="1"?'微信':'支付宝'}}</span>二维码有效时间为5分钟，为了不影响客户支付，请及时转发，以免失效
+						<span style="color: #E95252;">{{payWay=="1"?'微信':'支付宝'}}</span>二维码有效时间为1小时，为了不影响客户支付，请及时转发，以免失效
 					</p>
 					<p class="fz12 color333">倒计时</p>
 					<p style="color: #E95252; font-weight: bold; font-size: 12px; margin: 8px 0;" >{{descMin}}分{{descSecond}}秒</p>

src/components/mall/detailTwo.vue

@@ -194,7 +194,7 @@
                 </el-col>
             </el-col>
         </el-row>
-        <trade  :priceList='dataList.priceList' :trip='dataList' v-if="dataList.priceList && dataList.priceList.length>0"></trade>
+        <trade  :priceList='dataList.priceList' :trip='dataList' :numPeople="null" v-if="dataList.priceList && dataList.priceList.length>0"></trade>
         <div ref="nav">
             <el-row>
                 <el-col :span="20" :offset="2">

src/components/trade/order/index.vue

@@ -6,7 +6,7 @@
         <div class="yuding">
             <el-row>
                 <el-col class="_trip_xiangqing">
-                     <template v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer.customerId'>
+                     <template v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer &&customer.customerId'>
                         <p >航班</p>
                         <div class="_info_trip" v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer.customerId'>
                             <table border="0" cellspacing="0" cellpadding="0">
@@ -71,7 +71,7 @@
                         </el-button>
                     </el-col>
                 </el-col>
-                <el-col class="_trip_xiangqing" v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer.customerId'>
+                <el-col class="_trip_xiangqing" v-if='chosenObj.startDate!="" && chosenObj.startDate!=null && customer && customer.customerId'>
                     <!-- <p>团期</p> -->
                     <!-- <div class="place-box">
                         <el-row :gutter="40">
@@ -193,7 +193,7 @@
 import moment from 'moment'
 import bus from '../../../plugins/event-bus'
 export default {
-    props:['priceList','trip'],
+    props:['priceList','trip','numPeople'],
     data () {
         let that=this
         return {
@@ -375,7 +375,7 @@ export default {
             }else{
                 this.chosenObj.unicoArr.isSup=-2
             }
-            
+            this.$forceUpdate()
         },
         saveOrder(){
             if(!this.customer){
@@ -392,6 +392,25 @@ export default {
                 this.isCommit=false
                 return false
             }
+            let nowPath = this.$route.path
+            if (nowPath.indexOf('detailTwo')!==-1){ 
+                let ID = decodeURIComponent(this.$route.params.id)
+                let tcid = decodeURIComponent(this.$route.params.tcid)
+                let numPeople = {
+                    crCount: this.chosenObj.crCount,
+                    etCount: this.chosenObj.etCount,
+                    lrCount: this.chosenObj.lrCount,
+                    etbzcCount: this.chosenObj.etbzcCount,
+                    etzc: this.chosenObj.etzc,
+                    startDate: this.chosenObj.startDate,
+                    remark: this.chosenObj.remark,
+                }
+                this.$router.push({
+                    path: '/OrderInvoiceTwo',
+                    query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople)}
+                })
+                return
+            }
             let youhuiMoney=0
             this.trip.lineTeamDiscountList.forEach(x=>{
                 if(x.startNum<=sumSeat&&sumSeat<=x.endNum){
@@ -547,9 +566,9 @@ export default {
                 err => {}
             );
         },
-        getB2BSellByCustomerId(){
+        getB2BSellByCustomerId(){ 
             this.apipost('b2b_get_GetCustomerSummary',{},r=>{
-                if(r.data.resultCode==1){
+                if(r.data.resultCode==1){ 
                     this.customer = r.data.data
                     let msg = {customerId:r.data.data.customerId,lineId:this.trip.lineId}
                     this.apipost(
@@ -561,7 +580,7 @@ export default {
                         err => {}
                     );
                 }else{
-                    
+                    this.customer = null
                 }
             },null)
             // this.apipost(

src/router.js

@@ -131,7 +131,16 @@ export default new Router({
               component: resolve =>
                 require(["@/components/PersonalCenter/OrderInvoice"], resolve),
               meta: {
-                title: "发票信息"
+                title: "订单预览"
+              }
+            },
+            {
+              path: "/OrderInvoiceTwo",
+              name: "OrderInvoiceTwo",
+              component: resolve =>
+                require(["@/components/PersonalCenter/OrderInvoiceTwo"], resolve),
+              meta: {
+                title: "订单预览"
               }
             },
             {