存

app.json

@@ -94,7 +94,8 @@
                 "select/area/index",
                 "select/task/index",
                 "calendar/index",
-                "calendar/task/index"
+                "calendar/task/index",
+                "calendarN/index"
             ]
         },
         {
@@ -170,7 +171,7 @@
         "van-transition": "@vant/weapp/transition/index",
         "viewDate": "/components/viewDate/index",
         "filtrate": "/components/filtrate/filtrate",
-        "personnel":"/components/personnel/index"
+        "personnel": "/components/personnel/index"
     },
     "tabBar": {
         "custom": true,

components/wx-calendar/index.js

@@ -87,6 +87,10 @@ Component({
         checkedShow: {
             type: Boolean,
             value: true
+        },
+        user_show: {
+          type: Boolean,
+          value: false
         }
     },
     data: {
@@ -116,7 +120,7 @@ Component({
         _selDay: null,
         _selWeek: 0,
         _rects: [],
-        _today: {}
+        _today: {},
     },
     attached() {
         this._rectsLoading = true

components/wx-calendar/index.json

@@ -1,4 +1,7 @@
 {
     "component": true,
-    "styleIsolation": "isolated"
+    "styleIsolation": "isolated",
+    "options": {
+      "multipleSlots": true  
+    }
 }

components/wx-calendar/index.wxml

@@ -1,174 +1,103 @@
 <wxs module="calendar_wxs" src="./index.wxs"></wxs>
 <view class="wd-calendar-container {{ darkmode ? 'darkmode' : '' }} {{ checkedShow ? '' : 'sel-hidden' }}" style="{{ style }}">
-    <view 
-        id="calendar" 
-        class="wd-calendar {{ !loading ? 'load' : '' }}" 
-        style="height: {{ view == 'week' ? minHeight : calendarHeight }}px;"
-        catchtransitionend="handleCalendarTransEnd"
-        mark:panel="{{ panelHeight }}"
-        mark:calendar="{{ calendarHeight }}"
-        mark:max="{{ maxHeight }}"
-        mark:min="{{ minHeight }}"
-        mark:view="{{ currView }}"
-        data-panel="{{ panelHeight }}"
-        data-calendar="{{ calendarHeight }}"
-        data-min="{{ minHeight }}">
-        <view class="wd-calendar-bar">
-            <view class="wd-calendar-title" data-info="{{ titleInfo }}" bindtap="{{ calendar_wxs.handleYearPanelShow }}">
-                <text >{{ months[currTab].year }}</text><text class="wd-calendar-title-cn">{{language['年']?',':'年'}}</text>
-                <text >{{ months[currTab].month }}</text>
-                <text class="wd-calendar-title-cn">{{language['月']?'':'月'}}</text>
+  <view id="calendar" class="wd-calendar {{ !loading ? 'load' : '' }}" style="height: {{ view == 'week' ? minHeight : calendarHeight }}px;" catchtransitionend="handleCalendarTransEnd" mark:panel="{{ panelHeight }}" mark:calendar="{{ calendarHeight }}" mark:max="{{ maxHeight }}" mark:min="{{ minHeight }}" mark:view="{{ currView }}" data-panel="{{ panelHeight }}" data-calendar="{{ calendarHeight }}" data-min="{{ minHeight }}">
+    <view class="wd-calendar-bar">
+      
+      <view class="wd-calendar-title" data-info="{{ titleInfo }}" bindtap="{{ calendar_wxs.handleYearPanelShow }}">
+        <text>{{ months[currTab].year }}</text><text class="wd-calendar-title-cn">{{language['年']?',':'年'}}</text>
+        <text>{{ months[currTab].month }}</text>
+        <text class="wd-calendar-title-cn">{{language['月']?'':'月'}}</text>
+      </view>
+      <view class="wd-calendar-options">
+        <view class="wd-calendar-option">
+          <view class="wd-calendar-option-it ">
+            <view class="wd-calendar-option-views today {{ tdOpShow ? 'show' : '' }}" catchtap="toToday">
+              <view class="wd-calendar-option-view">{{language['现在']||'今'}}</view>
             </view>
-            <view class="wd-calendar-options">
-                <view class="wd-calendar-option">
-                    <view class="wd-calendar-option-it ">
-                        <view class="wd-calendar-option-views today {{ tdOpShow ? 'show' : '' }}" catchtap="toToday">
-                            <view class="wd-calendar-option-view">{{language['现在']||'今'}}</view>
-                        </view>
-                    </view>
-                </view>
-                <view class="wd-calendar-option">
-                    <view class="wd-calendar-option-it">
-                        <view class="wd-calendar-option-views" catchtap="{{ calendar_wxs.toggleView }}">
-                            <view catchtransitionend="handleOpBarTransEnd" class="wd-calendar-option-view {{ (currView == 1 || currView == 3)? 'curr' : '' }}">{{language['月']||'月'}}</view>
-                            <view catchtransitionend="handleOpBarTransEnd" class="wd-calendar-option-view {{ currView == 2 ? 'curr' : '' }}">{{language['周']||'周'}}</view>
-                            <view class="wd-calendar-option-view-bar" style="transform: translateX({{ currView == 2 ? '70rpx' : 0 }}) translateZ(0px);"></view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class="wd-calendar-week-bar">
-            <view class="wd-calendar-week-item" wx:for="{{ Weeks }}">{{language['周' + item] || item}}</view>
+          </view>
         </view>
-        <view 
-            class="wd-calendar-month-body {{ solidDay ? '' : 'solid' }}" 
-            change:weektabchange="{{ calendar_wxs.handleWeekSwiperChange }}" weektabchange="{{ weektabchange }}"
-            change:monthchange="{{ calendar_wxs.handleMonthChange }}" monthchange="{{ monthchange }}"
-            change:needInitTrans="{{ calendar_wxs.handleInitTrans }}" needInitTrans="{{ needInitTrans }}"
-            change:viewchange="{{ calendar_wxs.handleViewChange }}" viewchange="{{ viewchange }}"
-            bindtouchstart="{{ calendar_wxs.touchStart }}"
-            catchtouchmove="{{ calendar_wxs.touchMove }}" 
-            catchtouchend="{{ calendar_wxs.touchEnd }}">
-            <swiper circular duration="{{ 300 }}" current="{{ currTab }}" class="wd-calendar-swiper" bindanimationfinish="handleSwiperAniEnd">
-                <swiper-item
-                    wx:for="{{ months }}" 
-                    wx:for-item="month" 
-                    wx:for-index="mdx"
-                    skip-hidden-item-layout
-                    class="wd-calendar-swiper-item" >
-                    <view 
-                        class="wd-calendar-month-panel {{ currTab === mdx ? 'curr' : 'other' }}" 
-                        style="height: {{ panelHeight }}px;min-height: {{ panelHeight }}px;"
-                        data-trans="{{ month.trans }}">
-                        <view 
-                            wx:if="{{ month.bar.s && currTab === mdx && checkedShow }}"
-                            class="wd-calendar-day-sel {{ barAni ? '' : 'no-ani' }} {{ month.bar.t ? 'today' : '' }} " 
-                            style="top: {{ month.bar.y }};left: {{ month.bar.x }}px;" >
-                            <view class="wd-calendar-day-sel-bar {{ month.bar.a ? 'animation' : '' }}" bindanimationend="handleSelBarAniEnd"></view>
-                        </view>
-                        <view 
-                            class="wd-calendar-week-row l-{{ month.days.length }}" 
-                            wx:for="{{ month.days }}" 
-                            wx:for-item="w" 
-                            wx:for-index="wdx" >
-                            <view 
-                                wx:for="{{ w.days }}" 
-                                wx:for-item="d" 
-                                wx:for-index="ddx"
-                                class="wd-calendar-day {{ d.type }} {{ d.isToday ? 'today' : ''  }} {{ ((wdx * 7 + ddx) == month.bar.i && currTab === mdx) ? 'curr' : '' }}" 
-                                catchtap="selDate"
-                                data-wdx="{{ wdx }}"
-                                data-ddx="{{ ddx }}">
-                                <view class="wd-calendar-gregorian {{ (currView != 3 && d.marker && d.marker.schedule.length > 0) ? 'dot' : '' }}">
-                                    <text>{{ d.day }}</text>
-                                    <view 
-                                        class="wd-calendar-gregorian-corner" 
-                                        wx:if="{{ d.marker && d.marker.corner.length > 0 }}"
-                                        style="{{ d.marker.corner[0].color ? 'color:' + d.marker.corner[0].color + ';' : '' }}"
-                                        >{{ d.marker.corner[0].mark }}</view>
-                                </view>
-                                <view class="wd-calendar-solar {{ d.lunar_type }}">
-                                    <text 
-                                        wx:if="{{ d.marker && d.marker.holiday.length > 0 }}"
-                                        style="color: {{ d.marker.corner[0].color ? d.marker.corner[0].color : '#2a97ff' }};">{{ d.marker.holiday[0].mark }}</text>
-                                    <text wx:elif="{{languagecode == 'ZH'}}">{{d.lunar_day}}</text>
-                                    <view class="wd-calendar-schedules" wx:if="{{ d.marker && d.marker.schedule.length > 0 }}">
-                                        <view 
-                                            class="wd-calendar-schedule"
-                                            style="{{ d.marker.schedule[0].color ? 'color:' + d.marker.schedule[0].color + ';' : '' }}{{ d.marker.schedule[0].bgColor ? 'background-color:' + d.marker.schedule[0].bgColor + ';' : '' }}">{{ d.marker.schedule[0].mark }}</view>
-                                        <view class="wd-calendar-schedule-more" wx:if="{{ d.marker.schedule.length - 1 > 0 }}">+{{ d.marker.schedule.length - 1 }}</view>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </view>
-                </swiper-item>
-            </swiper>
+        <view class="wd-calendar-option">
+          <view class="wd-calendar-option-it">
+            <view class="wd-calendar-option-views" catchtap="{{ calendar_wxs.toggleView }}">
+              <view catchtransitionend="handleOpBarTransEnd" class="wd-calendar-option-view {{ (currView == 1 || currView == 3)? 'curr' : '' }}">{{language['月']||'月'}}</view>
+              <view catchtransitionend="handleOpBarTransEnd" class="wd-calendar-option-view {{ currView == 2 ? 'curr' : '' }}">{{language['周']||'周'}}</view>
+              <view class="wd-calendar-option-view-bar" style="transform: translateX({{ currView == 2 ? '70rpx' : 0 }}) translateZ(0px);"></view>
+            </view>
+          </view>
         </view>
-        <view 
-            class="wd-calendar-bt-bar"
-            bindtouchstart="{{ calendar_wxs.touchStart }}"
-            catchtouchmove="{{ calendar_wxs.touchMove }}" 
-            catchtouchend="{{ calendar_wxs.touchEnd }}">
-            <view class="wd-calendar-bt-control">
-                <view class="wd-calendar-bt-control-item" >
-                    <view class="wd-calendar-bt-control-bar" id="control_1"></view>
+      </view>
+    </view>
+    <view class="wd-calendar-week-bar">
+      <view class="wd-calendar-week-item" wx:for="{{ Weeks }}">{{language['周' + item] || item}}</view>
+    </view>
+    <view class="wd-calendar-month-body {{ solidDay ? '' : 'solid' }}" change:weektabchange="{{ calendar_wxs.handleWeekSwiperChange }}" weektabchange="{{ weektabchange }}" change:monthchange="{{ calendar_wxs.handleMonthChange }}" monthchange="{{ monthchange }}" change:needInitTrans="{{ calendar_wxs.handleInitTrans }}" needInitTrans="{{ needInitTrans }}" change:viewchange="{{ calendar_wxs.handleViewChange }}" viewchange="{{ viewchange }}" bindtouchstart="{{ calendar_wxs.touchStart }}" catchtouchmove="{{ calendar_wxs.touchMove }}" catchtouchend="{{ calendar_wxs.touchEnd }}">
+      <swiper circular duration="{{ 300 }}" current="{{ currTab }}" class="wd-calendar-swiper" bindanimationfinish="handleSwiperAniEnd">
+        <swiper-item wx:for="{{ months }}" wx:for-item="month" wx:for-index="mdx" skip-hidden-item-layout class="wd-calendar-swiper-item">
+          <view class="wd-calendar-month-panel {{ currTab === mdx ? 'curr' : 'other' }}" style="height: {{ panelHeight }}px;min-height: {{ panelHeight }}px;" data-trans="{{ month.trans }}">
+            <view wx:if="{{ month.bar.s && currTab === mdx && checkedShow }}" class="wd-calendar-day-sel {{ barAni ? '' : 'no-ani' }} {{ month.bar.t ? 'today' : '' }} " style="top: {{ month.bar.y }};left: {{ month.bar.x }}px;">
+              <view class="wd-calendar-day-sel-bar {{ month.bar.a ? 'animation' : '' }}" bindanimationend="handleSelBarAniEnd"></view>
+            </view>
+            <view class="wd-calendar-week-row l-{{ month.days.length }}" wx:for="{{ month.days }}" wx:for-item="w" wx:for-index="wdx">
+              <view wx:for="{{ w.days }}" wx:for-item="d" wx:for-index="ddx" class="wd-calendar-day {{ d.type }} {{ d.isToday ? 'today' : ''  }} {{ ((wdx * 7 + ddx) == month.bar.i && currTab === mdx) ? 'curr' : '' }}" catchtap="selDate" data-wdx="{{ wdx }}" data-ddx="{{ ddx }}">
+                <view class="wd-calendar-gregorian {{ (currView != 3 && d.marker && d.marker.schedule.length > 0) ? 'dot' : '' }}">
+                  <text>{{ d.day }}</text>
+                  <view class="wd-calendar-gregorian-corner" wx:if="{{ d.marker && d.marker.corner.length > 0 }}" style="{{ d.marker.corner[0].color ? 'color:' + d.marker.corner[0].color + ';' : '' }}">{{ d.marker.corner[0].mark }}</view>
                 </view>
-                <view class="wd-calendar-bt-control-item" >
-                    <view class="wd-calendar-bt-control-bar" id="control_2"></view>
+                <view class="wd-calendar-solar {{ d.lunar_type }}">
+                  <text wx:if="{{ d.marker && d.marker.holiday.length > 0 }}" style="color: {{ d.marker.corner[0].color ? d.marker.corner[0].color : '#2a97ff' }};">{{ d.marker.holiday[0].mark }}</text>
+                  <text wx:elif="{{languagecode == 'ZH'}}">{{d.lunar_day}}</text>
+                  <view class="wd-calendar-schedules" wx:if="{{ d.marker && d.marker.schedule.length > 0 }}">
+                    <view class="wd-calendar-schedule" style="{{ d.marker.schedule[0].color ? 'color:' + d.marker.schedule[0].color + ';' : '' }}{{ d.marker.schedule[0].bgColor ? 'background-color:' + d.marker.schedule[0].bgColor + ';' : '' }}">{{ d.marker.schedule[0].mark }}</view>
+                    <view class="wd-calendar-schedule-more" wx:if="{{ d.marker.schedule.length - 1 > 0 }}">+{{ d.marker.schedule.length - 1 }}</view>
+                  </view>
                 </view>
+              </view>
             </view>
+          </view>
+        </swiper-item>
+      </swiper>
+    </view>
+    <view class="wd-calendar-bt-bar" bindtouchstart="{{ calendar_wxs.touchStart }}" catchtouchmove="{{ calendar_wxs.touchMove }}" catchtouchend="{{ calendar_wxs.touchEnd }}">
+      <view class="wd-calendar-bt-control">
+        <view class="wd-calendar-bt-control-item">
+          <view class="wd-calendar-bt-control-bar" id="control_1"></view>
+        </view>
+        <view class="wd-calendar-bt-control-item">
+          <view class="wd-calendar-bt-control-bar" id="control_2"></view>
         </view>
+      </view>
+    </view>
 
-        <view class="wd-calendar-years-panel {{ yearPanelShow ? 'show' : '' }}">
-            <view class="wd-calendar-bar">
-                <view class="wd-calendar-title show ym" data-info="{{languagecode=='ZH' ? yearMs[currYmTab].lunar_year : '' }}">
-                    <text >{{ yearMs[currYmTab].year }}</text><text wx:if="{{languagecode=='ZH'}}" class="wd-calendar-title-cn margin-left">年</text>
+    <view class="wd-calendar-years-panel {{ yearPanelShow ? 'show' : '' }}">
+      <view class="wd-calendar-bar">
+        <view class="wd-calendar-title show ym" data-info="{{languagecode=='ZH' ? yearMs[currYmTab].lunar_year : '' }}">
+          <text>{{ yearMs[currYmTab].year }}</text><text wx:if="{{languagecode=='ZH'}}" class="wd-calendar-title-cn margin-left">年</text>
+        </view>
+      </view>
+      <view class="wd-calendar-years-panel-body">
+        <swiper circular duration="{{ 300 }}" current="{{ currYmTab }}" class="wd-calendar-ym-swiper" bindanimationfinish="handleYmSwiperAniEnd">
+          <swiper-item wx:for="{{ yearMs }}" wx:for-item="year" wx:for-index="ydx" skip-hidden-item-layout class="wd-calendar-ym-swiper-item">
+            <view class="wd-calendar-ym-months">
+              <view class="wd-calendar-ym-row" wx:for="{{ 3 }}" wx:for-item="mr" wx:for-index="mrdx">
+                <view wx:for="{{ 4 }}" wx:for-item="m" wx:for-index="mdx" class="wd-calendar-ym-month {{ year.months[mrdx * 4 + mdx].curr ? 'curr' : '' }}" bindtap="handleYearPanelDayClick" data-year="{{ year.year }}" data-month="{{ year.months[mrdx * 4 + mdx].month }}">
+                  <view class="wd-calendar-ym-month-contaner">
+                    <view class="wd-calendar-ym-m-r">
+                      <view class="wd-calendar-ym-m {{languagecode=='ZH'?'':'wd-calendar-ym-m-EN'}}">{{ year.months[mrdx * 4 + mdx].month }}</view>
+                    </view>
+                    <view wx:for="{{ year.months[mrdx * 4 + mdx].lunar }}" wx:for-item="l" wx:for-index="idx" class="wd-calendar-ym-l">
+                      <view class="wd-calendar-ym-l-i"><text data-order="{{ l.order }}">{{ l.day }}</text></view>
+                      <view class="wd-calendar-ym-l-i"><text>{{ l.lunar }}</text></view>
+                    </view>
+                  </view>
                 </view>
+              </view>
             </view>
-            <view class="wd-calendar-years-panel-body">
-                <swiper 
-                    circular
-                    duration="{{ 300 }}"
-                    current="{{ currYmTab }}" 
-                    class="wd-calendar-ym-swiper" 
-                    bindanimationfinish="handleYmSwiperAniEnd">
-                    <swiper-item
-                        wx:for="{{ yearMs }}" 
-                        wx:for-item="year" 
-                        wx:for-index="ydx"
-                        skip-hidden-item-layout
-                        class="wd-calendar-ym-swiper-item" >
-                        <view class="wd-calendar-ym-months">
-                            <view class="wd-calendar-ym-row" wx:for="{{ 3 }}" wx:for-item="mr" wx:for-index="mrdx" >
-                                <view 
-                                    wx:for="{{ 4 }}" 
-                                    wx:for-item="m" 
-                                    wx:for-index="mdx"
-                                    class="wd-calendar-ym-month {{ year.months[mrdx * 4 + mdx].curr ? 'curr' : '' }}"
-                                    bindtap="handleYearPanelDayClick"
-                                    data-year="{{ year.year }}"
-                                    data-month="{{ year.months[mrdx * 4 + mdx].month }}">
-                                    <view class="wd-calendar-ym-month-contaner">
-                                        <view class="wd-calendar-ym-m-r">
-                                            <view class="wd-calendar-ym-m {{languagecode=='ZH'?'':'wd-calendar-ym-m-EN'}}">{{ year.months[mrdx * 4 + mdx].month }}</view>
-                                        </view> 
-                                        <view wx:for="{{ year.months[mrdx * 4 + mdx].lunar }}" wx:for-item="l" wx:for-index="idx" class="wd-calendar-ym-l" >
-                                            <view class="wd-calendar-ym-l-i"><text data-order="{{ l.order }}">{{ l.day }}</text></view>
-                                            <view class="wd-calendar-ym-l-i"><text >{{ l.lunar }}</text></view>
-                                        </view>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </swiper-item>
-                </swiper>
-            </view>
-        </view>
+          </swiper-item>
+        </swiper>
+      </view>
     </view>
-    <view class="wd-calendar-content">
-        <slot></slot>
-    </view>
-</view>
-
+  </view>
+  <view class="wd-calendar-content">
+    <slot></slot>
+  </view>
+</view>

prsx/calendarN/index.js

@@ -0,0 +1,90 @@
+const _Http = getApp().globalData.http
+Component({
+  properties: {
+
+  },
+  data: {
+      tasks: [{
+              id: 1,
+              title: '参加扬州大学附属医院产品推介会',
+              date: '2025-12-15'
+          },
+          {
+              id: 2,
+              title: '跟台上海天伦医院手术3场',
+              date: '2025-12-15'
+          }
+      ],
+      records: [{
+              id: 1,
+              title: '参加扬州大学附属医院产品推介会',
+              date: '2025-12-15'
+          },
+          {
+              id: 2,
+              title: '跟台上海天伦医院手术3场',
+              date: '2025-12-15'
+          }
+      ],
+      nowDate:'',
+      markers:[],
+      markDates: ['2026-01-10', '2026-01-15']
+  },
+  methods: {
+      handleCalendarLoad(e) {
+          // 1. 拿到今日日期 把年月记录到data中
+          // 2. 获取当月数据给日期打标记
+          // 3. 获取当日数据
+          let page = this.selectComponent("#calendar")
+          console.log("加载", e)
+          let date = e.detail.date
+          let nowDate = this.formatDate(date.year,date.month,date.day)
+          this.setData({
+            nowDate
+          })
+          console.log(this.data.nowDate)
+      },
+      handleCalendarDateChange(e) {
+          console.log("切换日期", e)
+          let date = e.detail.date
+          _Http.basic({
+            "id": "2025122210193402",
+            content:{
+              "year": date.year,
+              "month": date.month,
+              "taskUserid": 2800,
+            }
+        }).then(res => {
+          console.log('获取日期',res.data)
+          let obj = res.data
+          let arry = []
+          for (let key in obj) {
+            if (obj.hasOwnProperty(key)) { 
+              console.log(key);
+              console.log(obj[key])
+              if ( (obj[key].follow && obj[key].follow.length > 0) ||  (obj[key].task && obj[key].task.length > 0)) {
+                arry.push({
+                  year:new Date(key).getFullYear(),
+                  month:String(new Date(key).getMonth() + 1).padStart(2, '0'),
+                  day:String(new Date(key).getDate()).padStart(2, '0'),
+                  type:'schedule',
+                  mark:'试一下',
+                  color:'#2a97ff',
+                  bgColor:'#cce6ff'
+                })
+              }
+            }
+          }
+          console.log(arry,'arry888')
+          this.setData({
+            markers:arry
+          })
+        })
+          // 1. 获取当日数据  
+          // 2. 判断选中日的年月是否与data中的相同；不相同获取当月数据打标记
+      },
+      formatDate(y,m,d){
+        return `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
+      }
+  }
+})

prsx/calendarN/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+      "calendar": "/components/wx-calendar/index"
+  }
+}

prsx/calendarN/index.scss

@@ -0,0 +1,33 @@
+.section {
+	margin: 20rpx;
+	background-color: white;
+	border-radius: 10rpx;
+	padding: 20rpx;
+	box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+
+	.section-title {
+		font-size: 32rpx;
+		color: #333;
+		margin-bottom: 10rpx;
+	}
+
+	.section-date {
+		font-size: 28rpx;
+		color: #999;
+		margin-bottom: 10rpx;
+	}
+}
+
+.task-item,
+.record-item {
+	margin-bottom: 15rpx;
+	padding: 15rpx;
+	border-left: 5rpx solid #ff3b30;
+	background-color: #fff8f8;
+	border-radius: 6rpx;
+}
+
+.record-item {
+	border-left-color: #007AFF;
+	background-color: #f0f8ff;
+}

prsx/calendarN/index.wxml

@@ -0,0 +1,23 @@
+<view class="">
+	<calendar id="calendar" _vibrate='{{false}}' view='month' user_show='{{true}}' bindload="handleCalendarLoad" binddatechange="handleCalendarDateChange"  _markers="{{markers}}">
+
+		<!-- 任务列表 -->
+		<view class="section">
+			<view class="section-title">任务</view>
+			<view class="section-date">{{ selectedDate }}</view>
+			<view wx:for="{{ tasks }}" wx:key="id" class="task-item">
+				<text class="task-text">{{ item.title }}</text>
+			</view>
+		</view>
+
+		<!-- 跟进记录 -->
+		<view class="section">
+			<view class="section-title">跟进记录</view>
+			<view class="section-date">{{ selectedDate }}</view>
+			<view wx:for="{{ records }}" wx:key="id" class="record-item">
+				<text class="record-text">{{ item.title }}</text>
+			</view>
+		</view>
+
+	</calendar>
+</view>

utils/work/apps.js

@@ -53,7 +53,7 @@ function getapps() {
 function getcrm() {
   const paths = [{
     name: "行事历",
-    path: "/prsx/calendar/index",
+    path: "/prsx/calendarN/index",
     icon: "work-shichanghuodong",
     objectname: ""
   }, {