diff --git a/components/fileList/fileList.acss b/components/fileList/fileList.acss
index 973895f..a965917 100644
--- a/components/fileList/fileList.acss
+++ b/components/fileList/fileList.acss
@@ -38,6 +38,8 @@
color: rgba(25, 31, 37, 1);
display: flex;
line-height: 38rpx;
+ max-width: calc(100% - 100rpx);
+ overflow: hidden
}
.file-box>.iconfont {
@@ -132,4 +134,11 @@
.zip, .rar {
background: url(../../assests/zip.png) center /100% 100% !important;
+}
+
+.file-showName {
+ position: absolute;
+ right: 0px;
+ top: 50%;
+ margin-top: -9px
}
\ No newline at end of file
diff --git a/components/fileList/fileList.axml b/components/fileList/fileList.axml
index d18d1cc..eae97ca 100644
--- a/components/fileList/fileList.axml
+++ b/components/fileList/fileList.axml
@@ -7,8 +7,10 @@
<view class="file-icon {{item.mimeType}}"></view>
<view class="file-title">
<text>{{item.name.slice(0, item.name.length - 5)}}</text>
- <text>{{item.name.slice(-5)}}</text></view>
+ <text>{{item.name.slice(-5)}}</text>
+ </view>
<view class="file-size">{{item.size}}</view>
+ <view a:if="{{showName}}" class="file-showName">{{item.userDetail.name}}</view>
<view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
</view>
</view>
diff --git a/components/fileList/fileList.js b/components/fileList/fileList.js
index 335d172..0f75998 100644
--- a/components/fileList/fileList.js
+++ b/components/fileList/fileList.js
@@ -9,7 +9,6 @@ create.Component({
mixins: [],
data: {
logId: '', //store
- customClass: ''
},
props: {
@@ -18,16 +17,12 @@ create.Component({
isPreview: true, // 是否点击预览,
},
didMount() {
- debugger
- console.log(this.props)
},
didUpdate() {
},
didUnmount() {
- this.setData({
- customClass: this.props.customClass
- })
+
},
methods: {
//移除文件
diff --git a/components/hList/hList.acss b/components/hList/hList.acss
deleted file mode 100755
index 954803b..0000000
--- a/components/hList/hList.acss
+++ /dev/null
@@ -1,28 +0,0 @@
-.comHList {
- padding: 32rpx 32rpx 76rpx;
- display: flex;
- justify-content: space-around;
- flex-wrap: wrap;
-}
-
-.comHList-item-image {
- height: 84rpx;
- line-height: 84rpx;
- text-align: center
-}
-.comHList-item {
- margin-top: 44rpx;
-}
-.comHList-item-image>image {
- width: 84rpx;
- height: 100%;
- vertical-align: top;
-}
-
-.comHList-item-text {
- font-family: PingFangSC-Medium;
- font-size: 22rpx;
- color: rgba(27, 38, 61, 0.56);
- text-align: center;
- margin-top: 22rpx;
-}
\ No newline at end of file
diff --git a/components/hList/hList.axml b/components/hList/hList.axml
deleted file mode 100644
index 98bd9b2..0000000
--- a/components/hList/hList.axml
+++ /dev/null
@@ -1,10 +0,0 @@
-<view class="comHList">
- <view class="comHList-item" a:for="{{dataComList}}" catchTap="onSelectComHList" data-item="{{item}}">
- <view class="comHList-item-image" >
- <image mode="scaleToFill" src="{{item.imageUrl}}"/>
- </view>
- <view class="comHList-item-text">
- {{item.text}}
- </view>
- </view>
-</view>
\ No newline at end of file
diff --git a/components/hList/hList.js b/components/hList/hList.js
deleted file mode 100644
index 4ebc128..0000000
--- a/components/hList/hList.js
+++ /dev/null
@@ -1,14 +0,0 @@
-Component({
- mixins: [],
- data: {},
- props: {},
- didMount() { },
- didUpdate() { },
- didUnmount() { },
- methods: {
- onSelectComHList(event) {
- this.props.onSelectComHList(event)
-
- }
- },
-});
diff --git a/components/hList/hList.json b/components/hList/hList.json
deleted file mode 100644
index 32640e0..0000000
--- a/components/hList/hList.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "component": true
-}
\ No newline at end of file
diff --git a/components/shareList/shareList.acss b/components/shareList/shareList.acss
deleted file mode 100755
index e69de29..0000000
--- a/components/shareList/shareList.acss
+++ /dev/null
diff --git a/components/shareList/shareList.axml b/components/shareList/shareList.axml
deleted file mode 100644
index 27bfa9e..0000000
--- a/components/shareList/shareList.axml
+++ /dev/null
@@ -1,10 +0,0 @@
-<view class="comHList">
- <view class="comHList-item" a:for="{{dataComList}}" catchTap="onSelectComHList" data-item="{{item}}">
- <view class="comHList-item-image">
- <image mode="scaleToFill" src="{{item.imageUrl}}"/>
- </view>
- <view class="comHList-item-text">
- {{item.text}}
- </view>
- </view>
-</view>
\ No newline at end of file
diff --git a/components/shareList/shareList.js b/components/shareList/shareList.js
deleted file mode 100644
index 4ebc128..0000000
--- a/components/shareList/shareList.js
+++ /dev/null
@@ -1,14 +0,0 @@
-Component({
- mixins: [],
- data: {},
- props: {},
- didMount() { },
- didUpdate() { },
- didUnmount() { },
- methods: {
- onSelectComHList(event) {
- this.props.onSelectComHList(event)
-
- }
- },
-});
diff --git a/components/shareList/shareList.json b/components/shareList/shareList.json
deleted file mode 100644
index 32640e0..0000000
--- a/components/shareList/shareList.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "component": true
-}
\ No newline at end of file
diff --git a/pages/createMeeting/createMeeting.json b/pages/createMeeting/createMeeting.json
index ea981c4..3d95642 100644
--- a/pages/createMeeting/createMeeting.json
+++ b/pages/createMeeting/createMeeting.json
@@ -3,7 +3,6 @@
"usingComponents": {
"popup": "../../components/popup/index",
"list": "../../components/list/list",
- "hlist": "../../components/hList/hList",
"meeting-time-picker": "../../components/meetingTimePicker/meetingTimePicker"
}
}
\ No newline at end of file
diff --git a/pages/files/files.acss b/pages/files/files.acss
index 1adfb7f..eed6d70 100644
--- a/pages/files/files.acss
+++ b/pages/files/files.acss
@@ -2,14 +2,10 @@ page {
background: #Fff;
}
-.file-container {
- padding: 0 32rpx;
-}
-
.list-item {
- color: red
+ padding: 0.24rem 0.32rem 0px
}
-.noBorder {
- color: red
+.list-item .file-box {
+ margin-bottom: 0;
}
\ No newline at end of file
diff --git a/pages/files/files.axml b/pages/files/files.axml
index 6459f36..c8d7cdc 100644
--- a/pages/files/files.axml
+++ b/pages/files/files.axml
@@ -1,3 +1,3 @@
-<view class="file-container" a:for="{{[files]}}" customClass="noBorder">
- <file-list fileInfos="{{item}}"/>
+<view class="file-container" a:for="{{[files]}}">
+ <file-list showName="{{true}}" fileInfos="{{item}}" resetClass="resetClass" customClass="list-item"/>
</view>
\ No newline at end of file
diff --git a/pages/meetingDetail/meetingDetail.axml b/pages/meetingDetail/meetingDetail.axml
index 579cdad..38838c5 100644
--- a/pages/meetingDetail/meetingDetail.axml
+++ b/pages/meetingDetail/meetingDetail.axml
@@ -1,7 +1,7 @@
<!--<block a:if="{{getData}}"> -->
<import src="../../template/loading/loading.axml"/>
<block>
- <view class=" {{(popupShow || show || centerPopup.showCenterPopup || conToastData.showToast || conSelectPopupData.showSelectPopup )? 'metingDetail' : ''}}">
+ <view class=" {{(popup.show || selectPopup.show || centerPopup.show )? 'metingDetail' : ''}}">
<import src="../../template/deleteBtn/index.axml"/>
<view class="hideDetail" a:if="{{isExpand}}">
<view class="hideTitle">
diff --git a/pages/outLookContact/outLookContact.json b/pages/outLookContact/outLookContact.json
index c415273..b90307e 100644
--- a/pages/outLookContact/outLookContact.json
+++ b/pages/outLookContact/outLookContact.json
@@ -3,7 +3,6 @@
"usingComponents": {
"popup": "../../components/popup/index",
"list": "../../components/list/list",
- "hlist": "../../components/hList/hList",
"toast": "../../components/toast/toast",
"selectpopup": "../../components/selectPopup/selectPopup",
"centerpopup": "../../components/centerPopup/centerPopup",
diff --git a/pages/participantsDetail/participantsDetail.json b/pages/participantsDetail/participantsDetail.json
index 7b37bee..a3c680b 100644
--- a/pages/participantsDetail/participantsDetail.json
+++ b/pages/participantsDetail/participantsDetail.json
@@ -2,7 +2,6 @@
"usingComponents": {
"popup": "../../components/popup/index",
"list": "../../components/list/list",
- "hlist": "../../components/hList/hList",
"toast": "../../components/toast/toast",
"selectpopup": "../../components/selectPopup/selectPopup",
"centerpopup": "../../components/centerPopup/centerPopup",
diff --git a/pages/place/place.json b/pages/place/place.json
index 5555c71..929cbaa 100644
--- a/pages/place/place.json
+++ b/pages/place/place.json
@@ -3,7 +3,6 @@
"popup": "../../components/popup/index",
"centerpopup": "../../components/centerPopup/centerPopup",
"list": "../../components/list/list",
- "hlist": "../../components/hList/hList",
"toast": "../../components/toast/toast",
"selectpopup": "../../components/selectPopup/selectPopup",
"meeting-time-picker": "../../components/meetingTimePicker/meetingTimePicker"
diff --git a/pages/uploadFile/uploadFile.js b/pages/uploadFile/uploadFile.js
index 94530af..3be4551 100644
--- a/pages/uploadFile/uploadFile.js
+++ b/pages/uploadFile/uploadFile.js
@@ -50,7 +50,7 @@ create.Page({
size: it.fileSize,
spaceId: it.spaceId,
platform: "dingTalk",
- mimeType: it.fileType
+ mimeType: it.fileType,
})