合并代码

Common.wxss

@@ -208,9 +208,6 @@ image{
 .commonF .flex1{
   flex: 1;
 }
-.commonF .tct{
-  text-align: center;
-}
 .num_wrap{
   width: 220rpx;
   vertical-align: middle;
@@ -245,4 +242,3 @@ image{
   border: none;
   margin: 0 2rpx;
 }
\ No newline at end of file
-.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
\ No newline at end of file

pages/Ticket/TicketList/TicketList.js

@@ -369,7 +369,7 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-    this.initAirlines()
+
   },
 
   /**

pages/Ticket/TicketList/TicketList.wxml

+ 
 <view class='TicketList commonF'> 
   <view class='top-date-box clearfix'>
     <scroll-view scroll-left="{{(leftpx*160) + 'rpx'}}" scroll-x style='white-space: nowrap;' class='date'>

pages/Ticket/TicketList/TicketList.wxss

+ 
 .top-date-box{
   padding: 17rpx 0;
   background-color: #fff;

pages/Voucher/Voucher.js

@@ -83,9 +83,10 @@ Page({
     const scene = decodeURIComponent(options.scene)
     if (scene) {
       let tcId = scene.split('=')[1] ? scene.split('=')[1] : options.tcid;
-      this.setData({
-        tcId: tcId
-      })
+      // let tcId = 4006
+      // this.setData({
+      //   tcId: tcId
+      // })
     }else{
       // this.setData({
       //   tcId: 3278

project.config.json

@@ -129,7 +129,7 @@
 					"id": 12,
 					"name": "签证详情",
 					"pathName": "pages/visa/visaDetails/visaDetails",
-					"query": "",
+					"query": "id=dRvFC7rQ4Lg%3D%0A",
 					"scene": null
 				},
 				{
@@ -148,8 +148,8 @@
 				},
 				{
 					"id": 15,
-					"name": "机票列表",
-					"pathName": "pages/Ticket/TicketList/TicketList",
+					"name": "跟团游填写订单",
+					"pathName": "pages/GroupTour/FillOrder/FillOrder",
 					"query": "",
 					"scene": null
 				}