Commit 77617d37 authored by Damon's avatar Damon

merge

parents d13d82df 397937e2
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.upload-progress { .upload-progress {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
<!-- 悬浮按钮 --> <!-- 悬浮按钮 -->
<!-- <EusingList /> --> <!-- <EusingList /> -->
</view> </view>
<upload-progress />
</TabBarPage> </TabBarPage>
</template> </template>
......
...@@ -315,6 +315,7 @@ ...@@ -315,6 +315,7 @@
:cancel-btn="true" :cancel-btn="true"
@click="uploadSelect" @click="uploadSelect"
></u-action-sheet> ></u-action-sheet>
<upload-progress />
</view> </view>
</template> </template>
<script> <script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment