dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
Showing only changes of commit 322fd727e0 - Show all commits

View File

@ -574,7 +574,7 @@
<el-step title="店铺创建状态" :description="form.store_status == 1 ? '已创建' : '未创建'"></el-step>
<el-step title="分账业务申请状态" :description="form.has_apply_split == 1 ? '已申请' : '未申请'"></el-step>
<el-step title="分账接收方绑定状态" :description="form.has_apply_split == 1 ? '已绑定' : '未绑定'"></el-step>
<el-step title="入驻完成" :description="form.approval_status == 1 ? '未完成' : '已完成'"></el-step>
<el-step title="入驻完成" :description="form.approval_status == 1 ? '已完成' : '未完成'"></el-step>
</el-steps>
<!-- <div class="item-info">
<div class="item-block">
@ -980,7 +980,7 @@ export default {
form.store_status === 1 &&
form.has_apply_split === 1 &&
form.has_bind_receiver === 1) {
return 6; //
return 7; //
}
// 6.