|
@ -35,7 +35,8 @@ |
|
|
|
|
|
|
|
|
<el-row :gutter="10" class="mb8"> |
|
|
<el-row :gutter="10" class="mb8"> |
|
|
<el-col :span="1.5" style="margin-left:15px"> |
|
|
<el-col :span="1.5" style="margin-left:15px"> |
|
|
<el-button type="primary" plain icon="" size="medium" @click="handleAdd()">新增商户</el-button> |
|
|
<el-button type="primary" plain icon="" size="medium" @click="handleAdd()" |
|
|
|
|
|
v-hasPermi="['system:merchant:add']">新增商户</el-button> |
|
|
</el-col> |
|
|
</el-col> |
|
|
</el-row> |
|
|
</el-row> |
|
|
|
|
|
|
|
@ -84,7 +85,7 @@ |
|
|
<el-table-column label="状态" align="center" prop="status" width="140px"> |
|
|
<el-table-column label="状态" align="center" prop="status" width="140px"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<el-switch v-model="scope.row.status" active-text="开" inactive-text="关" :active-value="1" :inactive-value="0" |
|
|
<el-switch v-model="scope.row.status" active-text="开" inactive-text="关" :active-value="1" :inactive-value="0" |
|
|
@change="switchStatusChange(scope.row, 'status')"> |
|
|
@change="switchStatusChange(scope.row, 'status')" v-hasPermi="['system:merchant:edit']"> |
|
|
</el-switch> |
|
|
</el-switch> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
@ -111,19 +112,23 @@ |
|
|
|
|
|
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="200"> |
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="200"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<el-button size="small" type="text" @click="handleDeleteMer(scope.row)" |
|
|
<el-button size="small" type="text" @click="handleDeleteMer(scope.row)" style="color: #006eff" |
|
|
style="color: #006eff">商户删除</el-button> |
|
|
v-hasPermi="['system:merchant:del']">商户删除</el-button> |
|
|
<el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff">通道</el-button> |
|
|
<el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff" |
|
|
|
|
|
v-hasPermi="['system:merchantChannel:getChannel']">通道</el-button> |
|
|
<!-- <el-button size="small" type="text" @click="handleWithdraw(scope.row)" style="color: #006eff">提现</el-button> --> |
|
|
<!-- <el-button size="small" type="text" @click="handleWithdraw(scope.row)" style="color: #006eff">提现</el-button> --> |
|
|
<el-button size="small" type="text" @click="handlePassword(scope.row, 'loginPassword')" |
|
|
<el-button size="small" type="text" @click="handlePassword(scope.row, 'loginPassword')" style="color: #006eff" |
|
|
style="color: #006eff">登录密码</el-button> |
|
|
v-hasPermi="['system:merchant:editLoginPwd']">登录密码</el-button> |
|
|
<el-button size="small" type="text" @click="handlePassword(scope.row, 'payPassword')" |
|
|
<el-button size="small" type="text" @click="handlePassword(scope.row, 'payPassword')" style="color: #006eff" |
|
|
style="color: #006eff">支付密码</el-button> |
|
|
v-hasPermi="['system:merchant:editPayPwd']">支付密码</el-button> |
|
|
|
|
|
|
|
|
<el-button size="small" type="text" @click="handleBalance(scope.row)" style="color: #006eff">余额</el-button> |
|
|
<el-button size="small" type="text" @click="handleBalance(scope.row)" style="color: #006eff" |
|
|
|
|
|
v-hasPermi="['system:merchant:operatingBalance']">余额</el-button> |
|
|
|
|
|
|
|
|
<el-button size="small" type="text" @click="handleUpdate(scope.row)" style="color: #006eff">编辑</el-button> |
|
|
<el-button size="small" type="text" @click="handleUpdate(scope.row)" style="color: #006eff" |
|
|
<el-button size="small" type="text" @click="handleControl(scope.row)" style="color: #006eff">风控</el-button> |
|
|
v-hasPermi="['system:merchant:edit']">编辑</el-button> |
|
|
|
|
|
<el-button size="small" type="text" @click="handleControl(scope.row)" style="color: #006eff" |
|
|
|
|
|
v-hasPermi="['system:merchant:getMerchantWindControl']">风控</el-button> |
|
|
|
|
|
|
|
|
<!-- <el-button size="small" type="text" @click="handleMD5(scope.row)" style="color: #006eff">MD5</el-button> --> |
|
|
<!-- <el-button size="small" type="text" @click="handleMD5(scope.row)" style="color: #006eff">MD5</el-button> --> |
|
|
<!-- <el-button size="small" type="text" @click="handleKey(scope.row)" style="color: #006eff">谷歌密钥</el-button> --> |
|
|
<!-- <el-button size="small" type="text" @click="handleKey(scope.row)" style="color: #006eff">谷歌密钥</el-button> --> |
|
@ -335,18 +340,21 @@ |
|
|
|
|
|
|
|
|
<el-form-item label="谷歌秘钥" prop="merchantNo"> |
|
|
<el-form-item label="谷歌秘钥" prop="merchantNo"> |
|
|
<span>{{ form.googleCaptcha }}</span> |
|
|
<span>{{ form.googleCaptcha }}</span> |
|
|
<el-button type="primary" @click="submitForm('googleKey')" style="margin-left: 10px">重 置</el-button> |
|
|
<el-button type="primary" @click="submitForm('googleKey')" style="margin-left: 10px" |
|
|
|
|
|
v-hasPermi="['system:merchant:resetGoogleSecret']">重 置</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item label="密钥" prop="merchantNo"> |
|
|
<el-form-item label="密钥" prop="merchantNo"> |
|
|
<span>{{ form.md5Key }}</span> |
|
|
<span>{{ form.md5Key }}</span> |
|
|
<el-button type="primary" @click="submitForm('MD5')" style="margin-left: 10px">重 置</el-button> |
|
|
<el-button type="primary" @click="submitForm('MD5')" style="margin-left: 10px" |
|
|
|
|
|
v-hasPermi="['system:merchant:resetMd5Key']">重 置</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item label="谷歌验证码" prop="code"> |
|
|
<el-form-item label="谷歌验证码" prop="code"> |
|
|
<el-input v-model="form.code" placeholder="请输入谷歌验证码" /> |
|
|
<el-input v-model="form.code" placeholder="请输入谷歌验证码" /> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<div slot="footer" class="dialog-footer"> |
|
|
<div slot="footer" class="dialog-footer"> |
|
|
<el-button type="primary" @click="submitForm('formControl')">保 存</el-button> |
|
|
<el-button type="primary" @click="submitForm('formControl')" |
|
|
|
|
|
v-hasPermi="['system:merchant:resetMerchantWindControl']">保 存</el-button> |
|
|
<el-button @click="cancel">取 消</el-button> |
|
|
<el-button @click="cancel">取 消</el-button> |
|
|
</div> |
|
|
</div> |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
@ -468,8 +476,8 @@ export default { |
|
|
form: {}, |
|
|
form: {}, |
|
|
// 表单校验 |
|
|
// 表单校验 |
|
|
rules: { |
|
|
rules: { |
|
|
whetherReviewApi:[{ required: true, message: "请选择是否api提单审核", trigger: "blur" }], |
|
|
whetherReviewApi: [{ required: true, message: "请选择是否api提单审核", trigger: "blur" }], |
|
|
whetherReview:[{ required: true, message: "请选择是否手动提单审核", trigger: "blur" }], |
|
|
whetherReview: [{ required: true, message: "请选择是否手动提单审核", trigger: "blur" }], |
|
|
code: [{ required: true, message: "请输入谷歌验证码", trigger: "blur" }], |
|
|
code: [{ required: true, message: "请输入谷歌验证码", trigger: "blur" }], |
|
|
ipWhiteList: [{ required: true, message: "请输入IP", trigger: "blur" }], |
|
|
ipWhiteList: [{ required: true, message: "请输入IP", trigger: "blur" }], |
|
|
payapiWhitelistIp: [{ required: true, message: "请输入代付IP", trigger: "blur" }], |
|
|
payapiWhitelistIp: [{ required: true, message: "请输入代付IP", trigger: "blur" }], |
|
|