From 08538a6658f01b704438cca9e912c5f2a570feb5 Mon Sep 17 00:00:00 2001
From: ‘fengzhaoyu’ <feng.zhaoyu@mingwork.com>
Date: Tue, 7 Apr 2020 09:48:46 +0800
Subject: [PATCH] fix conflit
---
pages/createMeeting/createMeeting.js | 1 +
pages/index/index.axml | 11 +++++++----
pages/index/index.js | 8 +++-----
pages/meetingDetail/meetingDetail.js | 18 ++++++++++++++++++
pages/outLookContact/outLookContact.axml | 2 +-
stores/exampleStore.js | 3 ++-
6 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/pages/createMeeting/createMeeting.js b/pages/createMeeting/createMeeting.js
index 50eca0a..8e28cc4 100644
--- a/pages/createMeeting/createMeeting.js
+++ b/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
diff --git a/pages/index/index.axml b/pages/index/index.axml
index b373a5d..ab1015d 100644
--- a/pages/index/index.axml
+++ b/pages/index/index.axml
@@ -1,20 +1,23 @@
-<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>
diff --git a/pages/index/index.js b/pages/index/index.js
index 5a2bf3e..64b0325 100644
--- a/pages/index/index.js
+++ b/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':
diff --git a/pages/meetingDetail/meetingDetail.js b/pages/meetingDetail/meetingDetail.js
index a31568c..720ff84 100644
--- a/pages/meetingDetail/meetingDetail.js
+++ b/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
})
diff --git a/pages/outLookContact/outLookContact.axml b/pages/outLookContact/outLookContact.axml
index 89cf092..11c15d4 100644
--- a/pages/outLookContact/outLookContact.axml
+++ b/pages/outLookContact/outLookContact.axml
@@ -1,7 +1,7 @@
<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>
diff --git a/stores/exampleStore.js b/stores/exampleStore.js
index 8eaed9d..468bd49 100644
--- a/stores/exampleStore.js
+++ b/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
--
libgit2 0.26.0