|
|
|
|
@ -14,6 +14,22 @@
|
|
|
|
|
height="76"
|
|
|
|
|
></u-tabs>
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
<!-- 收到的 -->
|
|
|
|
|
<div class="m-recives-obj">
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
<!-- 申请/发起 -->
|
|
|
|
|
<view class="m-applys-obj">
|
|
|
|
|
<view class="m-aform g_flex_row_start g_h_60">
|
|
|
|
|
<view class="g_flex_none g_flex_c label">
|
|
|
|
|
<i class="iconfont icon-jia1 icon"></i>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="g_flex_1 g_flex_column_center value">申请合并</view>
|
|
|
|
|
</view>
|
|
|
|
|
<div class="m-alist"></div>
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
</view>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
@ -67,4 +83,25 @@ export default {
|
|
|
|
|
};
|
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
<style></style>
|
|
|
|
|
<style lang="less">
|
|
|
|
|
.p-person-marge{
|
|
|
|
|
.m-applys-obj{
|
|
|
|
|
.m-aform{
|
|
|
|
|
width: calc(100% - 52px);
|
|
|
|
|
margin: 10px auto;
|
|
|
|
|
background-color: #fff;
|
|
|
|
|
padding: 0 16px;
|
|
|
|
|
border-radius: 8px;
|
|
|
|
|
.label{
|
|
|
|
|
.icon{
|
|
|
|
|
font-size: 20px;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.value{
|
|
|
|
|
margin-left: 10px;
|
|
|
|
|
font-size: 16px;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
</style>
|
|
|
|
|
|
