dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端

Browse Source
This commit is contained in:
xvv 2024-07-29 17:19:26 +08:00
parent f4b2131c82
commit f0b030a64c
4 changed files with 5 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin_zt/src/views/Service/details.vue
View File

@ -4,7 +4,7 @@
<div class="top_">
<div class="tab-box" :class="tabindex == index ? 'active' : ''" v-for="(item,index) in tabList" :key="index" @click="gettab(index)" >
<div class="tab-boxs" :class="tabindex == index ? 'active' : ''" v-for="(item,index) in tabList" :key="index" @click="gettab(index)" >
{{item.title}}
</div>
</div>
@ -134,7 +134,7 @@
color: #FF9655 !important;
border-bottom: 2px solid #FF9655 !important;
}
.tab-box{
.tab-boxs{
color: #999999;
font-size: 14px;
height: 40px;

2
fuintAdmin_zt/src/views/Site/add.vue
View File

@ -428,9 +428,7 @@ export default {
}
.demo-ruleForm {
display: flex;
align-items: center;
}
.center-box {

116
fuintAdmin_zt/src/views/components/Service/payment.vue
View File

@ -13,7 +13,6 @@
</div>
<el-table
:data="merchantList"
border
style="width: 100%">
<el-table-column
@ -269,7 +268,7 @@
v-if=" formRule.ruleType == 1">
<div class="list-box">
<el-form-item label="支付通道" :label-width="formLabelWidth">
<el-select v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 300px"
<el-select prop="merchConfigId" v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 300px"
@change="chooseMerchConfig(item.merchConfigId,index)">
<el-option
v-for="(item1,i) in merchantList"
@ -289,7 +288,7 @@
</el-input>
</el-form-item>
</div>
<i class="el-icon-delete" style="font-size: 28px;margin-left: 15px" @click="deleteDoxlist(index)"></i>
<i class="el-icon-delete" style="font-size: 28px;margin-left: 15px; color: #999999 " @click="deleteDoxlist(index)"></i>
</div>
<div class="d-s" v-for="(item,index) in formRule.ruleList" :key="index" style="margin-bottom: 15px"
v-if=" formRule.ruleType == 2">
@ -344,9 +343,6 @@
style="width: 100%;"></el-date-picker>
</el-form-item>
<div style="width: 15px"></div>
<!-- <el-form-item prop="date2">-->
<!-- <el-time-picker placeholder="选择时间" v-model="ruleForm.date2" style="width: 100%;"></el-time-picker>-->
<!-- </el-form-item>-->
</div>
<div style="margin-left: 80px">启用成功后其他规则的规则状态变为停用！</div>
@ -359,114 +355,6 @@
<el-button type="primary" @click="submitEnable('qy')">确 定</el-button>
</div>
</el-dialog>
<!-- <div style="width: 100%;display: flex">-->
<!-- <el-alert-->
<!-- title="说明"-->
<!-- type="error"-->
<!-- description="为了保证加油站商户日常在线支付业务的稳定性，来个油惠目前支持多通道支付-->
<!-- 可以有效的避免单支付通道带来不稳定性，从而造成油站不能正常支付问题-->
<!-- 加油站一旦出现不能正常支付的情况，可以随时手工切换支付通道，来保证加油站支付收款业务"-->
<!-- :closable="false"-->
<!-- >-->
<!-- </el-alert>-->
<!-- <div style="width: 150%;display: flex;justify-content: right">-->
<!-- <div class="mingc">功能状态</div>-->
<!-- <el-switch-->
<!-- v-model="value1"-->
<!-- @change="changeStatus1"-->
<!-- >-->
<!-- </el-switch>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div style="margin-top: 20px"><el-button type="primary" icon="el-icon-plus" v-hasPermi="['Merchant:add']" @click="addMerchant">添加商户信息</el-button></div>-->
<!-- <div class="content-box">-->
<!--&lt;!&ndash; <el-card class="box-card" shadow="hover" v-for="(item,index) in 10" :key="index">&ndash;&gt;-->
<!--&lt;!&ndash; <div slot="header" class="clearfix">&ndash;&gt;-->
<!--&lt;!&ndash; <span>卡片名称</span>&ndash;&gt;-->
<!--&lt;!&ndash; <el-button style="float: right; padding: 3px 0" type="text">切换为当前通道</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!--&lt;!&ndash; <div>商户编号:1861975</div>&ndash;&gt;-->
<!--&lt;!&ndash; </el-card>&ndash;&gt;-->
<!-- <el-card class="box-card" shadow="hover" v-for="item in merchantList" :key="item.id">-->
<!-- <div slot="header" class="clearfix">-->
<!-- <span><dict-tag :options="dict.type.payment_channel" :value="item.merchantName"/></span>-->
<!-- <el-button v-if="item.isUse=='0'"-->
<!-- @click="editStatus(item,1)"-->
<!-- style="float: right; padding: 3px 0" type="text">切换为当前通道</el-button>-->
<!-- <el-tag v-else effect="dark" type="success" style="float: right">当前使用中</el-tag>-->
<!-- </div>-->
<!-- <div>商户编号: {{ item.mchntCd }}</div>-->
<!-- <div style="margin-top: 5px;display: flex;justify-content: space-between">-->
<!-- <span>-->
<!-- 备注: <span style="color: #00afff;margin-left: 3px" @click="editRemark(item.id)">{{ item.remark ? item.remark : "&#45;&#45;" }}</span>-->
<!-- </span>-->
<!-- <span>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(item)"-->
<!-- v-hasPermi="['Merchant:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(item)"-->
<!-- v-hasPermi="['Merchant:delete']"-->
<!-- >删除</el-button>-->
<!-- </span>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </div>-->
<!-- <el-divider></el-divider>-->
<!-- <div class="cont-box">-->
<!-- <div style="width: 40%">-->
<!-- <el-alert-->
<!-- title="使用说明"-->
<!-- type="error"-->
<!-- description="添加/编辑对应的规则->规则配置正常->发布规则->规则生效-->
<!--注意:功能状态启用且通道规则发布生效后当前功能才有效,否则使用系统单商户号模式"-->
<!-- :closable="false"-->
<!-- >-->
<!-- </el-alert>-->
<!-- </div>-->
<!-- <div style="display: flex;align-items: center">-->
<!-- <div class="mingc">规则周期</div>-->
<!-- <el-radio-group v-model="labelPosition" @input="ruleCycle == labelPosition" size="small">-->
<!-- <el-radio-button label="permanent">永久</el-radio-button>-->
<!-- <el-radio-button label="singleDay">单日</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- <div class="mingc">功能状态</div>-->
<!-- <el-switch-->
<!-- v-model="value"-->
<!-- @change="changeStatus"-->
<!-- >-->
<!-- </el-switch>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="cont-box" >-->
<!-- <div><el-button type="primary" icon="el-icon-plus"-->
<!-- v-hasPermi="['payment:add']" @click="addOil">添加规则</el-button></div>-->
<!-- <div><el-button type="success" icon="el-icon-s-promotion" @click="open">发布规则</el-button></div>-->
<!-- </div>-->
<!-- <div class="hangbox" v-for="(item,index) in oilConfigList" :key="item.id">-->
<!-- <div>{{index + 1}}.通道</div>-->
<!-- <div class="jiaong">{{ item.merchantName }}({{ item.remark }})</div>-->
<!-- <div> 商户号 </div>-->
<!-- <div class="jiaong">{{ item.mchntCd }}</div>-->
<!-- <div> 交易占比 </div>-->
<!-- <div class="jiaong"> {{ item.proportion }} </div>-->
<!-- <div style="margin-right: 20px"> %更换支付通道 </div>-->
<!-- <el-button type="primary" icon="el-icon-edit"-->
<!-- v-hasPermi="['payment:edit']" @click="editOilConfig(item.id)">编辑</el-button>-->
<!-- <el-button type="danger" icon="el-icon-close"-->
<!-- v-hasPermi="['payment:delete']" @click="deleteOilConfig(item.id)">删除</el-button>-->
<!-- </div>-->
<!-- <div class="hsize">注:规则按照顺序进行处理并自动更换支付通道，新增或变更规则后需要发布当前规则才生效,发布生效后的规则将从序号1的配置生效</div>-->
<el-dialog :title="title" :visible.sync="dialogVisible" width="30%">
<el-form :model="form1" ref="form1" :rules="rules">

1
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
View File

@ -13,7 +13,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="" style="float: right;">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>