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-25 10:08:23 +08:00
parent afb4afee31
commit 1f608dc7ab
6 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/merchant/application/index.vue
View File

@ -13,7 +13,7 @@
<el-option label="全部" value=""/> <el-option label="全部" value=""/>
<el-option label="待审核" value="0"/> <el-option label="待审核" value="0"/>
<el-option label="审核通过" value="1"/> <el-option label="审核通过" value="1"/>
<el-option label="审核未通过" value="-1"/> <el-option label="审核未通过" value="2"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="选择时间："> <el-form-item label="选择时间：">

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

@ -172,6 +172,9 @@ export default {
initData(){ initData(){
this.merData = { this.merData = {
is_trader:0, is_trader:0,
is_margin:0,
is_service:0,
is_goods:0,
financial_bank:{ financial_bank:{
name:'', name:'',
bank:'', bank:'',

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

@ -240,16 +240,17 @@
<el-form-item label="技术服务费：" label-width="146px"> <el-form-item label="技术服务费：" label-width="146px">
<el-radio-group v-model="merData.is_service"> <el-radio-group v-model="merData.is_service">
<el-radio :label="0" class="radio">无</el-radio> <el-radio :label="0" class="radio">无</el-radio>
<el-radio :label="1">有</el-radio> <el-radio v-if="merData.is_service!=10" :label="1">有</el-radio>
<el-radio v-else :label="10">有</el-radio>
</el-radio-group> </el-radio-group>
<span v-if="merData.is_service == 1"> <span v-if="merData.is_service != 0">
<el-input <el-input
v-model="merData.service_cost" v-model="merData.service_cost"
placeholder="请填写技术服务费" placeholder="请填写技术服务费"
style="width:120px;margin-left: 8px;" style="width:120px;margin-left: 8px;"
/> 元, /> 元,
</span> </span>
<span v-if="merData.is_service == 1"> <span v-if="merData.is_service != 0">
额度 额度
<el-input <el-input
v-model="merData.ot_service_cost" v-model="merData.ot_service_cost"
@ -263,16 +264,17 @@
<el-form-item label="上架费：" label-width="146px"> <el-form-item label="上架费：" label-width="146px">
<el-radio-group v-model="merData.is_goods"> <el-radio-group v-model="merData.is_goods">
<el-radio :label="0" class="radio">无</el-radio> <el-radio :label="0" class="radio">无</el-radio>
<el-radio :label="1">有</el-radio> <el-radio v-if="merData.is_goods!=10" :label="1">有</el-radio>
<el-radio v-else :label="10">有</el-radio>
</el-radio-group> </el-radio-group>
<span v-if="merData.is_goods == 1"> <span v-if="merData.is_goods != 0">
<el-input <el-input
v-model="merData.goods_cost" v-model="merData.goods_cost"
placeholder="请填写上架费" placeholder="请填写上架费"
style="width:120px;margin-left: 8px;" style="width:120px;margin-left: 8px;"
/> 元, /> 元,
</span> </span>
<span v-if="merData.is_goods == 1"> <span v-if="merData.is_goods != 0">
额度 额度
<el-input <el-input
v-model="merData.ot_goods_cost" v-model="merData.ot_goods_cost"
@ -300,35 +302,35 @@
<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.is_margin == 1?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }}</span> <span>{{merData.is_margin != 0?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.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}}</span> <span>{{merData.is_service != 0?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.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}}</span> <span>{{merData.is_goods != 0?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.is_margin == 1?(merData.ot_margin<+merData.margin)?merData.margin:(merData.ot_margin-merData.margin):'0'}}</span> <span>{{merData.is_margin != 0?(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="技术服务费应缴费用：" label-width="150px"> <el-form-item label="技术服务费应缴费用：" label-width="150px">
<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.is_service != 0?(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> --> <!-- <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.is_goods == 1?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}}</span> <span>{{merData.is_goods != 0?(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> --> <!-- <span>{{merData.ot_goods_cost-merData.goods_cost}}</span> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -449,22 +451,22 @@
</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="ext.com.contact" v-if="merData.ext&&merData.ext.com"> <el-form-item label="联系人：" prop="real_name">
<el-input <el-input
type="text" type="text"
size="small" size="small"
placeholder="请填写联系人" placeholder="请填写联系人"
v-model="merData.ext.com.contact" v-model="merData.real_name"
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="ext.com.mobile" v-if="merData.ext&&merData.ext.com"> <el-form-item label="联系电话：" prop="mer_phone">
<el-input <el-input
size="small" size="small"
placeholder="请填写联系电话" placeholder="请填写联系电话"
v-model="merData.ext.com.mobile" v-model="merData.mer_phone"
class="selWidth" class="selWidth"
/> />
</el-form-item> </el-form-item>

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

@ -175,9 +175,9 @@
费用余额：保证金：{{merData.margin== 0 ? '无' : 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.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }}， 支付状态：保证金：{{ marginNumber }}，
技术服务费：{{merData.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}}， 技术服务费：{{ serviceNumber }}，
上架费：{{merData.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}} 上架费：{{ goodsNumber }}
</div> </div>
</div> </div>
<div class="section"> <div class="section">
@ -385,7 +385,16 @@ export default {
computed: { computed: {
companyImage(){ companyImage(){
return this.merData.ext?.company_image return this.merData.ext?.company_image
} },
marginNumber(){
return this.merData.is_margin == 0?'无':this.merData.ot_margin-this.merData.margin>0 ? '待缴' : '已缴'
},
serviceNumber(){
return this.merData.is_service == 0?'无':this.merData.ot_service_cost-this.merData.service_cost>0 ? '待缴' : '已缴'
},
goodsNumber(){
return this.merData.is_goods == 0?'无':this.merData.ot_goods_cost-this.merData.goods_cost>0 ? '待缴' : '已缴'
},
}, },
methods: { methods: {
lookImg(item) { lookImg(item) {

2
src/views/merchant/list/index.vue
View File

@ -324,7 +324,7 @@ export default {
merchantLoginApi(id) merchantLoginApi(id)
.then(res => { .then(res => {
Cookies.set("merchantToken", res.data.token); Cookies.set("merchantToken", res.data.token);
window.open(SettingMer.httpUrl + res.data.url); window.open(`${location.origin}${res.data.url}`);
}) })
.catch(res => { .catch(res => {
this.$message.error(res.message); this.$message.error(res.message);

2
src/views/setting/devise/list.vue
View File

@ -143,7 +143,7 @@ export default {
imgUrl:'', imgUrl:'',
tabPosition: "left", tabPosition: "left",
modal: false, modal: false,
BaseURL: SettingMer.httpUrl || 'http://localhost:8080', BaseURL: `${location.origin}` || 'http://localhost:8080',
cardShow: 0, cardShow: 0,
loadingExist: false, loadingExist: false,
isDiy: 1, isDiy: 1,