活动日历修复

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest161? true : false;
+      data.isTest = data.isTest163? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

app.json

@@ -200,7 +200,8 @@
         "feiyiNew/index",
         "postSearch/index",
         "gwcOrder/index",
-        "indexGQ/index"
+        "indexGQ/index",
+        "transferPage/transferPage"
       ]
     }
   ],

pages/component/newCalendar/index.js

@@ -56,7 +56,8 @@ Component({
 
          /** 视图收起/展开 */
     toggleMode() {
-      if ((this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === 2025)) || (this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === 2023))) {
+        const { year, month} = this.data
+      if ((this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === (year+1))) || (this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === (year-1)))) {
         return
       }
       this.setData({
@@ -64,7 +65,7 @@ Component({
       })
       const activeDateStr = this.data.activeDateStr 
       const arr = activeDateStr.split("/")
-      const { year, month} = this.data
+     
       if(  this.data.currentViewType === "month" ) {
           this.getLastMonthDays(year, month)
           this.getNowMonthDays(year, month)
@@ -219,7 +220,7 @@ Component({
               nowDay
             } = this.data
             let type = e.currentTarget.dataset.type //类型
-            if ((type == 'next' && this.data.weekDay[0].year === 2025) || (type == 'prev' && this.data.weekDay[0].year === 2023)) {
+            if ((type == 'next' && this.data.weekDay[0].year === (year+1)) || (type == 'prev' && this.data.weekDay[0].year === (year-1))) {
                 return
             }  
             // if (type == 'next' && this.data.weekDay[0].year === 2025) {

pages/map/index.js

@@ -31,7 +31,9 @@ Page({
     timeList:{},
     showMore:'close',
     scrollLeft: 0,
-    levelList:[]
+    levelList:[],
+
+    selectHeight: 90,
   },
   listenScroll(e) {
     this.setData({
@@ -43,6 +45,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+
     if(options.type){
       this.setData({
         type:options.type
@@ -80,6 +83,11 @@ Page({
         levelList:res.data
       })
     })
+
+    // 设置筛选框top
+    let systemInfo = wx.getWindowInfo(),rect = wx.getMenuButtonBoundingClientRect();
+    let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+    this.setData({selectHeight:height+systemInfo.statusBarHeight})
   },
   changeClose() {
     this.setData({

pages/map/index.wxml

@@ -7,7 +7,7 @@
 </map>
 <view style="height:{{topHeight}}px"></view>
 <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="area_title" bindchange="changeArea">
-  <view class="picker">
+  <view class="picker" style="top:{{selectHeight}}px">
     <view class="areatext">{{areas[areaIndex].area_title}}</view>
     <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
   </view>

subPackages/transferPage/transferPage.js

@@ -0,0 +1,84 @@
+// subPackages/transferPage/transferPage.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    if (options.action = 'otherMiniProgram') {
+        this.goOtherMiniProgrogram(options)
+    } else {
+        wx.navigateBack()
+
+    }
+  },
+
+  goOtherMiniProgrogram (data) {
+    wx.navigateToMiniProgram({
+        // appId: 'wx114d514f39cb1fed',
+        // path: "pages/entry/index",
+        appId: data.appId,
+        path: data.path,
+        shortLink: data.shortLink,
+        complete: () =>{
+            wx.navigateBack()
+        }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

subPackages/transferPage/transferPage.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

subPackages/transferPage/transferPage.wxss

@@ -0,0 +1 @@
+/* subPackages/transferPage/transferPage.wxss */