编辑暂存

api/request.js

@@ -186,9 +186,11 @@ export function uploadPermissions() {
   })
 }
 // 文件预览
-export function previewPermissions() {
+export function previewPermissions(fileIds) {
+  console.log(2222)
+  console.log(fileIds)
   return $http({
     method: 'get',
-    url: `/admin/ddOpenApi/getCustomSpaceAndGrantCustomSpace?type=download&ddUserId=${getApp().globalData.userid}`
+    url: `/admin/ddOpenApi/getCustomSpaceAndGrantCustomSpace?type=download&ddUserId=${getApp().globalData.userid}&fileIds=${fileIds}`
   })
 }
\ No newline at end of file

app.json

 {
   "pages": [
     "pages/index/index",
+    "pages/createOrEditSchedule/createOrEditSchedule",
     "pages/scheduleDetail/scheduleDetail",
     "pages/attendingSituation/attendingSituation",
-    "pages/createOrEditSchedule/createOrEditSchedule",
     "pages/place/place",
     "pages/participantsDetail/participantsDetail"
   ],

pages/createOrEditSchedule/createOrEditSchedule.acss

@@ -169,8 +169,7 @@ page {
     max-width: 400rpx;
 }
 
-.scrollPeople image,
-.name {
+.scrollPeople image, .name {
     text-align: center;
     line-height: 58rpx;
     font-size: 28rpx;
@@ -210,9 +209,11 @@ page {
     opacity: 1;
     color: rgba(25, 31, 37, 0.40);
 }
+
 .imageGroup {
     position: relative;
 }
+
 .conflictTip {
     font-size: 24rpx;
     text-align: center;
@@ -249,19 +250,47 @@ page {
 .conflict {
     color: #E60012;
 }
+
 .addParticipants {
     width: 100%;
     display: inline-block;
     height: 100%;
 }
+
 .selectPlace {
     display: flex;
     justify-content: space-between;
 }
+
 .iconshanchu {
     color: rgba(25, 31, 37, 0.28);
-
 }
+
 .conflict {
     margin-right: 10rpx;
 }
+
+.editList {
+    padding: 24rpx 16rpx;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.13);
+    background: #fff;
+    display: flex;
+    width: 670rpx;
+    border-radius: 6rpx;
+    margin: 24rpx 0 0 24rpx;
+    justify-content: space-between;
+}
+
+.listIcon {
+    line-height: 30rpx;
+    text-align: center;
+    font-size: 38rpx;
+    margin-bottom: 9rpx;
+    vertical-align: top;
+}
+
+.listText {
+    text-align: center;
+    font-size: 20rpx;
+    line-height: 26rpx;
+}
\ No newline at end of file

pages/createOrEditSchedule/createOrEditSchedule.axml

@@ -93,6 +93,19 @@
     <text class="close iconshanchu iconfont"></text>
   </view>
 </view>
+<!-- 编辑列表 -->
+<view class="editList" a:if="{{!!type}}">
+  <view class="listGroup" a:for="{{editList}}">
+    <view class="listIcon iconfont {{item.icon}}">
+      
+    </view>
+    <view class="listText">
+      {{item.text}}
+    </view>
+   
+  </view>
+  
+</view>
 <!-- 保存 -->
 <view class="save">
   <view onTap="saveCreate">

pages/createOrEditSchedule/createOrEditSchedule.js

 import create from 'dd-store'
 import exampleStore from '/stores/exampleStore'
-import { addSchedule, getUserScheduleInTime, getHomeUserSchedule } from '../../api/request.js'
+import { addSchedule, getUserScheduleInTime, getHomeUserSchedule, getScheduleDetail } from '../../api/request.js'
 import { stringify } from 'querystring';
 create.Page({
   store: exampleStore,
@@ -14,8 +14,9 @@ create.Page({
     time2: '',
     week2: '',
     propsTime: '',
+    id: '' // 日程ID 从详情页面传过来
   },
-  onLoad() {
+  onLoad(event) {
     this.store.data.conflictPeople = []
     this.store.data.participatorList = []
     this.store.data.locationName = ''
@@ -37,7 +38,9 @@ create.Page({
       time2: `${y}/${m}/${d} ${min < 30 ? h < 10 ? "0" + date.getHours() : date.getHours() : (h + 1) < 10 ? "0" + (date.getHours() + 1) : date.getHours() + 1}:${min < 30 ? '30' : '00'}`,
       week1: w,
       week2: w,
+      type: event.type
     })
+
   },
   onShow() {
     const _that = this
@@ -218,5 +221,10 @@ create.Page({
       }
       this.update()
     })
+  },
+  // 编辑时获取详情页内容
+  getScheduleInfo() {
+    
+
   }
 });

pages/scheduleDetail/scheduleDetail.axml

@@ -35,7 +35,7 @@
   <view class="participants">
     <view class="icon iconcanhuiren1 iconfont">
     </view>
-    <view class="scroll" v-if="{{!!userList.length}}" onTap="nextPage">
+    <view class="scroll" v-if="{{!!userList.length}}" onTap="nextPage" data-nextPage="participants">
       <text class="imageGroup" a:for="{{userList}}" a:for-item="item">
         <text>
           <image a:if="{{!!item.participator.headUrl}}" mode="scaleToFill" src="{{item.participator.headUrl}}"/>
@@ -82,19 +82,19 @@
     李文 修改了会议 2月12日 12:10
   </view>
   <view class="bottom">
-    <view class="buttonGroup">
+    <view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
       <text class="icondidianmiaoshu iconfont"></text>
       <text>编辑</text>
     </view>
-    <view class="buttonGroup">
+    <view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
       <text class="icondidianmiaoshu iconfont"></text>
-      <text>删除</text>
+      <text>编辑</text>
     </view>
-    <view class="buttonGroup">
+    <view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
       <text class="icondidianmiaoshu iconfont"></text>
       <text>编辑</text>
     </view>
-    <view class="buttonGroup">
+    <view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
       <text class="icondidianmiaoshu iconfont"></text>
       <text>编辑</text>
     </view>

pages/scheduleDetail/scheduleDetail.js

@@ -10,16 +10,17 @@ Page({
     userList: [],
     isAcrossDay: true,
     uploadSpaceId: '',
-    previewSpaceId: ''
+    previewSpaceId: '',
+    id: ''
 
   },
   onLoad(event) {
     dd.setNavigationBar({
       title: '会议详情'
     })
-    // let data = {
-    //   id: 1197
-    // }
+    this.setData({
+      id: event.id
+    })
     let data = {
       id: event.id
     }
@@ -40,12 +41,6 @@ Page({
       this.setData({
         uploadSpaceId: res.data.data
       })
-      return previewPermissions()
-    }).then(res => {
-      this.setData({
-        previewSpaceId: res.data.data
-      })
-
     })
   },
   // 是否跨天
@@ -84,8 +79,12 @@ Page({
       file: { spaceId: this.data.uploadSpaceId, max: 1 },
       types: ["photo", "camera", "space"],//PC端仅支持["photo","file","space"]
       success: (res) => {
-        console.log(JSON.stringify(res.data), 111111)
+        previewPermissions(res.data[0].fileId).then(success => {
+          _that.setData({
+            previewSpaceId: success.data.data
+          })
           _that.preview(res.data[0].fileId, res.data[0].fileSize, res.data[0].fileType, res.data[0].fileName)
+        })
       },
       fail: (err) => {
         dd.alert({
@@ -94,10 +93,22 @@ Page({
       }
     })
   },
-  nextPage() {
+  nextPage(event) {
+    switch (event.target.dataset.nextPage) {
+      case 'participants':
         dd.navigateTo({ url: `./../attendingSituation/attendingSituation?userList=${JSON.stringify(this.data.userList)}` })
+        break;
+      case 'edit':
+        dd.navigateTo({ url: `./../createOrEditSchedule/createOrEditSchedule?id='${this.data.id}'` })
+        break;
+    }
   },
   preview(fileId, fileSize, fileType, fileName) {
+    console.log(2222)
+    console.log(fileId)
+    console.log(fileSize)
+    console.log(fileType)
+    console.log(fileName)
     dd.previewFileInDingTalk({
       corpId: dd.corpId,
       spaceId: this.data.previewSpaceId,

stores/exampleStore.js

@@ -4,7 +4,8 @@ class Store {
         locationName: '',
         conflictPeople: [],
         participatorUserId: [], // 参会人的userId
-        userList: [] 
+        userList: [],
+        editList: [{ icon: 'icondingwei', text: '地点' }, { icon: 'iconhuiqiantixing', text: '提醒' }, { icon: 'iconchongfu', text: '重复' }, { icon: 'icondidianmiaoshu', text: '描述' }, { icon: 'iconshanchu', text: '删除' }]
     }
 
 }