feat: 创建笔记

app.json

@@ -18,4 +18,4 @@
     "allowsBounceVertical": "YES"
   },
   "pullRefresh": false
-}
+}
\ No newline at end of file

components/notes/notes.acss

@@ -3,4 +3,10 @@
   border-radius: 16rpx;
   padding: 16rpx;
   margin-top: 16rpx;
+}
+
+.notes-edit {
+  min-height: 400rpx;
+  padding: 32rpx;
+  margin-bottom: 16rpx;
 }
\ No newline at end of file

components/notes/notes.axml

-<view class="notes">
+<view a:if="{{isEdit}}">
+  <form onSubmit="complete">
+    <textarea class="notes-edit" name="textarea"  auto-height placeholder="输入笔记内容"></textarea>
+    <button form-type="submit" class="picker-complete">完成</button>
+  </form>
+</view>
+<view a:else class="notes">
    {{notes}}
 </view>
\ No newline at end of file

components/notes/notes.js

@@ -2,8 +2,16 @@ Component({
   mixins: [],
   data: {},
   props: {},
-  didMount() {},
-  didUpdate() {},
-  didUnmount() {},
-  methods: {},
+  didMount() { },
+  didUpdate() { },
+  didUnmount() { },
+  methods: {
+    complete: function (e) {
+      const value = e.detail.value.textarea;
+      if (!value) {
+        return dd.showToast({ content: '请输入笔记内容' })
+      }
+      this.props.onGetNotes(e.detail.value.textarea)
+    },
+  },
 });

components/popup/index.acss

@@ -86,6 +86,9 @@
   position: absolute;
   color: rgb(10, 10, 10);
   font-size: 32rpx;
+  line-height: 40rpx;
   right: 32rpx;
   top: 32rpx;
+  border: 0;
+  background-color: transparent!important;
 }
\ No newline at end of file

components/popup/index.js

@@ -7,7 +7,7 @@ Component({
     position: 'bottom',
     mask: true,
     animation: true,
-    zIndex: 1000
+    zIndex: 999
   },
   methods: {
     onMaskTap: function onMaskTap() {

pages/meetingDetail/meetingDetail.acss

@@ -486,9 +486,9 @@ input {
     font-size: 36rpx;
 }
 
-.footerBottom>view:last-child {
+/* .footerBottom>view:last-child {
     margin: 0 24rpx 0 0;
-}
+} */
 
 .devider {
     background: rgba(227, 228, 228, 1);

pages/meetingDetail/meetingDetail.axml

@@ -209,10 +209,10 @@
             文件
           </view>
         </view>
-        <text class="devider"></text>
-        <view onTap="onShareAppMessage">
-          <text class="iconfont iconicon_share1"></text>
+        <view onTap="openNoteModal">
+          <text class="iconfont iconicon_task1"></text>笔记
         </view>
+        <!--<text class="devider"></text><view onTap="onShareAppMessage"><text class="iconfont iconicon_share1"></text></view> -->
       </view>
       <view class="tabBarBottom" a:if="{{isIPX}}">
       </view>
@@ -258,19 +258,17 @@
       <popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
         <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}" isIPX="{{isIPX}}"></meeting-time-picker>
         <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
-        <list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList="{{comListData.aheadTimesListId}}" complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : comListData.aheadTimesList}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : comListData.aheadTimesListId}}" iconType="{{comListData.iconType}}"></list>
+        <list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList="{{comListData.aheadTimesListId}}" complete="{{comType=='aheadTime' ? true : false}}" a:if="{{comType=='repeat' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : comListData.aheadTimesList}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : comListData.aheadTimesListId}}" iconType="{{comListData.iconType}}"></list>
         <list a:if="{{comType == 'meetingWayModel'}}" dataComList="{{relatedAppPlatform.includes('zoom') ? comListData.meetingWayList: [comListData.meetingWayList[0]] }}" onComSelectList="selectComList" comSelectListId="{{comListData.meetingWayModelId}}" iconType="{{comListData.iconType}}"></list>
+        <notes a:if="{{comType == 'notesModal'}}" isEdit="{{true}}" onGetNotes="getNotes"/>
       </popup>
       <!-- 分享的弹窗 -->
-      <popup a:if="{{comShareData.isShow}}" show="{{comShareData.isShow}}" title="{{comShareData.shareTitle}}" mask="{{true}}" onClose="closeShare">
-        <sharelist dataComList="{{comShareData.shareDataList}}" onSelectComHList="closeShare"></sharelist>
-      </popup>
-      <popup a:if="{{show}}" show="{{show}}" onClose="closePop" title="{{pop.title}}">
-        <!-- 任务创建弹出框 -->
-        <task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/>
-        <!-- 任务修改弹出框 -->
-        <task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
-      </popup>
+      <!--<popup a:if="{{comShareData.isShow}}" show="{{comShareData.isShow}}" title="{{comShareData.shareTitle}}" mask="{{true}}" onClose="closeShare"><sharelist dataComList="{{comShareData.shareDataList}}" onSelectComHList="closeShare"></sharelist></popup> -->
+      <!--<popup show="{{show}}" onClose="closePop" title="{{pop.title}}">
+      <!-- 任务创建弹出框 -->
+      <!--<task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/> -->
+      <!-- 任务修改弹出框 -->
+      <!--<task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/></popup> -->
     </view>
   </view>
 </block>

pages/meetingDetail/meetingDetail.js

@@ -1900,6 +1900,22 @@ create.Page({
   },
   goCreateTask(e) {
     dd.navigateTo({ url: '/pages/createTask/createTask?meetingId=' + this.store.data.scheduleId })
+  },
+  openNoteModal() {
+    this.setData({
+      popupShow: true,
+      popupTitle: '创建会议笔记',
+      comType: 'notesModal'
+    })
+  },
+  getNotes(notes) {
+    updateMeetingTask({
+      platform: 'dingTalk',
+      meetingId: this.store.data.scheduleId,
+      notesModel: {
+        meetingNotes: notes
+      }
+    })
   }
 });
 

pages/meetingDetail/meetingDetail.json

@@ -3,6 +3,7 @@
     "usingComponents": {
         "popup": "../../components/popup/index",
         "task-list": "../../components/taskList/taskList",
+        "notes": "../../components/notes/notes",
         "file-list": "../../components/fileList/fileList",
         "task-panel": "../../components/taskPanel/taskPanel",
         "list": "../../components/list/list",