Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
fengzhaoyu
schedule
Commits
9161d462
Commit
9161d462
authored
Oct 19, 2020
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 详情动态列表增加了创建会议的一些修改,修改为线上地址
parent
bb23b64c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
config.js
config.js
+1
-1
index.js
pages/index/index.js
+1
-1
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+2
-2
No files found.
config.js
View file @
9161d462
export
const
globalUrl
=
"https://gateway-
beta
.mingwork.com"
;
export
const
globalUrl
=
"https://gateway-
ding
.mingwork.com"
;
export
const
globalUrl2
=
"https://third-authentication.mingwork.com"
;
export
const
globalUrl2
=
"https://third-authentication.mingwork.com"
;
...
...
pages/index/index.js
View file @
9161d462
...
@@ -179,7 +179,7 @@ create.Page({
...
@@ -179,7 +179,7 @@ create.Page({
},
},
connect_start
()
{
connect_start
()
{
dd
.
connectSocket
({
dd
.
connectSocket
({
url
:
`ws
://139.196.213.18:9999
/meet-websocket/websocket/
${
dd
.
getStorageSync
({
key
:
'mwUserId'
}).
data
}
/
${
uuid
}
`
,
url
:
`ws
s://gateway-ding.mingwork.com
/meet-websocket/websocket/
${
dd
.
getStorageSync
({
key
:
'mwUserId'
}).
data
}
/
${
uuid
}
`
,
success
:
(
res
)
=>
{
success
:
(
res
)
=>
{
...
...
pages/meetingDetail/meetingDetail.axml
View file @
9161d462
...
@@ -206,7 +206,7 @@
...
@@ -206,7 +206,7 @@
<notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/>
<notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/>
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
</view>
</view>
<view class="compose-column-operation">
<view class="compose-column-operation"
a:if="{{item.commentType !== 'meeting'}}"
>
<view class="operation-more iconmore iconfont color4" catchTap="handleOpenOperation" data-commentId="{{item.commentId}}">
<view class="operation-more iconmore iconfont color4" catchTap="handleOpenOperation" data-commentId="{{item.commentId}}">
<view class="operation-containt" a:if="{{modifyDynamicId === item.commentId}}">
<view class="operation-containt" a:if="{{modifyDynamicId === item.commentId}}">
<text class="icondescribe11 iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" catchTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">
<text class="icondescribe11 iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" catchTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
<view class="line"></view>
<view class="line"></view>
</view>
</view>
</block>
</block>
<view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
<view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0
|| (affairList.length == 1 && affairList[0].commentType === 'meeting')
}}">
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/>
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/>
</view>
</view>
<!--<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> -->
<!--<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> -->
...
...
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