kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/build' into build

Browse Source
This commit is contained in:
aixianling
2023-03-07 09:44:57 +08:00
parent acd7915be4 5f6e420460
commit 8bce4caa97
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/wxwork/Announce/AppAnnounce/components/Add.vue
View File

@@ -281,7 +281,7 @@
<el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button> <el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button>
</div> </div>
</ai-dialog> </ai-dialog>
<ChooseMaterial ref="ChooseMaterial" :instance="instance"></ChooseMaterial> <!-- <ChooseMaterial ref="ChooseMaterial" :instance="instance"></ChooseMaterial> -->
</div> </div>
</template> </template>
<template #footer> <template #footer>
@@ -294,7 +294,7 @@
<script> <script>
import Phone from './Phone' import Phone from './Phone'
import ChooseMaterial from '../../../AppMaterialLibrary/components/ChooseMaterial.vue' // import ChooseMaterial from '../../../AppMaterialLibrary/components/ChooseMaterial.vue'
import { mapActions, mapState } from 'vuex' import { mapActions, mapState } from 'vuex'
export default { export default {
@@ -308,7 +308,7 @@ export default {
components: { components: {
Phone, Phone,
ChooseMaterial // ChooseMaterial
}, },
data() { data() {

2
packages/wxwork/AppMaterialLibrary/components/List.vue
View File

@@ -322,6 +322,8 @@
...this.form, ...this.form,
type: this.currIndex, type: this.currIndex,
fileUrl: this.form.fileUrl.length ? this.form.fileUrl[0].url : '', fileUrl: this.form.fileUrl.length ? this.form.fileUrl[0].url : '',
fileId: this.form.fileUrl.length ? this.form.fileUrl[0].id : '',
pictureId: this.form.pictureUrl.length ? this.form.pictureUrl[0].id : '',
pictureUrl: this.form.pictureUrl.length ? this.form.pictureUrl[0].url : '', pictureUrl: this.form.pictureUrl.length ? this.form.pictureUrl[0].url : '',
fileSize: this.form.fileUrl.length ? this.form.fileUrl[0].fileSize : '', fileSize: this.form.fileUrl.length ? this.form.fileUrl[0].fileSize : '',
}).then(res => { }).then(res => {