提交icon

bf4cf6cc · liang ce · 902191c9 · bf4cf6cc · bf4cf6cc · bf4cf6cc
Commit bf4cf6cc authored Mar 27, 2020 by liang ce
43 changed files
--- a/PageComponents/myDynamic/myDynamic.acss
+++ b/PageComponents/myDynamic/myDynamic.acss
@@ -108,6 +108,8 @@
    background: #FFFFFF;
    border-radius: 50%;
    margin-left: 24rpx;
+    text-align: center;
+    line-height: 84rpx;
 }
 .dynamicContent{
    display: flex;
@@ -117,4 +119,11 @@
 .isMove{
    transform: translateX(-156rpx);
    transition: all 150ms linear 0s;
+}
+.placedTop .iconicon_top1{
+    font-size: 48rpx;
+    color: rgb(234, 12, 40);
+}
+.placedTop .isTopIcon{
+    color: rgba(10,10,10,0.72);
 }
\ No newline at end of file
--- a/PageComponents/myDynamic/myDynamic.axml
+++ b/PageComponents/myDynamic/myDynamic.axml
-<scroll-view scroll-y="{{true}}" class="dynamicBox">
+<scroll-view scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower">
  <view class="dynamicList">
    <view a:for="{{dynamicList}}" data-id="{{item.scheduleId}}" class="dynamicContent {{isTouchMove && touchMoveId === item.scheduleId ? 'isMove' : ''}}" onTouchStart="touchstart" onTouchMove="touchmove">
      <view class="dynamicDetails">
@@ -7,7 +7,7 @@
            {{item.title}}
          </view>
          <view>
-            {{traceTime === '1970-01-01 00:00:00' ? 'Y':'N'}}
+            <text a:if="{{item.traceTime !== '1970-03-01 00:00:00'}}" class="iconfont iconicon_top1"></text>
          </view>
        </view>
        <block a:for="{{item.meetingLogResourceList}}" a:for-item="dynamicItem">
@@ -17,11 +17,11 @@
              <text>{{createTime}}</text>
            </view>
            <block a:for="{{dynamicItem.meetingLogResourceList}}" a:for-item="resourceList">
-              <view class="dynamicFile" a:if="{{dynamicItem.logType === 'accessory'}}">
+              <view class="dynamicFile" a:if="{{dynamicItem.logType === 'accessory'}}" a:for="{{resourceList.fileInfos}}" a:for-item="fileList" data-file="{{fileList}}" onTap="previewFileInDingTalk">
                <view class="fileIcon">
                  123
                </view>
-                <view class="fileMsg" a:for="{{resourceList.fileInfos}}" a:for-item="fileList">
+                <view class="fileMsg">
                  <view class="fileName">
                    {{fileList.fileName}}
                  </view>
@@ -45,9 +45,10 @@
          </view>
        </block>
      </view>
-      <view class="placedTop" onTap="changeCollection" data-scheduleid="{{item.scheduleId}}" data-collection="{{traceTime === '1970-01-01 00:00:00' ? 'Y':'N'}}">
+      <view class="placedTop" onTap="changeCollection" data-scheduleid="{{item.scheduleId}}" data-index="{{index}}" data-collection="{{item.traceTime === '1970-03-01 00:00:00' ? 'Y':'N'}}">
      <!-- 可能会改 -->
-        {{traceTime === '1970-01-01 00:00:00' ? 'Y':'N'}}
+        <text class="iconfont iconicon_top1 {{item.traceTime === '1970-03-01 00:00:00' ? '': 'isTopIcon'}}"></text>
+        <!-- {{item.traceTime === '1970-03-01 00:00:00' ? 'Y':'N'}} -->
      </view>
    </view>
  </view>

--- a/PageComponents/myDynamic/myDynamic.js
+++ b/PageComponents/myDynamic/myDynamic.js
@@ -11,52 +11,69 @@ Component({
    dynamicList: [],
    current: 1,
    size: 10,
+    noData: false
  },
  props: {},
  didMount() {
-    let data = {
+    this.getPages(1)
-      current: this.data.current,
+  },
-      size: this.data.size
+  didUpdate() {},
-    }
+  didUnmount() {},
-    getDynamicList(data).then(res => {
+  methods: {
-      // 第一层日程数据处理
+    getPages(current) {
-      let dynamicList = res.data.data.records.map((item,index) => {
+      let that = this
-        // 第二层日程下的动态数据处理
+      let data = {
-        let meetingLogResourceList = item.meetingLogDataList.map((item2,index2) => {
+        current: current,
-          if (item2.category === '2') {
+        size: 10
-            // 第三层处理动态下的文件或者任务数据
+      }
-            let meetingLogResourceList = item2.meetingLogResourceList.map((item3,index3) => {
+      getDynamicList(data).then(res => {
+        // 第一层日程数据处理
+        let dynamicList = res.data.data.records.map((item,index) => {
+          // 第二层日程下的动态数据处理
+          let meetingLogResourceList = item.meetingLogDataList.map((item2,index2) => {
+            if (item2.category === '2') {
+              // 第三层处理动态下的文件或者任务数据
+              let meetingLogResourceList = item2.meetingLogResourceList.map((item3,index3) => {
+                return {
+                  ...item3,
+                  fileInfos: item3.fileInfos ? JSON.parse(item3.fileInfos) : ''
+                }
+              })
              return {
-                ...item3,
+                logType: item2.logType,
-                fileInfos: item3.fileInfos ? JSON.parse(item3.fileInfos) : ''
+                createTime: dealFileTime(item2.createTime),
+                creatorInfo: JSON.parse(item2.creatorInfo),
+                meetingLogResourceList: meetingLogResourceList
              }
-            })
+            } else {
-            return {
+              return null
-              logType: item2.logType,
-              createTime: dealFileTime(item2.createTime),
-              creatorInfo: JSON.parse(item2.creatorInfo),
-              meetingLogResourceList: meetingLogResourceList
            }
-          } else {
+          })
-            return null
+          return {
+            scheduleId: item.scheduleId,
+            title: item.title,
+            traceTime: item.traceTime,
+            meetingLogResourceList: meetingLogResourceList
          }
        })
-        return {
+        if (current === 1) {
-          scheduleId: item.scheduleId,
+          that.setData({
-          title: item.title,
+            dynamicList: dynamicList,
-          meetingLogResourceList: meetingLogResourceList
+            current: current,
+            noData: dynamicList.length === that.data.size ? true : false
+          })
+        } else {
+          let dynamicListData = [...that.data.dynamicList]
+          dynamicListData.push.apply(dynamicListData, dynamicList)
+          that.setData({
+            dynamicList: dynamicListData,
+            current: current,
+            noData: dynamicList.length === that.data.size ? true : false
+          })
        }
      })
-      console.log(dynamicList)
+    },
-      this.setData({
+    touchstart(e){
-        dynamicList: dynamicList
-      })
-    })
-  },
-  didUpdate() {},
-  didUnmount() {},
-  methods: {
-     touchstart(e){
      this.setData({
        startX: e.changedTouches[0].clientX,
        startY: e.changedTouches[0].clientY,
@@ -92,14 +109,47 @@ Component({
      return 360 * Math.atan(_Y / _X) / (2 * Math.PI);
    },
    changeCollection(e) {
-      console.log(e)
+      let that = this
+      let index = e.target.dataset.index
      let data = {
        scheduleId: e.target.dataset.scheduleid,
-        collection: e.target.dataset.collection === 'N' ? 'Y' : 'N'
+        collection: e.target.dataset.collection
      }
      meetingCollection(data).then(res => {
        console.log(res)
+        if (e.target.dataset.collection === 'N') {
+          that.setData({
+            current: 1
+          }, () => {
+            that.getPages(1)
+          })
+        } else {
+          let dynamicList = [...this.data.dynamicList]
+          let ReplaceItem = dynamicList[index]
+          ReplaceItem.traceTime = res.data.data
+          dynamicList.splice(index, 1)
+          dynamicList.unshift(ReplaceItem)
+          that.setData({
+            dynamicList: dynamicList
+          })
+        }
      })
+    },
+    previewFileInDingTalk(e) {
+      let fileMsg = e.currentTarget.dataset.file
+      dd.previewFileInDingTalk({
+        corpId: dd.corpId,
+        spaceId: fileMsg.spaceId,
+        fileId: fileMsg.fileId,
+        fileName: fileMsg.fileName,
+        fileSize: fileMsg.fileSize,
+        fileType: fileMsg.fileType,
+      })
+    },
+    onScrollToLower() {
+      if (!this.data.noData) {
+        this.getPages(this.data.current + 1)
+      }
    }
  },
 });
--- a/PageComponents/scheduleList/scheduleList.acss
+++ b/PageComponents/scheduleList/scheduleList.acss
@@ -2,9 +2,9 @@
    background: #FFFFFF;
 }
 .scheduleHeader{
-    /* position: fixed;
+    position: fixed;
    top: 0;
-    left: 0; */
+    left: 0;
    width: 100%;
    height: 88rpx;
    background: #FFFFFF;
@@ -12,6 +12,8 @@
    padding: 0 32rpx;
    display: flex;
    justify-content: space-between;
+    box-shadow: 0 1rpx 8rpx 0 rgba(0,0,0,0.04);
+    z-index: 9;
 }
 .scheduleHeader view:nth-of-type(1){
    flex: 1;
@@ -22,17 +24,21 @@
 }
 .sidebar{
    position: fixed;
-    left: 0;
+    left: -750rpx;
    top: 0;
-    width: 100%;
+    width: 750rpx;
    height: 100%;
-    background: rgba(0, 0, 0, 0.19);
+    /* background: rgba(0, 0, 0, 0.19); */
    z-index: 99;
 }
-/* .siderbarShow {
+.siderbarShow {
    transform:  translateX(750rpx);
-    transition: all 200ms linear 0s;
+    transition: all 400ms linear 0s;
-} */
+}
+.siderbarHidden {
+    transform:  translateX(-750rpx);
+    transition: all 400ms linear 0s;
+}
 .sidebarContent{
    background: #FFFFFF;
    width: 640rpx;
@@ -155,10 +161,10 @@
    width: 604rpx;
    border-radius: 8rpx;
    font-size: 26rpx;
-    color: #0080FF;
+    color: rgba(10, 10, 10, 0.72);
    height: 90rpx;
    overflow: hidden;
-    background: #CFECFF;
+    background: rgba(10, 10, 10, 0.05);
    margin-bottom: 16rpx;
 }
 .NoSchedule{
@@ -181,8 +187,8 @@
    position: relative;
 }
 .dataSchedule .overdue {
-    background: #F6F6F6;
+    background: rgba(10, 10, 10, .034);
-    color: rgba(25, 31, 37, 0.56);
+    color: rgba(10, 10, 10, .353);
 }
 .thisDay > view{
    color: rgb(50, 150, 250);
@@ -237,6 +243,7 @@
 .dataScheduleName {
    margin-top: 16rpx;
    margin-bottom: 8rpx;
+    font-family: PingFangSC-Medium;
 }
 .dataSchedule>view:last-child {

--- a/PageComponents/scheduleList/scheduleList.axml
+++ b/PageComponents/scheduleList/scheduleList.axml
@@ -91,8 +91,8 @@
                </block>
            </block>
        </scroll-view>
-        <view class="createSchedule iconfont iconjiahao " onTap="nextPage">
+        <!-- <view class="createSchedule iconfont iconjiahao " onTap="nextPage">
-        </view>
+        </view> -->
    </view>
    <view class="startPage" a:else>
        <image mode="scaleToFill" src="../../assests/startPage.png"/>
@@ -102,7 +102,7 @@
        </view>
    </view>
 </view>
-<view a:if="{{isShowSidebar}}" class="sidebar" catchTap="changesidebar">
+<view class="sidebar {{isShowSidebar === '' ? '' : isShowSidebar === false ? 'siderbarHidden' : 'siderbarShow'}}" catchTap="changesidebar">
  <view class="sidebarContent" catchTap="preventSort">
    <view class="sidebarLogo">
      <view>

--- a/PageComponents/scheduleList/scheduleList.js
+++ b/PageComponents/scheduleList/scheduleList.js
@@ -4,7 +4,7 @@ import { getFormatDate } from '../../utils/utils'
 Component({
  mixins: [],
  data: {
-    isShowSidebar: false,
+    isShowSidebar: '',
    response: [],
    scheduleList: [],
    startPageOnShow: false,
@@ -55,8 +55,9 @@ Component({
  didUnmount() {},
  methods: {
    changesidebar() {
+      let isShowSidebar = this.data.isShowSidebar === '' || this.data.isShowSidebar === false ? true : false
      this.setData({
-        isShowSidebar: !this.data.isShowSidebar
+        isShowSidebar: isShowSidebar
      })
    },
    preventSort() {

--- a/app.acss
+++ b/app.acss
-@import "./font/iconfont.acss";
+@import "./assests/font/iconfont.acss";
 page {
    font-family: PingFangSC-Regular;
    background: #F6F6F6;

--- a/app.js
+++ b/app.js
@@ -14,8 +14,8 @@ App({
    avatar: '',
    userid: '',
    name: '',
-    globalUrl:'https://gateway2.mingwork.com', // 线上地址
+    // globalUrl:'https://gateway2.mingwork.com', // 线上地址
-    // globalUrl:'https://gateway-beta.mingwork.com' //beta地址
+    globalUrl:'https://gateway-beta.mingwork.com' //beta地址
    // globalUrl:'http://139.196.213.18:9999' //beta地址
    // globalUrl:'http://192.168.1.101:9999', //beta地址
    // globalUrl:'http://192.168.1.102:9999' //beta地址

--- a/assests/font/iconfont.acss
+++ b/assests/font/iconfont.acss
--- a/assests/font/iconfont.eot
+++ b/assests/font/iconfont.eot
--- a/assests/font/iconfont.js
+++ b/assests/font/iconfont.js
--- a/assests/font/iconfont.json
+++ b/assests/font/iconfont.json
-{
-  "id": "1687706",
-  "name": "明我智会",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "13516302",
-      "name": "icon_ dynamic2",
-      "font_class": "icon_dynamic",
-      "unicode": "e6dd",
-      "unicode_decimal": 59101
-    },
-    {
-      "icon_id": "13515910",
-      "name": "icon_ dynamic",
-      "font_class": "icon_dynamic1",
-      "unicode": "e6dc",
-      "unicode_decimal": 59100
-    },
-    {
-      "icon_id": "13515824",
-      "name": "icon_top2",
-      "font_class": "icon_top1",
-      "unicode": "e6da",
-      "unicode_decimal": 59098
-    },
-    {
-      "icon_id": "13515823",
-      "name": "icon_top",
-      "font_class": "icon_top",
-      "unicode": "e6d9",
-      "unicode_decimal": 59097
-    },
-    {
-      "icon_id": "13515714",
-      "name": "icon_facility",
-      "font_class": "icon_facility",
-      "unicode": "e6d8",
-      "unicode_decimal": 59096
-    },
-    {
-      "icon_id": "13515668",
-      "name": "icon_room",
-      "font_class": "icon_room",
-      "unicode": "e6d7",
-      "unicode_decimal": 59095
-    },
-    {
-      "icon_id": "13515613",
-      "name": "icon_copy",
-      "font_class": "icon_copy",
-      "unicode": "e6d6",
-      "unicode_decimal": 59094
-    },
-    {
-      "icon_id": "13515532",
-      "name": "icon_description",
-      "font_class": "icon_description",
-      "unicode": "e6d5",
-      "unicode_decimal": 59093
-    },
-    {
-      "icon_id": "13515328",
-      "name": "icon_ task",
-      "font_class": "icon_task",
-      "unicode": "e6d4",
-      "unicode_decimal": 59092
-    },
-    {
-      "icon_id": "13515145",
-      "name": "icon_ delete",
-      "font_class": "icon_delete",
-      "unicode": "e6d3",
-      "unicode_decimal": 59091
-    },
-    {
-      "icon_id": "13515021",
-      "name": "icon_app",
-      "font_class": "icon_app",
-      "unicode": "e6d2",
-      "unicode_decimal": 59090
-    },
-    {
-      "icon_id": "13448737",
-      "name": "icon_meet",
-      "font_class": "icon_meet1",
-      "unicode": "e6d0",
-      "unicode_decimal": 59088
-    },
-    {
-      "icon_id": "13448201",
-      "name": "icon_ calendar",
-      "font_class": "icon_calendar",
-      "unicode": "e6cd",
-      "unicode_decimal": 59085
-    },
-    {
-      "icon_id": "13445797",
-      "name": "icon_time",
-      "font_class": "icon_time",
-      "unicode": "e6c4",
-      "unicode_decimal": 59076
-    },
-    {
-      "icon_id": "13445794",
-      "name": "icon_share",
-      "font_class": "icon_share",
-      "unicode": "e6c3",
-      "unicode_decimal": 59075
-    },
-    {
-      "icon_id": "13445791",
-      "name": "icon_phone",
-      "font_class": "icon_phone",
-      "unicode": "e6c2",
-      "unicode_decimal": 59074
-    },
-    {
-      "icon_id": "13445784",
-      "name": "icon_no Agreed2",
-      "font_class": "icon_noAgreed1",
-      "unicode": "e6bf",
-      "unicode_decimal": 59071
-    },
-    {
-      "icon_id": "13445779",
-      "name": "icon_no Agreed",
-      "font_class": "icon_noAgreed",
-      "unicode": "e6be",
-      "unicode_decimal": 59070
-    },
-    {
-      "icon_id": "13445766",
-      "name": "icon_location",
-      "font_class": "icon_location",
-      "unicode": "e6bd",
-      "unicode_decimal": 59069
-    },
-    {
-      "icon_id": "13445762",
-      "name": "icon_cycle",
-      "font_class": "icon_cycle",
-      "unicode": "e6bc",
-      "unicode_decimal": 59068
-    },
-    {
-      "icon_id": "13445761",
-      "name": "icon_city",
-      "font_class": "icon_city",
-      "unicode": "e6bb",
-      "unicode_decimal": 59067
-    },
-    {
-      "icon_id": "13445747",
-      "name": "icon_camera",
-      "font_class": "icon_camera",
-      "unicode": "e6b9",
-      "unicode_decimal": 59065
-    },
-    {
-      "icon_id": "13445744",
-      "name": "icon_bell",
-      "font_class": "icon_bell",
-      "unicode": "e6b8",
-      "unicode_decimal": 59064
-    },
-    {
-      "icon_id": "13445740",
-      "name": "icon_attender",
-      "font_class": "icon_attender1",
-      "unicode": "e6b7",
-      "unicode_decimal": 59063
-    },
-    {
-      "icon_id": "13445725",
-      "name": "icon_annex",
-      "font_class": "icon_annex1",
-      "unicode": "e6b5",
-      "unicode_decimal": 59061
-    },
-    {
-      "icon_id": "13445722",
-      "name": "icon_Agreed2",
-      "font_class": "icon_Agreed1",
-      "unicode": "e6b4",
-      "unicode_decimal": 59060
-    },
-    {
-      "icon_id": "13445719",
-      "name": "icon_Agreed",
-      "font_class": "icon_Agreed",
-      "unicode": "e6b3",
-      "unicode_decimal": 59059
-    },
-    {
-      "icon_id": "13444734",
-      "name": "icon_ floor",
-      "font_class": "icon_floor",
-      "unicode": "e6b2",
-      "unicode_decimal": 59058
-    },
-    {
-      "icon_id": "13444660",
-      "name": "icon_ building",
-      "font_class": "icon_building",
-      "unicode": "e6b1",
-      "unicode_decimal": 59057
-    }
-  ]
-}
--- a/assests/font/iconfont.svg
+++ b/assests/font/iconfont.svg
--- a/assests/font/iconfont.ttf
+++ b/assests/font/iconfont.ttf
--- a/assests/font/iconfont.woff
+++ b/assests/font/iconfont.woff
--- a/assests/font/iconfont.woff2
+++ b/assests/font/iconfont.woff2
--- a/assests/tabBarBg.png
+++ b/assests/tabBarBg.png
--- a/components/selectArea/selectArea.acss
+++ b/components/selectArea/selectArea.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 /* 区域选择样式 */
 .lableTreeBox{
  position: fixed;

--- a/components/toast/toast.acss
+++ b/components/toast/toast.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 .toast {
    width: 188rpx;
    height: 60rpx;

--- a/demo/index/index.acss
+++ b/demo/index/index.acss
 .tabBar{
-    height: 96rpx;
+    height: 120rpx;
    width: 100%;
-    background: #FFFFFF;
+    background: url('../../assests/tabBarBg.png');
+    background-size: cover;
    display: flex;
    position: fixed;
    left: 0;
    bottom: 0;
+    padding-top: 4rpx;
+    /* box-shadow: 0 -4rpx 8rpx 0 rgba(0,0,0,0.04);
+    border-radius: 0 64rpx 0 64rpx 0 0 0; */
 }
 .tabBar>view{
    flex: 1;
    font-size: 28rpx;
-    line-height: 96rpx;
-    text-align: center;
 }
 .tabBar>view:nth-of-type(1){
    text-align: left;
-    padding-left: 147rpx;
 }
 .tabBar>view:nth-of-type(2){
    text-align: right;
-    padding-right: 147rpx;
 }
+.createMeeting{
+    position: absolute;
+    left: 50%;
+    top: 4rpx;
+    font-size: 32rpx;
+    border-radius: 50%;
+    height: 84rpx;
+    width: 84rpx;
+    background: #EA0C28;
+    box-shadow: 0 4px 7px 0 rgba(234,12,40,0.30);
+    margin-left: -42rpx;
+    color: #FFFFFF;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.createMeeting .iconfont{
+    font-size: 34rpx;
+    display: block
+}
+.tabBarView{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    height: 116rpx;
+}
+.tabBarView text{
+    display: block;
+    color: rgba(10,10,10,.4)
+}
+.tabBarView text:nth-of-type(1){
+    width: 42rpx;
+    height: 42rpx;
+    font-size: 42rpx;
+    margin-bottom: 11rpx;
+}
+.tabBarView text:nth-of-type(2){
+    height: 10rpx;
+    font-size: 20rpx;
+}
+.ischooseTabBar text{
+    color: rgba(10,10,10,1) !important;
+}
\ No newline at end of file
--- a/demo/index/index.axml
+++ b/demo/index/index.axml
-<view hidden="{{tabBarIndex !== '0'}}">
+<view a:if="{{tabBarIndex === '0'}}">
  <my-dynamic>
  </my-dynamic>
 </view>
-<view hidden="{{tabBarIndex !== '1'}}">
+<view a:if="{{tabBarIndex === '1'}}">
  <my-schedule>
  </my-schedule>
 </view>
 <view class="tabBar">
  <view onTap="changeTabBar" data-tabbar='0'>
-      动态
+    <view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
+      <text class="iconfont iconicon_dynamic"></text>
+      <text>动态</text>
+    </view>
  </view>
  <view onTap="changeTabBar" data-tabbar='1'>
-      日程
+    <view class="tabBarView {{tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
+      <text class="iconfont iconicon_Calendarbox1"></text>
+      <text>日程</text>
+    </view>
+  </view>
+  <view class="createMeeting">
+    <text class="iconfont iconicon_add1"></text>
  </view>
 </view>
\ No newline at end of file
--- a/font/demo.css
+++ b/font/demo.css
-/* Logo 字体 */
-@font-face {
-  font-family: "iconfont logo";
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
-}
-.logo {
-  font-family: "iconfont logo";
-  font-size: 160px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-/* tabs */
-.nav-tabs {
-  position: relative;
-}
-.nav-tabs .nav-more {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  height: 42px;
-  line-height: 42px;
-  color: #666;
-}
-#tabs {
-  border-bottom: 1px solid #eee;
-}
-#tabs li {
-  cursor: pointer;
-  width: 100px;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  font-size: 16px;
-  border-bottom: 2px solid transparent;
-  position: relative;
-  z-index: 1;
-  margin-bottom: -1px;
-  color: #666;
-}
-#tabs .active {
-  border-bottom-color: #f00;
-  color: #222;
-}
-.tab-container .content {
-  display: none;
-}
-/* 页面布局 */
-.main {
-  padding: 30px 100px;
-  width: 960px;
-  margin: 0 auto;
-}
-.main .logo {
-  color: #333;
-  text-align: left;
-  margin-bottom: 30px;
-  line-height: 1;
-  height: 110px;
-  margin-top: -50px;
-  overflow: hidden;
-  *zoom: 1;
-}
-.main .logo a {
-  font-size: 160px;
-  color: #333;
-}
-.helps {
-  margin-top: 40px;
-}
-.helps pre {
-  padding: 20px;
-  margin: 10px 0;
-  border: solid 1px #e7e1cd;
-  background-color: #fffdef;
-  overflow: auto;
-}
-.icon_lists {
-  width: 100% !important;
-  overflow: hidden;
-  *zoom: 1;
-}
-.icon_lists li {
-  width: 100px;
-  margin-bottom: 10px;
-  margin-right: 20px;
-  text-align: center;
-  list-style: none !important;
-  cursor: default;
-}
-.icon_lists li .code-name {
-  line-height: 1.2;
-}
-.icon_lists .icon {
-  display: block;
-  height: 100px;
-  line-height: 100px;
-  font-size: 42px;
-  margin: 10px auto;
-  color: #333;
-  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
-  -moz-transition: font-size 0.25s linear, width 0.25s linear;
-  transition: font-size 0.25s linear, width 0.25s linear;
-}
-.icon_lists .icon:hover {
-  font-size: 100px;
-}
-.icon_lists .svg-icon {
-  /* 通过设置 font-size 来改变图标大小 */
-  width: 1em;
-  /* 图标和文字相邻时，垂直对齐 */
-  vertical-align: -0.15em;
-  /* 通过设置 color 来改变 SVG 的颜色/fill */
-  fill: currentColor;
-  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
-      normalize.css 中也包含这行 */
-  overflow: hidden;
-}
-.icon_lists li .name,
-.icon_lists li .code-name {
-  color: #666;
-}
-/* markdown 样式 */
-.markdown {
-  color: #666;
-  font-size: 14px;
-  line-height: 1.8;
-}
-.highlight {
-  line-height: 1.5;
-}
-.markdown img {
-  vertical-align: middle;
-  max-width: 100%;
-}
-.markdown h1 {
-  color: #404040;
-  font-weight: 500;
-  line-height: 40px;
-  margin-bottom: 24px;
-}
-.markdown h2,
-.markdown h3,
-.markdown h4,
-.markdown h5,
-.markdown h6 {
-  color: #404040;
-  margin: 1.6em 0 0.6em 0;
-  font-weight: 500;
-  clear: both;
-}
-.markdown h1 {
-  font-size: 28px;
-}
-.markdown h2 {
-  font-size: 22px;
-}
-.markdown h3 {
-  font-size: 16px;
-}
-.markdown h4 {
-  font-size: 14px;
-}
-.markdown h5 {
-  font-size: 12px;
-}
-.markdown h6 {
-  font-size: 12px;
-}
-.markdown hr {
-  height: 1px;
-  border: 0;
-  background: #e9e9e9;
-  margin: 16px 0;
-  clear: both;
-}
-.markdown p {
-  margin: 1em 0;
-}
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
-  width: 80%;
-}
-.markdown ul>li {
-  list-style: circle;
-}
-.markdown>ul li,
-.markdown blockquote ul>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-.markdown>ul li p,
-.markdown>ol li p {
-  margin: 0.6em 0;
-}
-.markdown ol>li {
-  list-style: decimal;
-}
-.markdown>ol li,
-.markdown blockquote ol>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-.markdown code {
-  margin: 0 3px;
-  padding: 0 5px;
-  background: #eee;
-  border-radius: 3px;
-}
-.markdown strong,
-.markdown b {
-  font-weight: 600;
-}
-.markdown>table {
-  border-collapse: collapse;
-  border-spacing: 0px;
-  empty-cells: show;
-  border: 1px solid #e9e9e9;
-  width: 95%;
-  margin-bottom: 24px;
-}
-.markdown>table th {
-  white-space: nowrap;
-  color: #333;
-  font-weight: 600;
-}
-.markdown>table th,
-.markdown>table td {
-  border: 1px solid #e9e9e9;
-  padding: 8px 16px;
-  text-align: left;
-}
-.markdown>table th {
-  background: #F7F7F7;
-}
-.markdown blockquote {
-  font-size: 90%;
-  color: #999;
-  border-left: 4px solid #e9e9e9;
-  padding-left: 0.8em;
-  margin: 1em 0;
-}
-.markdown blockquote p {
-  margin: 0;
-}
-.markdown .anchor {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  margin-left: 8px;
-}
-.markdown .waiting {
-  color: #ccc;
-}
-.markdown h1:hover .anchor,
-.markdown h2:hover .anchor,
-.markdown h3:hover .anchor,
-.markdown h4:hover .anchor,
-.markdown h5:hover .anchor,
-.markdown h6:hover .anchor {
-  opacity: 1;
-  display: inline-block;
-}
-.markdown>br,
-.markdown>p>br {
-  clear: both;
-}
-.hljs {
-  display: block;
-  background: white;
-  padding: 0.5em;
-  color: #333333;
-  overflow-x: auto;
-}
-.hljs-comment,
-.hljs-meta {
-  color: #969896;
-}
-.hljs-string,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-strong,
-.hljs-emphasis,
-.hljs-quote {
-  color: #df5000;
-}
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-type {
-  color: #a71d5d;
-}
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-attribute {
-  color: #0086b3;
-}
-.hljs-section,
-.hljs-name {
-  color: #63a35c;
-}
-.hljs-tag {
-  color: #333333;
-}
-.hljs-title,
-.hljs-attr,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #795da3;
-}
-.hljs-addition {
-  color: #55a532;
-  background-color: #eaffea;
-}
-.hljs-deletion {
-  color: #bd2c00;
-  background-color: #ffecec;
-}
-.hljs-link {
-  text-decoration: underline;
-}
-/* 代码高亮 */
-/* PrismJS 1.15.0
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-@media print {
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-}
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-/* Inline code */
-:not(pre)>code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-  white-space: normal;
-}
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-.token.punctuation {
-  color: #999;
-}
-.namespace {
-  opacity: .7;
-}
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
-}
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-.token.italic {
-  font-style: italic;
-}
-.token.entity {
-  cursor: help;
-}
--- a/font/demo_index.html
+++ b/font/demo_index.html
--- a/font/iconfont.acss
+++ b/font/iconfont.acss
--- a/font/iconfont.eot
+++ b/font/iconfont.eot
--- a/font/iconfont.js
+++ b/font/iconfont.js
--- a/font/iconfont.json
+++ b/font/iconfont.json
-{
-  "id": "1593023",
-  "name": "会议室",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "13183878",
-      "name": "miaoshu",
-      "font_class": "miaoshu",
-      "unicode": "e69a",
-      "unicode_decimal": 59034
-    },
-    {
-      "icon_id": "13176749",
-      "name": "sanjiao",
-      "font_class": "sanjiao1",
-      "unicode": "e699",
-      "unicode_decimal": 59033
-    },
-    {
-      "icon_id": "13176696",
-      "name": "sanjiao",
-      "font_class": "sanjiao",
-      "unicode": "e698",
-      "unicode_decimal": 59032
-    },
-    {
-      "icon_id": "13174828",
-      "name": "bianji",
-      "font_class": "bianji",
-      "unicode": "e696",
-      "unicode_decimal": 59030
-    },
-    {
-      "icon_id": "13173695",
-      "name": "xialakuang",
-      "font_class": "xialakuang",
-      "unicode": "e695",
-      "unicode_decimal": 59029
-    },
-    {
-      "icon_id": "13173664",
-      "name": "jiahao",
-      "font_class": "jiahao",
-      "unicode": "e694",
-      "unicode_decimal": 59028
-    },
-    {
-      "icon_id": "13173351",
-      "name": "shijan",
-      "font_class": "shijan",
-      "unicode": "e693",
-      "unicode_decimal": 59027
-    },
-    {
-      "icon_id": "13173285",
-      "name": "hengxian",
-      "font_class": "hengxian",
-      "unicode": "e692",
-      "unicode_decimal": 59026
-    },
-    {
-      "icon_id": "13173282",
-      "name": "duigou",
-      "font_class": "duigou",
-      "unicode": "e691",
-      "unicode_decimal": 59025
-    },
-    {
-      "icon_id": "13173264",
-      "name": "fenxiang",
-      "font_class": "fenxiang",
-      "unicode": "e690",
-      "unicode_decimal": 59024
-    },
-    {
-      "icon_id": "13173248",
-      "name": "youjinru",
-      "font_class": "youjinru1",
-      "unicode": "e68f",
-      "unicode_decimal": 59023
-    },
-    {
-      "icon_id": "13173200",
-      "name": "youjinru",
-      "font_class": "youjinru",
-      "unicode": "e68d",
-      "unicode_decimal": 59021
-    },
-    {
-      "icon_id": "13172997",
-      "name": "xuanzhong",
-      "font_class": "xuanzhong1",
-      "unicode": "e68c",
-      "unicode_decimal": 59020
-    },
-    {
-      "icon_id": "13172977",
-      "name": "dingwei",
-      "font_class": "dingwei1",
-      "unicode": "e68b",
-      "unicode_decimal": 59019
-    },
-    {
-      "icon_id": "13172955",
-      "name": "sousuo",
-      "font_class": "sousuo1",
-      "unicode": "e68a",
-      "unicode_decimal": 59018
-    },
-    {
-      "icon_id": "13172911",
-      "name": "huiyizhuti",
-      "font_class": "huiyizhuti2",
-      "unicode": "e689",
-      "unicode_decimal": 59017
-    },
-    {
-      "icon_id": "13172878",
-      "name": "shijian",
-      "font_class": "shijian1",
-      "unicode": "e687",
-      "unicode_decimal": 59015
-    },
-    {
-      "icon_id": "13172852",
-      "name": "chongfu",
-      "font_class": "chongfu2",
-      "unicode": "e686",
-      "unicode_decimal": 59014
-    },
-    {
-      "icon_id": "13172832",
-      "name": "canhuiren1",
-      "font_class": "canhuiren",
-      "unicode": "e684",
-      "unicode_decimal": 59012
-    },
-    {
-      "icon_id": "13172826",
-      "name": "huiyishi",
-      "font_class": "huiyishi2",
-      "unicode": "e683",
-      "unicode_decimal": 59011
-    },
-    {
-      "icon_id": "13172743",
-      "name": "tixing",
-      "font_class": "tixing",
-      "unicode": "e67f",
-      "unicode_decimal": 59007
-    },
-    {
-      "icon_id": "13172697",
-      "name": "tianjia",
-      "font_class": "tianjia1",
-      "unicode": "e67e",
-      "unicode_decimal": 59006
-    },
-    {
-      "icon_id": "13172692",
-      "name": "shanchu-2",
-      "font_class": "shanchu-1",
-      "unicode": "e67d",
-      "unicode_decimal": 59005
-    },
-    {
-      "icon_id": "13172671",
-      "name": "xuanzhong",
-      "font_class": "xuanzhong2",
-      "unicode": "e67b",
-      "unicode_decimal": 59003
-    },
-    {
-      "icon_id": "13172636",
-      "name": "weigouxuan",
-      "font_class": "weigouxuan",
-      "unicode": "e67a",
-      "unicode_decimal": 59002
-    },
-    {
-      "icon_id": "13172601",
-      "name": "shanchu1",
-      "font_class": "shanchu3",
-      "unicode": "e679",
-      "unicode_decimal": 59001
-    },
-    {
-      "icon_id": "13172580",
-      "name": "shangchuanwenjian",
-      "font_class": "shangchuanwenjian1",
-      "unicode": "e678",
-      "unicode_decimal": 59000
-    },
-    {
-      "icon_id": "13172482",
-      "name": "dongtai",
-      "font_class": "dongtai1",
-      "unicode": "e677",
-      "unicode_decimal": 58999
-    },
-    {
-      "icon_id": "13172468",
-      "name": "chengshi-2",
-      "font_class": "chengshi-",
-      "unicode": "e676",
-      "unicode_decimal": 58998
-    },
-    {
-      "icon_id": "13172321",
-      "name": "jianzhu",
-      "font_class": "jianzhu1",
-      "unicode": "e675",
-      "unicode_decimal": 58997
-    },
-    {
-      "icon_id": "13172287",
-      "name": "louceng-3",
-      "font_class": "louceng-",
-      "unicode": "e674",
-      "unicode_decimal": 58996
-    },
-    {
-      "icon_id": "13172270",
-      "name": "shebei",
-      "font_class": "shebei",
-      "unicode": "e673",
-      "unicode_decimal": 58995
-    },
-    {
-      "icon_id": "13172247",
-      "name": "bucanjia2",
-      "font_class": "bucanjia3",
-      "unicode": "e672",
-      "unicode_decimal": 58994
-    },
-    {
-      "icon_id": "13172223",
-      "name": "bucanjia",
-      "font_class": "bucanjia2",
-      "unicode": "e671",
-      "unicode_decimal": 58993
-    },
-    {
-      "icon_id": "13172130",
-      "name": "canjia",
-      "font_class": "canjia3",
-      "unicode": "e670",
-      "unicode_decimal": 58992
-    },
-    {
-      "icon_id": "13172079",
-      "name": "canjia2",
-      "font_class": "canjia2",
-      "unicode": "e66f",
-      "unicode_decimal": 58991
-    },
-    {
-      "icon_id": "13172059",
-      "name": "shanchu",
-      "font_class": "shanchu2",
-      "unicode": "e66e",
-      "unicode_decimal": 58990
-    }
-  ]
-}
--- a/font/iconfont.svg
+++ b/font/iconfont.svg
--- a/font/iconfont.ttf
+++ b/font/iconfont.ttf
--- a/font/iconfont.woff
+++ b/font/iconfont.woff
--- a/font/iconfont.woff2
+++ b/font/iconfont.woff2
--- a/pages/addRemark/addRemark.acss
+++ b/pages/addRemark/addRemark.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #fff;
    font-family: PingFangSC-Regular;

--- a/pages/attendingSituation/attendingSituation.acss
+++ b/pages/attendingSituation/attendingSituation.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #f6f6f6;
    font-family: PingFangSC-Regular;

--- a/pages/createOrEditSchedule/createOrEditSchedule.acss
+++ b/pages/createOrEditSchedule/createOrEditSchedule.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #f6f6f6;
    font-family: PingFangSC-Regular;

--- a/pages/editFile/editFile.acss
+++ b/pages/editFile/editFile.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #fff;
    font-family: PingFangSC-Regular;

--- a/pages/index/index.acss
+++ b/pages/index/index.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #fff;
    font-family: PingFangSC-Regular;

--- a/pages/participantsDetail/participantsDetail.acss
+++ b/pages/participantsDetail/participantsDetail.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #f6f6f6;
    font-family: PingFangSC-Regular;

--- a/pages/place/place.acss
+++ b/pages/place/place.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #f6f6f6;
    font-family: PingFangSC-Regular;

--- a/pages/remind/remind.acss
+++ b/pages/remind/remind.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #f6f6f6;
    font-family: PingFangSC-Regular;

--- a/pages/repeatMechanism/repeatMechanism.acss
+++ b/pages/repeatMechanism/repeatMechanism.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #f6f6f6;
    font-family: PingFangSC-Regular;

--- a/pages/scheduleDetail/scheduleDetail.acss
+++ b/pages/scheduleDetail/scheduleDetail.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #f6f6f6;
    font-family: PingFangSC-Regular;

--- a/pages/uploadFile/uploadFile.acss
+++ b/pages/uploadFile/uploadFile.acss
-@import "../../font/iconfont.acss";
+@import "../../assests/font/iconfont.acss";
 page {
    background: #fff;
    font-family: PingFangSC-Regular;

--- a/utils/utils.js
+++ b/utils/utils.js
@@ -47,7 +47,7 @@ export function dealFileTime(time) {
        result = "刚刚"
    }else {
        let datetime = new Date();
-        datetime.setTime(dateTimeStamp);
+        datetime.setTime(time);
        let Nyear = datetime.getFullYear();
        let Nmonth = datetime.getMonth() + 1 < 10 ? "0" + (datetime.getMonth() + 1) : datetime.getMonth() + 1;
        let Ndate = datetime.getDate() < 10 ? "0" + datetime.getDate() : datetime.getDate();