|
|
|
|
@ -33,8 +33,8 @@
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<u-popup v-model="modalApplyData.isShow" mode="center" border-radius="14" width="80%" :closeable='true'>
|
|
|
|
|
<view>
|
|
|
|
|
<u-popup v-model="modalApplyData.isShow" mode="bottom" border-radius="14" width="80%" :closeable='true'>
|
|
|
|
|
<view style="max-height: calc(100vh - 200px);overflow-y: auto;">
|
|
|
|
|
<view class="g_flex_c g_h_40 g_fs_16">申请合并</view>
|
|
|
|
|
<view>
|
|
|
|
|
<view>
|
|
|
|
|
@ -71,6 +71,7 @@
|
|
|
|
|
<g-button type='primary' size='small' btnText='提交'></g-button>
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="g_h_20"></view>
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
</u-popup>
|
|
|
|
|
|
