合并

api/http.js

@@ -11,7 +11,7 @@ export default function http(data) {
         method: data.method,
         dataType: "json",
         data: data.data,
-        success: function (res) {
+        success: function(res) {
           if (res.data.code == 0) {
             resolve(res);
           } else {
@@ -21,7 +21,7 @@ export default function http(data) {
             });
           }
         },
-        fail: function (res) {
+        fail: function(res) {
           dd.alert({
             content: "网络异常",
             buttonText: "确定"
@@ -54,10 +54,10 @@ export default function http(data) {
           method: data.method,
           data: data.data,
           dataType: "json",
-          success: function (res) {
+          success: function(res) {
             resolve(res);
           },
-          fail: function (res) {
+          fail: function(res) {
             rejects(res);
           }
         });

app.acss

@@ -7,3 +7,7 @@ page {
 view {
     box-sizing: border-box;
 }
+
+.addPaddingBottom {
+    padding-bottom: 68rpx;
+}
\ No newline at end of file

app.js

 import { setGlobalStore } from 'dd-store';
 import exampleStore from './stores/exampleStore'
+import { checkFullScren } from "./utils/checkFullScren";
 setGlobalStore(exampleStore);
 
 App({
@@ -7,6 +8,7 @@ App({
     // 第一次打开
     // options.query == {number:1}
     // console.info('App onLaunch');
+    this.globalData.isFullScren = checkFullScren
   },
   onShow(options) {
     // 从后台被 scheme 重新打开
@@ -14,6 +16,7 @@ App({
   },
 
   globalData: {
+    isFullScren: false,
     loading: false,
     token: '',
     avatar: '',

components/relatedApp/relatedApp.axml

@@ -26,7 +26,7 @@
       </view>
     </view>
   </view>
-  <view class="unAssociated">
+  <view class="unAssociated" a:if="{{relatedAppList.length === 3}}">
     <view class="associated">
         可关联应用
     </view>

components/relatedApp/relatedApp.js

@@ -22,7 +22,7 @@ create.Component({
       this.getDate();
     }
   },
-  didUnmount() {},
+  didUnmount() { },
   methods: {
     getDate() {
       getThirdUserPlatForm().then(res => {

pages/index/index.acss

-.tabBar {
-    width: 100%;
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    /* box-shadow: 0 -4rpx 8rpx 0 rgba(0,0,0,0.04);
-    border-radius: 0 64rpx 0 64rpx 0 0 0; */
-}
-
-.tabBarContaint {
-    display: flex;
-    height: 120rpx;
-    background: url('../../assests/tabBarBg.png');
-    background-size: cover;
-    padding-top: 4rpx;
-}
-
-.tabBarContaint>view {
-    flex: 1;
-    font-size: 28rpx;
-}
-
-.tabBarContaint>view:nth-of-type(1) {
-    text-align: left;
-}
-
-.tatabBarContaintbBar>view:nth-of-type(2) {
-    text-align: right;
-}
-
-.createMeeting {
-    position: absolute;
-    left: 50%;
-    top: 8rpx;
-    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;
-    flex-direction: column;
-    height: 116rpx;
-    justify-content: center;
-}
-
-.tabBarView1 {
-    padding-left: 140rpx;
-    align-items: flex-start;
-}
-
-.tabBarView2 {
-    padding-right: 140rpx;
-    align-items: flex-end;
-}
-
-.tabBarView>view {
-    display: block;
-    color: rgba(10, 10, 10, .4)
-}
-
-.tabBarView>view:nth-of-type(1) {
-    width: 42rpx;
-    height: 42rpx;
-    font-size: 42rpx;
-    margin-bottom: 11rpx;
-}
-
-.tabBarView>view:nth-of-type(2) {
-    height: 10rpx;
-    font-size: 20rpx;
-}
-
-.ischooseTabBar>view {
-    color: rgba(10, 10, 10, 1) !important;
-}
-
-.iconicon_Calendarbox1 {
-    position: relative;
-}
-
-.iconicon_days {
-    position: absolute;
-    left: 5rpx;
-    top: 8rpx;
-    font-size: 30rpx;
-}
-
-.tabBarView .iconicon_days {
-    color: #FFFFFF !important;
-}
-
-.tabBarBottom {
-    height: 68rpx;
-    width: 100%;
-    background: #fff;
-}
\ No newline at end of file

pages/index/index.axml

-<view a:if="{{$data.tabBarIndex === '0'}}">
-    <my-dynamic>
-    </my-dynamic>
-</view>
-<view a:if="{{$data.tabBarIndex === '1'}}">
-    <my-schedule update="{{$data.indexNeedUpdate}}">
-    </my-schedule>
-</view>
-<view class="tabBar">
-    <view class="tabBarContaint">
-        <view onTap="changeTabBar" data-tabbar='0'>
-            <view class="tabBarView tabBarView1 {{$data.tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
-                <view class="iconfont iconicon_dynamic"></view>
-                <view>动态</view>
-            </view>
-        </view>
-        <view onTap="changeTabBar" data-tabbar='1'>
-            <view class="tabBarView tabBarView2 {{$data.tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
-                <view class="iconfont iconicon_Calendarbox1">
-                    <text class="iconfont iconicon_days iconicon_days{{iconDay}}">
-                    </text>
-                </view>
-                <view>日程</view>
-            </view>
-        </view>
-        <view class="createMeeting" onTap="createMeeting">
-            <text class="iconfont iconicon_add1"></text>
-        </view>
-    </view>
-    <view class="tabBarBottom" a:if="{{isIPX}}">
-    </view>
-</view>
\ No newline at end of file

pages/index/index.js

-import { getFormatDate } from "../../utils/utils";
-import { checkFullScren } from "../../utils/checkFullScren";
-import create from "dd-store";
-create.Page({
-  data: {
-    $data: null,
-    iconDay: "",
-    isLocation: false,
-    isIPX: false,
-  },
-  onLoad() {
-    let iconDay = new Date().getDate();
-    this.setData({
-      iconDay: iconDay,
-      isIPX: checkFullScren()
-    });
-    dd.setNavigationBar({
-      title: "动态"
-    });
-  },
-  onShow() {
-    setTimeout(res => {
-      this.update();
-    }, 100);
-  },
-  // 修改tabBar
-  changeTabBar(e) {
-    let nowtabBarIndex = this.$store.data.tabBarIndex;
-    this.$store.data.tabBarIndex = e.currentTarget.dataset.tabbar
-    this.update()
-    let title = "动态";
-    switch (e.currentTarget.dataset.tabbar) {
-      case '0':
-        title = '动态186';
-        break;
-      case "1":
-        title = "日程";
-        break;
-    }
-    dd.setNavigationBar({
-      title: title
-    });
-    if (
-      nowtabBarIndex === e.currentTarget.dataset.tabbar &&
-      e.currentTarget.dataset.tabbar === "1"
-    ) {
-      if (!this.$store.data.indexNeedUpdate) {
-        this.$store.locationSchedule();
-      }
-    }
-  },
-  createMeeting() {
-    dd.navigateTo({ url: "./../createMeeting/createMeeting" });
-  }
-});

pages/meetingDetail/meetingDetail.js

@@ -328,7 +328,7 @@ create.Page({
   },
   // 初始化
   reset() {
-    this.$store.resetData()
+    this.$store.resetEditData()
     this.resetRepeatList()
     this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
   },

pages/outLookContact/outLookContact.js

@@ -66,7 +66,7 @@ create.Page({
   },
   // 添加email
   addEmail() {
-    let reg = /^(?!.* )[a-zA-Z0-9_-]+/
+    let reg = /^(?!.* )\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/
     if (!!this.data.value) {
       if (reg.test(this.data.value)) {
         let outlookContact = this.data.outlookContact

pages/scheduleList/scheduleList.acss

 @import "../../template/loading/loading.acss";
 @import "../../template/affairBlank/index.acss";
+@import "../../template/fullScreen/fullScreen.acss";
 .dynamicBox {
     width: 100%;
     overflow: hidden;
@@ -289,15 +290,19 @@
     background: #Fff;
 }
 
+.tabBarContent {
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+}
+
 .tabBar {
     height: 120rpx;
     width: 100%;
     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; */

pages/scheduleList/scheduleList.axml

 <import src="../../template/loading/loading.axml"/>
+<import src="../../template/fullScreen/fullScreen.axml"/>
 <view hidden="{{$data.tabBarIndex === '1'}}">
   <import src="../../template/affairBlank/index.axml"/>
   <view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe" onTouchMove="closeSwipe" onTouchEnd="closeSwipe">
@@ -119,7 +120,8 @@
   <template is="loading" a:else>
   </template>
 </view>
-<view class="tabBar">
+<view class="tabBarContent">
+  <view class="tabBar">
     <view onTap="changeTabBar" data-tabbar='0' data-title='动态'>
       <view class="tabBarView tabBarView1 {{$data.tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
         <view class="iconfont iconicon_dynamic"></view>
@@ -142,4 +144,6 @@
     <view class="createMeeting" onTap="createMeeting">
       <text class="iconfont iconicon_add1"></text>
     </view>
+  </view>
+  <template is="fullScreen" data="{{isIPX:isFullscreen}}" />
 </view>
\ No newline at end of file

pages/scheduleList/scheduleList.js

@@ -35,7 +35,9 @@ create.Page({
     dynamicList: [],
     current: 1,
     pages: 1,
-    listLoading: true
+    listLoading: true,
+    isFullscreen: false
+
   },
   scrollTop: 0,
   pageSize: 10,
@@ -61,6 +63,9 @@ create.Page({
     }
   },
   onLoad() {
+    this.setData({
+      isFullscreen: getApp().globalData.isFullscreen
+    })
     dd.setNavigationBar({
       title: this.$store.data.tabBarIndex == '0' ? "动态" : '日程'
     });
@@ -687,7 +692,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: '版本号197'
+        content: '版本号198'
       });
       maxClickCount = 5;
     }