conflict : 合并冲突

config.js

 export const globalUrl = "https://gateway2.mingwork.com";
 export const globalUrl2 = "https://third-authentication.mingwork.com";
+/* 
+isShowOss 控制oss上传是否展示
+true 展示
+false 不能展示
+测试环境为 true
+线上环境为 false
+ */
+export const isShowOss = false
+

pages/meetingDetail/meetingDetail.axml

@@ -190,7 +190,7 @@
         <view onTap="addMeetingFile">
           <text class="iconfont iconicon_data"></text>文件
         </view>
-        <view onTap="addOssFile">
+        <view onTap="addOssFile" a:if="{{isShowOss}}">
           <text class="iconfont iconicon_data"></text>
           <view>
             oss

pages/meetingDetail/meetingDetail.js

@@ -6,6 +6,7 @@ import { getOssPermission, getuploadResource, isParticipate, deleteSchedule, get
 import { throttle, getCreateShowTime, getRndInteger } from './../../utils/utils.js'
 import { observer } from '/utils/observer.js'
 import { resolve } from 'path';
+import { isShowOss } from '../../config.js';
 create.Page({
   store: pageStore,
   useAll: true,
@@ -109,7 +110,8 @@ create.Page({
     confirmAttendance: null,
     isExpand: false,
     placeholder: '',
-    mrReserveStatus: ''
+    mrReserveStatus: '',
+    isShowOss: isShowOss
   },
   onShow() {
     // this.conflictPeople()