Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
SuperMan
Commits
d255bb95
Commit
d255bb95
authored
Mar 02, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面 修改
parent
0a34ae3f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
10 deletions
+16
-10
TravelManager2.vue
...ts/newTravelmanager/TravelGroupControl/TravelManager2.vue
+10
-3
TravelDaysTrip_Direct.vue
...newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
+1
-1
chatroomMsgs.js
src/store/actions/chatroomMsgs.js
+1
-1
initChatroomSDK.js
src/store/actions/initChatroomSDK.js
+2
-2
msgs.js
src/store/actions/msgs.js
+1
-1
team.js
src/store/actions/team.js
+1
-2
No files found.
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @
d255bb95
...
...
@@ -415,7 +415,7 @@
if
(
basicData
.
OpenState
==
1
)
{
basicData
[
"AfterOpenModify"
]
=
true
;
}
if
(
this
.
$route
.
query
.
openState
)
{
if
(
this
.
$route
.
query
.
openState
)
{
basicData
.
OpenState
=
this
.
$route
.
query
.
openState
;
}
//"另存"新增团期
...
...
@@ -424,7 +424,7 @@
}
basicData
.
TeamType
=
this
.
TeamType
;
basicData
.
IsUpdateHotel
=
this
.
PostConfig
.
IsUpdateHotel
;
this
.
apipost
(
"travel_post_SetTravelConfigInfo"
,
basicData
,
...
...
@@ -596,6 +596,7 @@
this
.
journeyList
.
DayNum
=
configData
.
Days
.
length
;
this
.
journeyList
.
NightNum
=
this
.
journeyList
.
DayNum
-
1
;
this
.
journeyList
.
DayList
=
dayList
;
//产品特色
this
.
FeatureData
.
FeatureType
=
3
;
this
.
FeatureData
.
FeatureContent
=
configData
.
Feature
;
...
...
@@ -660,6 +661,7 @@
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
var
tempData
=
res
.
data
.
data
;
if
(
tempData
.
Feature
!=
null
)
{
this
.
FeatureData
.
ID
=
tempData
.
Feature
.
ID
;
this
.
FeatureData
.
ConfigId
=
tempData
.
Feature
.
ConfigId
;
...
...
@@ -765,12 +767,17 @@
this
.
journeyList
.
NightNum
=
tempData
.
NightNum
;
this
.
journeyList
.
ReturnArriveCityId
=
tempData
.
ReturnArriveCityId
;
this
.
journeyList
.
StartCityId
=
tempData
.
StartCityId
;
this
.
journeyList
.
DayList
=
tempData
.
DayList
;
if
(
this
.
TeamType
==
1
)
{
this
.
journeyList
.
DayList
=
tempData
.
DayList2
;
}
else
{
this
.
journeyList
.
DayList
=
tempData
.
DayList
;
}
this
.
journeyList
.
DayList
.
forEach
(
x
=>
{
x
[
"HotelChooseArray"
]
=
[];
x
[
"ChooseScenicArray"
]
=
[];
x
[
"isHide"
]
=
false
;
});
if
(
tempData
.
OfferList
!=
null
)
{
this
.
OfferList
=
tempData
.
OfferList
;
}
...
...
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @
d255bb95
...
...
@@ -331,7 +331,7 @@
}
},
created
()
{
},
computed
:
{
//获取行程天数
...
...
src/store/actions/chatroomMsgs.js
View file @
d255bb95
...
...
@@ -100,7 +100,7 @@ export function sendChatroomFileMsg ({state, commit}, obj) {
uploadprogress
:
function
(
data
)
{
},
uploaderror
:
function
()
{
console
&&
console
.
log
(
'上传失败'
)
},
uploaddone
:
function
(
error
,
file
)
{
...
...
src/store/actions/initChatroomSDK.js
View file @
d255bb95
...
...
@@ -37,7 +37,7 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
},
onwillreconnect
:
function
onChatroomWillReconnect
(
obj
)
{
// 此时说明 `SDK` 已经断开连接, 请开发者在界面上提示用户连接已断开, 而且正在重新建立连接
console
.
log
(
'即将重连'
,
obj
)
},
ondisconnect
:
function
onChatroomDisconnect
(
error
)
{
// 此时说明 `SDK` 处于断开状态, 切换聊天室也会触发次回调
...
...
@@ -64,7 +64,7 @@ export function initChatroomSDK ({ state, commit, dispatch }, obj) {
}
break
default
:
console
.
log
(
error
.
message
)
break
}
}
...
...
src/store/actions/msgs.js
View file @
d255bb95
...
...
@@ -343,7 +343,7 @@ export function sendMsgReceipt({
}
function
sendMsgReceiptDone
(
error
,
obj
)
{
console
.
log
(
'发送消息已读回执'
+
(
!
error
?
'成功'
:
'失败'
),
error
,
obj
)
}
export
function
getHistoryMsgs
({
...
...
src/store/actions/team.js
View file @
d255bb95
...
...
@@ -270,7 +270,7 @@ export function checkTeamMsgReceipt({state}, msgs) {
nim
.
sendTeamMsgReceipt
({
teamMsgReceipts
:
needToPeceiptList
,
done
:
(
err
,
obj
,
content
)
=>
{
console
.
log
(
'标记群组消息已读'
+
(
!
err
?
'成功'
:
'失败'
));
if
(
!
err
)
{
store
.
commit
(
'updateSentReceipedMap'
,
needToPeceiptList
)
}
...
...
@@ -304,7 +304,6 @@ export function getTeamMsgReads({ state }, needQuery) {
teamMsgReceipts
:
needQuery
,
done
:
(
error
,
obj
,
content
)
=>
{
if
(
error
)
{
console
.
log
(
'获取群组消息已读'
+
error
)
}
else
{
store
.
commit
(
'updateTeamMsgReads'
,
content
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment