Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/App.vue

@@ -59,7 +59,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_863923_naoz0fqofi.css';
+@import '//at.alicdn.com/t/font_863923_8f4ml296bz3.css';
 @import './assets/global/global.css';
 body,html{
   padding: 0px;

src/components/LocalTour/Appointment.vue

@@ -172,7 +172,6 @@ export default {
   created(){
       let userInfo=JSON.parse(localStorage.userInfo);
       this.form.customerId=userInfo.customerId;
-    //   console.log("StorageInfo.customerId",userInfo.customerId);
       this.dataDes=JSON.parse(sessionStorage.dataDes);
       this.Ticketinfo=JSON.parse(sessionStorage.Ticketinfo);
       this.price=(this.Ticketinfo.b2bPrice*this.form.purchaseQuantity).toFixed(2);
@@ -270,7 +269,6 @@ export default {
         } else {
           this.SettlementPrice = this.price
         }
-        console.log("SettlementPrice",this.SettlementPrice)
         // this.SettlementPrice=parseInt(this.SettlementPrice).toFixed(2);
         let allmonney=this.price - this.SettlementPrice;
         this.form.discountMoney = (this.price - this.SettlementPrice).toFixed(2);
@@ -374,10 +372,16 @@ export default {
         }
         let DayList=[];
         // this.timeStr.forEach(time=>{
-        // console.log("time",time)
-            
+            let len=this.timeStr.length;
             MonthdayList.forEach(item=>{
+                if(moment(this.timeStr[len-1].endDate).isBefore(MonthdayList[0].dateStr)){
+                        let msg={
+                            dateStr:item.dateStr,
+                        };
+                        DayList.push(msg)
+                    }
                 this.timeStr.forEach(time=>{
+                    
                 if(moment(time.startDate).isBefore(item.dateStr) && moment(item.dateStr).isBefore(time.endDate)){
                     let msg={
                         price:time.b2bPrice,
@@ -389,15 +393,17 @@ export default {
                     };
                     DayList.push(msg)
                 }
-                // else{
-                //     let date={
-                //         dateStr:item.dateStr,
-                //     }
-                //     DayList.push(date)                    
-                // }
+                
             })
+            if(this.timeStr.length<1){
+                let msg={
+                        dateStr:item.dateStr,
+                    };
+                DayList.push(msg)
+                    
+            }
         })
-        console.log("DayList",DayList)
+        
           this.creatCalendar(DayList);
         
     },

src/components/newPersonalCenter/block/OrderCenter.vue

@@ -11,6 +11,8 @@
     <TzOrder v-if="data === '8-2'"/>
     <!-- 定制游订单 -->
     <TdOrder v-if="data === '8-7'"/>
+    <!-- 签证订单 -->
+    <TQOrder v-if="data === '8-4'"/>
     <!-- 机票订单 -->
     <TkOrder v-if="data === '8-5'"/>
     <!-- 景点门票订单 -->
@@ -20,6 +22,7 @@
 <script>
 import TcOrder from './model/TcOrder'
 import TdOrder from './model/TdOrder'
+import TQOrder from './model/TQOrder'
 import TzOrder from './model/TzOrder'
 import TkOrder from './model/TkOrder'
 import ScenOrder from './model/ScenOrder'
@@ -33,6 +36,7 @@ export default {
     TkOrder: TkOrder,
     TzOrder: TzOrder,
     ScenOrder:ScenOrder,
+    TQOrder:TQOrder,
   },
   data() {
     return {

src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable.vue

@@ -248,7 +248,7 @@
                 <p>婴儿：0</p>
               </td>
               <td class="money">
-                <p>总额 ¥8680.00</p>
+                <p>总额 ¥{{item.preferPrice | priceFormat}}</p>
                 <p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥8680.00 <i class="iconfont icon-xia"></i></p>
                 <p class="__cp pay_no" v-if="item.payShow"  @click="item.payShow = false">已付总额 ¥8680.00 <i class="iconfont icon-xia shang"></i></p>
                 <!-- :class="{height_aotu: item.payShow}" -->

src/components/newPersonalCenter/block/model/TQOrder.vue

+<style>
+/* 定制游订单 */
+@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
+</style>
+<template>
+  <el-row class="OrderCenter">
+    <!-- 条件 -->
+    <ul class="clearfix">
+      <template v-for="item in TitList">
+        <li :key="item.ID"
+          class="__cp"
+          @click="handleClick(item)"
+          :class="{_active: activeName === item.ID}"
+        >{{item.Type}}</li>
+      </template>
+    </ul>
+    <!-- 表格 -->
+    <TCTable :tableData="tableData"/>
+
+    <div class="empty-data" v-if="tableData.length<1">
+      <i class="iconfont icon-kong"></i>
+      很抱歉，你想要的信息我们真的找不到了
+    </div>
+    <!-- 分页 -->
+    <el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
+      <el-pagination
+        :current-page.sync="currentPage"
+        :page-size="getOrderMsg.pageSize"
+        layout="total, prev, pager, next"
+        :total="Count"
+        @current-change="handleCurrentChange"
+      ></el-pagination>
+    </el-row>
+  </el-row>
+</template>
+<script>
+import TCTable from "./OrderInfoModel/TCTable";
+export default {
+  components: {
+    TCTable: TCTable
+  },
+  data() {
+    return {
+      activeName: -1,
+      currentPage: 1,
+      rderLoading: false,
+      totalCount: 1,
+      Count: 1,
+      WaitDealOrderPageList: "",
+      getOrderMsg: {
+        pageIndex: 1,
+        pageSize: 10,
+        orderType: 5,
+        queryDays: 0,
+        orderState: -1,
+        CustomerId: ""
+      },
+      TitList: [
+        {
+          Type: "全部",
+          ID: -1
+        },
+        {
+          Type: "待付定金",
+          ID: 1
+        },
+        {
+          Type: "待付尾款",
+          ID: 2
+        },
+        {
+          Type: "待发团",
+          ID: 3
+        },
+        {
+          Type: "交易完成",
+          ID: 4
+        },
+        {
+          Type: "取消",
+          ID: 5
+        }
+        // {
+        //   val: 6,
+        //   lable: '等待商家确认'
+        // },
+        // {
+        //   val: 7,
+        //   lable: '退款中'
+        // },
+        // {
+        //   val: 8,
+        //   lable: '退款成功'
+        // },
+        // {
+        //   val: 9,
+        //   lable: '交易完成'
+        // },
+      ],
+      tableData: []
+    };
+  },
+  computed: {},
+  created() {
+  },
+  mounted() {
+    let userInfo = localStorage.userInfo
+      ? JSON.parse(localStorage.userInfo)
+      : "";
+    this.getOrderMsg.CustomerId = userInfo.customerId;
+    this.gerOrderList();
+    this.b2b_get_GetWaitDealOrderPageList();
+  },
+  methods: {
+    b2b_get_GetWaitDealOrderPageList() {
+      //获取待处理订单
+      let msg = {
+        pageIndex: 1,
+        pageSize: 100
+      };
+      this.apipost(
+        "b2b_get_GetWaitDealOrderPageList",
+        msg,
+        r => {
+          if (r.data.resultCode == 1) {
+            this.WaitDealOrderPageList = r.data.data.pageData;
+          } else {
+            this.$message.error(r.data.message);
+          }
+        },
+        null
+      );
+    },
+    gerOrderList: function() {
+      this.orderLoading = true;
+      this.apiJavaPost(
+        "/api/b2b/user/getrecentorder",
+        this.getOrderMsg,
+        res => {
+            // console.log("sss",res)
+          if (res.data.resultCode == 1) { 
+            this.tableData = res.data.data;
+            console.log("签证订单",this.tableData)
+            this.totalCount = res.data.data.pageCount;
+            this.Count = res.data.data.count;
+            this.orderLoading = false;
+          } else {
+            this.Error(res.data.message);
+            this.orderLoading = false;
+          }
+        },
+        null
+      );
+    },
+    handleClick(item) {
+      this.activeName = item.ID;
+      this.getOrderMsg.orderState = item.ID;
+      this.gerOrderList();
+    },
+    handleCurrentChange(val) {
+      // 翻页
+      this.getOrderMsg.pageIndex = parseInt(val);
+      this.gerOrderList();
+    }
+  }
+};
+</script>

src/components/newPersonalCenter/block/model/TdOrder.vue

 <style>
+/* 定制游订单 */
 @import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
 </style>
 <template>

src/components/newPersonalCenter/block/model/TkOrder.vue

 <style>
+/* 机票订单 */
 @import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
 </style>
 <template>
@@ -14,7 +15,7 @@
       </template>
     </ul>
     <!-- 表格 -->
-    <TKTable :tableData="tableData"/>
+    <NewTKtable :tableData="tableData"/>
     <div class="empty-data" v-if="tableData.length<1">
       <i class="iconfont icon-kong"></i>
       很抱歉，你想要的信息我们真的找不到了
@@ -32,10 +33,10 @@
   </el-row>
 </template>
 <script>
-import TKTable from "./OrderInfoModel/TKTable";
+import NewTKtable from "./OrderInfoModel/NewTKtable";
 export default {
   components: {
-    TKTable: TKTable
+    NewTKtable: NewTKtable
   },
   data() {
     return {
@@ -136,6 +137,7 @@ export default {
         res => {
           if (res.data.resultCode == 1) { 
             this.tableData = res.data.data.pageData;
+            console.log("机票订单",this.tableData)
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
             this.orderLoading = false;

src/plugins/index.js

@@ -18,7 +18,7 @@ export default {
                 //  let domainUrl = "https://reborn.oytour.com"; //刘东主域名
                  let domainUrl = "https://reborn.oytour.com";
                 // var domainUrl = "http://test.viitto.com"
-                // domainUrl = "http://192.168.2.214:8082"
+                domainUrl = "http://192.168.2.214:8082"
                 let locationName = window.location.hostname;
                 if (this.isOnline()) {
                     if (window.location.host.indexOf('viitto.com') != -1)
@@ -31,7 +31,7 @@ export default {
                     DomainUrl: domainUrl,
                     //常用提交数据URL 
                     PostUrl: domainUrl + "/api/common/post",
-                    javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000",
+                    javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
                     ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
                     UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
                     LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
@@ -50,7 +50,7 @@ export default {
                 var key = "";
                 if (this.getLocalStorage() != null) {
                     token = this.getLocalStorage().token;
-                    key = this.getLocalStorage().SecretKey;
+                    key = this.getLocalStorage().secretKey;
                 }
                 var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
                 var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
@@ -172,7 +172,7 @@ export default {
                 var key = "";
                 if (this.getLocalStorage() != null) {
                     token = this.getLocalStorage().token;
-                    key = this.getLocalStorage().SecretKey;
+                    key = this.getLocalStorage().secretKey;
                 }
 
                 var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
@@ -219,7 +219,7 @@ export default {
                 // let uid = userInfo.accountId ? userInfo.accountId : 0
                 if (this.getLocalStorage() != null) {
                     token = this.getLocalStorage().token;
-                    key = this.getLocalStorage().SecretKey;
+                    key = this.getLocalStorage().secretKey;
                 }
                 var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
                 var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);