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
ae97d638
Commit
ae97d638
authored
May 20, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:去掉oss文件上传线上测试环境的配置
parent
cdd8a126
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 additions
and
11 deletions
+1
-11
config.js
config.js
+0
-8
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+1
-1
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+0
-2
No files found.
config.js
View file @
ae97d638
export
const
globalUrl
=
"https://gateway-beta.mingwork.com"
;
export
const
globalUrl
=
"https://gateway-beta.mingwork.com"
;
export
const
globalUrl2
=
"https://third-authentication-beta.mingwork.com"
;
export
const
globalUrl2
=
"https://third-authentication-beta.mingwork.com"
;
/*
isShowOss 控制oss上传是否展示
true 展示
false 不能展示
测试环境为 true
线上环境为 false
*/
export
const
isShowOss
=
true
pages/meetingDetail/meetingDetail.axml
View file @
ae97d638
...
@@ -203,7 +203,7 @@
...
@@ -203,7 +203,7 @@
<text class="iconfont iconicon_task1"></text>任务
<text class="iconfont iconicon_task1"></text>任务
</view>
</view>
<!--<view onTap="addMeetingFile"><text class="iconfont iconicon_data"></text>文件</view> -->
<!--<view onTap="addMeetingFile"><text class="iconfont iconicon_data"></text>文件</view> -->
<view onTap="addOssFile"
a:if="{{isShowOss}}"
>
<view onTap="addOssFile">
<text class="iconfont iconicon_data"></text>
<text class="iconfont iconicon_data"></text>
<view>
<view>
文件
文件
...
...
pages/meetingDetail/meetingDetail.js
View file @
ae97d638
...
@@ -6,7 +6,6 @@ import { getOssPermission, getuploadResource, isParticipate, deleteSchedule, get
...
@@ -6,7 +6,6 @@ import { getOssPermission, getuploadResource, isParticipate, deleteSchedule, get
import
{
throttle
,
getCreateShowTime
}
from
'./../../utils/utils.js'
import
{
throttle
,
getCreateShowTime
}
from
'./../../utils/utils.js'
import
{
observer
}
from
'/utils/observer.js'
import
{
observer
}
from
'/utils/observer.js'
import
{
resolve
}
from
'path'
;
import
{
resolve
}
from
'path'
;
import
{
isShowOss
}
from
'../../config.js'
;
import
{
getFileInfoFromOss
}
from
'./uploadFile'
;
import
{
getFileInfoFromOss
}
from
'./uploadFile'
;
import
{
comShareData
}
from
'./const.js'
;
import
{
comShareData
}
from
'./const.js'
;
create
.
Page
({
create
.
Page
({
...
@@ -114,7 +113,6 @@ create.Page({
...
@@ -114,7 +113,6 @@ create.Page({
isExpand
:
false
,
isExpand
:
false
,
placeholder
:
''
,
placeholder
:
''
,
mrReserveStatus
:
''
,
mrReserveStatus
:
''
,
isShowOss
:
isShowOss
},
},
onShow
()
{
onShow
()
{
// this.conflictPeople()
// this.conflictPeople()
...
...
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