fix conflit

pages/createMeeting/createMeeting.js

@@ -344,6 +344,7 @@ create.Page({
     addSchedule(data).then(res => {
       if (res.data.code === 0) {
         this.$store.data.indexNeedUpdate = true
+        this.$store.data.tabBarIndex = '1'
         this.update()
         dd.navigateBack({
           delta: 1

pages/index/index.axml

-<view a:if="{{tabBarIndex === '0'}}">
+<!--<<<<<<< Updated upstream<view a:if="{{tabBarIndex === '0'}}">
+=======<view style="position:absolute"></view> -->
+<view a:if="{{$data.tabBarIndex === '0'}}">
+    <!-- >>>>>>> Stashed changes -->
     <my-dynamic>
     </my-dynamic>
 </view>
-<view a:if="{{tabBarIndex === '1'}}">
+<view a:if="{{$data.tabBarIndex === '1'}}">
     <my-schedule update="{{$data.indexNeedUpdate}}">
     </my-schedule>
 </view>
 <view class="tabBar">
     <view onTap="changeTabBar" data-tabbar='0'>
-        <view class="tabBarView tabBarView1 {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
+        <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 {{tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
+        <view class="tabBarView tabBarView2 {{$data.tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
             <view class="iconfont iconicon_Calendarbox1">
                 <text class="iconfont iconicon_days iconicon_days{{iconDay}}">
                 </text>

pages/index/index.js

@@ -2,7 +2,6 @@ import { getFormatDate } from "../../utils/utils";
 import create from "dd-store";
 create.Page({
   data: {
-    tabBarIndex: "0",
     $data: null,
     iconDay: "",
     isLocation: false
@@ -23,10 +22,9 @@ create.Page({
   },
   // 修改tabBar
   changeTabBar(e) {
-    let nowtabBarIndex = this.data.tabBarIndex;
-    this.setData({
-      tabBarIndex: e.currentTarget.dataset.tabbar
-    });
+    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':

pages/meetingDetail/meetingDetail.js

@@ -580,6 +580,7 @@ create.Page({
       modifySchedule(Object.assign(data, obj)).then(res => {
         if (res.data.code === 0) {
           that.$store.data.indexNeedUpdate = true
+          that.$store.data.tabBarIndex = '1'
           that.update()
           this.setData({
             'conToastData.showToast': true,
@@ -667,6 +668,7 @@ create.Page({
         break
       case 'noParticipateStatus':
         let data1 = {
+          scheduleId: this.data.scheduleItem.id,
           type: event.currentTarget.dataset.item.id,
           templateId: this.data.scheduleItem.scheduleTemplateId,
           planDate: this.data.scheduleItem.planDate,
@@ -674,6 +676,9 @@ create.Page({
         }
         isParticipate(data1).then(res => {
           if (res.data.code === 0) {
+            this.$store.data.indexNeedUpdate = true
+            this.$store.data.tabBarIndex = '1'
+            this.update()
             this.setData({
               confirmAttendance: 0,
               'conToastData.showToast': true,
@@ -684,6 +689,7 @@ create.Page({
         break
       case 'participateStatus':
         let data = {
+          scheduleId: this.data.scheduleItem.id,
           type: event.currentTarget.dataset.item.id,
           templateId: this.data.scheduleItem.scheduleTemplateId,
           planDate: this.data.scheduleItem.planDate,
@@ -691,6 +697,9 @@ create.Page({
         }
         isParticipate(data).then(res => {
           if (res.data.code === 0) {
+            this.$store.data.indexNeedUpdate = true
+            this.$store.data.tabBarIndex = '1'
+            this.update()
             this.setData({
               confirmAttendance: 1,
               'conToastData.showToast': true,
@@ -1121,6 +1130,9 @@ create.Page({
     } else {
       isParticipate(data).then(res => {
         if (res.data.code === 0) {
+          this.$store.data.indexNeedUpdate = true
+          this.$store.data.tabBarIndex = '1'
+          this.update()
           this.setData({
             confirmAttendance: 1,
             'conToastData.showToast': true,
@@ -1145,6 +1157,9 @@ create.Page({
     } else {
       isParticipate(data).then(res => {
         if (res.data.code === 0) {
+          this.$store.data.indexNeedUpdate = true
+          this.$store.data.tabBarIndex = '1'
+          this.update()
           this.setData({
             confirmAttendance: 0,
             'conToastData.showToast': true,
@@ -1170,6 +1185,9 @@ create.Page({
     }
     isParticipate(data).then(res => {
       if (res.data.code === 0) {
+        this.$store.data.indexNeedUpdate = true
+        this.$store.data.tabBarIndex = '1'
+        this.update()
         this.setData({
           confirmAttendance: -9
         })

pages/outLookContact/outLookContact.axml

 <view class="outLookContact">
   <!-- 输入邮箱联系人 -->
   <view class="addContact">
-    <input placeholder="请输入邮箱" onInput="onInput" value="{{value}}" />
+    <input placeholder="请输入邮箱" onInput="onInput" value="{{value}}" focus="{{false}}" />
     <view class="icon iconfont iconicon_add " onTap="addEmail">
     </view>
   </view>

stores/exampleStore.js

@@ -9,7 +9,8 @@ class Store {
         originUsersId: [],
         originalData: null,
         indexNeedUpdate: false,
-        locationSchedule: () => {}
+        tabBarIndex: '0',
+        locationSchedule: () => { }
     }
 }
 export default new Store()
\ No newline at end of file