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

add

This commit is contained in:
faiz 2024-04-18 11:07:04 +08:00
parent fcd3170f12
commit c39bf92d3f
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/merchant/list/handle/merDetails.vue
View File

@ -175,6 +175,9 @@ export default {
name:'',
bank:'',
bank_code:'',
},
ext:{
com:{}
}
}
this.isEdit = false;

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

@ -516,6 +516,9 @@ export default {
mer_name: [
{ required: true, message: '请输入商户名称', trigger: 'blur' }
],
'ext.com.contact': [
{ required: true, message: '请输入企业名称', trigger: 'blur' }
],
mer_account: [
{ required: true, message: '请输入商户账号', trigger: 'blur' }
],

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

@ -115,7 +115,7 @@
<span class="info info-red">(注：此处如未设置手续费，系统会自动读取商户分类下对应手续费；此处已设置，则优先以此处设置为准)</span>
</div>
</li>
<li class="item">
<!-- <li class="item">
<div>店铺保证金：</div>
<div class="value">
{{merData.is_margin == 0 ? '无' : merData.ot_margin}}
@ -166,8 +166,17 @@
<li v-if="merData.is_margin != 0" class="item">
<div>保证金余额：</div>
<div class="value">{{merData.margin}}</div>
</li>
</li> -->
</ul>
<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}}
</div>
<div class="section item" style="border: none;">
费用余额：保证金{{merData.margin}}，技术服务费{{merData.service_cost == 0 ? '无' : merData.service_cost}}，上架费{{merData.goods_cost == 0 ? '无' : merData.goods_cost}}
</div>
<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 ? '无' : '已缴' }}
</div>
</div>
<div class="section">
<div class="title">审核信息</div>

12
src/views/product/productExamine/editAttr.vue
View File

@ -110,8 +110,8 @@
</el-table-column>
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
<template slot-scope="scope">
<el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" />
<el-input v-else @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/>
<el-input @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" type="text" class="priceBox" />
<!-- <el-input v-else @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/> -->
</template>
</el-table-column>
<template v-if="formValidate.extension_type === 1">
@ -149,8 +149,9 @@
</el-table-column>
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
<template slot-scope="scope">
<el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" />
<el-input v-else @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/>
<el-input @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" type="text" class="priceBox" />
<!-- <el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" /> -->
<!-- <el-input v-else @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/> -->
</template>
</el-table-column>
<template v-if="formValidate.extension_type === 1">
@ -378,6 +379,9 @@ export default {
case 'growth':
val.growth=val.growth.replace(/[^\d]/g,'')
break;
case 'bar_code':
val.bar_code = val.bar_code.replace(/[\W]/g,'')
break;
}
},
batchDel() {