合并代码

Common.wxss

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

pages/Ticket/TicketList/TicketList.js

@@ -5,7 +5,7 @@ Page({
   /**
    * 页面的初始数据
    */
-  data: {
+  data: { 
     isLogin: app.isLogin,
     screenList:[
       {
@@ -328,11 +328,11 @@ Page({
   calendarCreatCalendar() { 
     this.calendar = this.selectComponent('#calendar');
     this.calendar.getYearMonthDay(this.data.classArray);
-  },
+  },  
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function (options) { 
     let tit = "机票列表"
     if (options.sName && options.eName){
       tit = options.sName + '——' + options.eName
@@ -363,13 +363,13 @@ Page({
     this.openDate()
     this.setData({
       "msg.qFlightDateStart": i.detail.date_str
-    })
+    }) 
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   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'>
@@ -252,4 +253,4 @@
       </view>
     </view>
   </view>
-</view>
+</view> 
\ No newline at end of file

pages/Ticket/TicketList/TicketList.wxss

+ 
 .top-date-box{
   padding: 17rpx 0;
   background-color: #fff;
@@ -318,4 +319,4 @@
 }
 .margin-top30{
   margin-top: 30rpx;
-}
+} 
\ No newline at end of file

pages/Voucher/Voucher.js

@@ -79,13 +79,14 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) { 
-    const scene = decodeURIComponent(options.scene) 
+  onLoad: function (options) {
+    const scene = decodeURIComponent(options.scene)
     if (scene) {
-      let tcId = scene.split('=')[1] ? scene.split('=')[1] : options.tcid; 
-      this.setData({
-        tcId: tcId
-      })
+      let tcId = scene.split('=')[1] ? scene.split('=')[1] : options.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
 				}

utils/util.js

@@ -66,7 +66,7 @@ const getDays = (year, month)=>{
   month = parseInt(month, 10);
   var d = new Date(year, month, 0);
   return d.getDate();
-}
+} 
 // 时间格式化
 Date.prototype.Format = function (fmt) {
   var o = {
@@ -135,7 +135,7 @@ const getNextMonth = (date) => {
   }
   var t2 = year2 + '-' + month2 + '-' + day2;
   return t2;
-}
+} 
 module.exports = {
   formatTime: formatTime,
   CompareDate: CompareDate,