faiz
/
hy-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-04-23 17:33:01 +08:00
parent 9a48d09805
commit 88a310dd71
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/merchant/application/merInfo.vue
View File

@ -235,10 +235,10 @@
<div>实际经营地址：</div> <div>实际经营地址：</div>
<div class="value">{{merData.biz.address_true}}</div> <div class="value">{{merData.biz.address_true}}</div>
</li> </li>
<li class="item"> <!-- <li class="item">
<div>实际经营范围：</div> <div>实际经营范围：</div>
<div class="value">{{merData.biz.businessScope}}</div> <div class="value">{{merData.biz.businessScope}}</div>
</li> </li> -->
</ul> </ul>
</div> </div>
</el-tab-pane> </el-tab-pane>

38
src/views/merchant/list/handle/merEditForm.vue
View File

@ -300,34 +300,36 @@
<el-row :gutter="24" class="mt20"> <el-row :gutter="24" class="mt20">
<el-col v-if="!isAdd":span="8"> <el-col v-if="!isAdd":span="8">
<el-form-item label="保证金支付状态："> <el-form-item label="保证金支付状态：">
<span>{{merData.ot_margin-merData.margin>=0 ? '已缴' : '待缴' }}</span> <span>{{merData.is_margin == 1?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="!isAdd" :span="8"> <el-col v-if="!isAdd" :span="8">
<el-form-item label="技术服务费支付状态：" label-width="142px"> <el-form-item label="技术服务费支付状态：" label-width="142px">
<span>{{merData.ot_service_cost-merData.service_cost>=0 ? '已缴' : '待缴'}}</span> <span>{{merData.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '已缴' : '待缴':'无'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="!isAdd" :span="8"> <el-col v-if="!isAdd" :span="8">
<el-form-item label="上架费支付状态："> <el-form-item label="上架费支付状态：">
<span>{{merData.ot_goods_cost-merData.goods_cost>=0 ? '已缴' : '待缴'}}</span> <span>{{merData.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '已缴' : '待缴':'无'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" class="mt20"> <el-row :gutter="24" class="mt20">
<el-col v-if="!isAdd" :span="8"> <el-col v-if="!isAdd" :span="8">
<el-form-item label="保证金余额："> <el-form-item label="保证金应缴费用：">
<span>{{merData.ot_margin-merData.margin}}</span> <span>{{merData.is_margin == 1?(merData.ot_margin<+merData.margin)?merData.margin:(merData.ot_margin-merData.margin):'0'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="!isAdd" :span="8"> <el-col v-if="!isAdd" :span="8">
<el-form-item label="技术服务费余额："> <el-form-item label="技术服务费应缴费用：" label-width="150px">
<span>{{merData.ot_service_cost-merData.service_cost}}</span> <span>{{merData.is_service == 1?(merData.ot_service_cost<+merData.service_cost)?merData.service_cost:(merData.ot_service_cost-merData.service_cost):'0'}}</span>
<!-- <span>{{merData.ot_service_cost-merData.service_cost}}</span> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="!isAdd" :span="8"> <el-col v-if="!isAdd" :span="8">
<el-form-item label="上架费余额："> <el-form-item label="上架费应缴费用：">
<span>{{merData.ot_goods_cost-merData.goods_cost}}</span> <span>{{merData.is_goods == 1?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}}</span>
<!-- <span>{{merData.ot_goods_cost-merData.goods_cost}}</span> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -448,22 +450,32 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="!isAdd" :span="12"> <el-col v-if="!isAdd" :span="12">
<el-form-item label="联系人：" prop="real_name"> <el-form-item label="联系人：" prop="ext.com.contact" v-if="merData.ext&&merData.ext.com">
<el-input <el-input
type="text" type="text"
size="small" size="small"
placeholder="请填写联系人" placeholder="请填写联系人"
v-model="merData.real_name" v-model="merData.ext.com.contact"
class="selWidth" class="selWidth"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话：" prop="mer_phone"> <el-form-item label="联系电话：" prop="ext.com.mobile" v-if="merData.ext&&merData.ext.com">
<el-input <el-input
size="small" size="small"
placeholder="请填写联系电话" placeholder="请填写联系电话"
v-model="merData.mer_phone" v-model="merData.ext.com.mobile"
class="selWidth"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="对接人身份证号：" prop="ext.com.number" v-if="merData.ext&&merData.ext.com">
<el-input
size="small"
placeholder="请填写联系电话"
v-model="merData.ext.com.number"
class="selWidth" class="selWidth"
/> />
</el-form-item> </el-form-item>

16
src/views/merchant/list/handle/merInfo.vue
View File

@ -70,29 +70,29 @@
</li> --> </li> -->
</ul> </ul>
<div class="title" style="margin-top: 10px;">银行卡信息</div> <div class="title" style="margin-top: 10px;">银行卡信息</div>
<ul class="list" v-if="merData.ext"> <ul class="list" v-if="merData.financial_bank">
<li class="item"> <li class="item">
<div>名称：</div> <div>名称：</div>
<div class="value"> <div class="value">
{{merData.ext.bank&&merData.ext.bank.bankName}} {{merData.financial_bank.name}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>开户银行：</div> <div>开户银行：</div>
<div class="value"> <div class="value">
{{merData.ext.bank&&merData.ext.bank.bankCard}} {{merData.financial_bank.bank}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>开户卡号：</div> <div>开户卡号：</div>
<div class="value"> <div class="value">
{{merData.ext.bank&&merData.ext.bank.bankBranchName}} {{merData.financial_bank.bank_code}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>联行号：</div> <div>联行号：</div>
<div class="value"> <div class="value">
{{merData.ext.bank&&merData.ext.bank.CNAPS}} {{merData.financial_bank.inter_bank}}
</div> </div>
</li> </li>
</ul> </ul>
@ -169,13 +169,13 @@
</li> --> </li> -->
</ul> </ul>
<div class="section item" style="border: none;"> <div class="section item" style="border: none;">
费用额度：保证金{{merData.is_margin == 0 ? '无' : merData.ot_margin}}，技术服务费{{merData.is_service == 0 ? '无' : merData.ot_service_cost}}，上架费{{merData.is_goods == 0 ? '无' : merData.ot_goods_cost}} 费用额度：保证金：{{merData.is_margin == 0 ? '无' : merData.ot_margin}}，技术服务费：{{merData.is_service == 0 ? '无' : merData.ot_service_cost}}，上架费：{{merData.is_goods == 0 ? '无' : merData.ot_goods_cost}}
</div> </div>
<div class="section item" style="border: none;"> <div class="section item" style="border: none;">
费用余额：保证金{{merData.margin}}，技术服务费{{merData.service_cost == 0 ? '无' : merData.service_cost}}，上架费{{merData.goods_cost == 0 ? '无' : merData.goods_cost}} 费用余额：保证金：{{merData.margin== 0 ? '无' : merData.margin}}，技术服务费：{{merData.service_cost == 0 ? '无' : merData.service_cost}}，上架费：{{merData.goods_cost == 0 ? '无' : merData.goods_cost}}
</div> </div>
<div class="section item" style="border: none;"> <div class="section item" style="border: none;">
支付状态：保证金{{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }}，技术服务费{{merData.is_service == 1 ? '待缴' : merData.is_service == 0 ? '无' : '已缴' }}，上架费{{merData.is_goods == 1 ? '待缴' : merData.is_goods == 0 ? '无' : '已缴' }} 支付状态：保证金：{{merData.ot_margin-merData.margin>=0 ? '已缴' : '待缴' }}，技术服务费：{{merData.ot_service_cost-merData.service_cost>=0 ? '已缴' : '待缴'}}，上架费：{{merData.ot_goods_cost-merData.goods_cost>=0 ? '已缴' : '待缴'}}
</div> </div>
</div> </div>
<div class="section"> <div class="section">