hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-26 08:45:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

Browse Source 
# Conflicts:
#	src/views/mall/promotion/rewardActivity/RewardForm.vue
This commit is contained in:
YunaiV
2024-08-23 09:08:16 +08:00
parent f11df67441 0f420bf39b
commit 814f9ba9c6
114 changed files with 311 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/pay/app/components/AppForm.vue
View File

@ -18,7 +18,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:label="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>

12
src/views/pay/app/components/channel/AlipayChannelForm.vue
View File

@ -21,7 +21,7 @@
<el-radio
v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
:value="parseInt(dict.value)"
>
{{ dict.label }}
</el-radio>
@ -29,21 +29,21 @@
</el-form-item>
<el-form-item label="网关地址" label-width="180px" prop="config.serverUrl">
<el-radio-group v-model="formData.config.serverUrl">
<el-radio label="https://openapi.alipay.com/gateway.do">线上环境</el-radio>
<el-radio label="https://openapi-sandbox.dl.alipaydev.com/gateway.do">
<el-radio value="https://openapi.alipay.com/gateway.do">线上环境</el-radio>
<el-radio value="https://openapi-sandbox.dl.alipaydev.com/gateway.do">
沙箱环境
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="算法类型" label-width="180px" prop="config.signType">
<el-radio-group v-model="formData.config.signType">
<el-radio key="RSA2" label="RSA2">RSA2</el-radio>
<el-radio key="RSA2" value="RSA2">RSA2</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="公钥类型" label-width="180px" prop="config.mode">
<el-radio-group v-model="formData.config.mode">
<el-radio key="公钥模式" :label="1">公钥模式</el-radio>
<el-radio key="证书模式" :label="2">证书模式</el-radio>
<el-radio key="公钥模式" :value="1">公钥模式</el-radio>
<el-radio key="证书模式" :value="2">证书模式</el-radio>
</el-radio-group>
</el-form-item>
<div v-if="formData.config.mode === 1">

2
src/views/pay/app/components/channel/MockChannelForm.vue
View File

@ -13,7 +13,7 @@
<el-radio
v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
:value="parseInt(dict.value)"
>
{{ dict.label }}
</el-radio>

2
src/views/pay/app/components/channel/WalletChannelForm.vue
View File

@ -13,7 +13,7 @@
<el-radio
v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
:value="parseInt(dict.value)"
>
{{ dict.label }}
</el-radio>

6
src/views/pay/app/components/channel/WeixinChannelForm.vue
View File

@ -34,7 +34,7 @@
<el-radio
v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
:value="parseInt(dict.value)"
>
{{ dict.label }}
</el-radio>
@ -42,8 +42,8 @@
</el-form-item>
<el-form-item label="API 版本" label-width="180px" prop="config.apiVersion">
<el-radio-group v-model="formData.config.apiVersion">
<el-radio label="v2">v2</el-radio>
<el-radio label="v3">v3</el-radio>
<el-radio value="v2">v2</el-radio>
<el-radio value="v3">v3</el-radio>
</el-radio-group>
</el-form-item>
<div v-if="formData.config.apiVersion === 'v2'">

2
src/views/pay/demo/transfer/DemoTransferForm.vue
View File

@ -12,7 +12,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.PAY_TRANSFER_TYPE)"
:key="dict.value"
:label="dict.value"
:value="dict.value"
:disabled="dict.value === 2 || dict.value === 3 || dict.value === 4"
>
{{ dict.label }}

4
src/views/pay/transfer/CreatePayTransfer.vue
View File

@ -28,13 +28,13 @@
<div>
<el-radio-group v-model="channelCode">
<el-radio
label="alipay_pc"
value="alipay_pc"
:disabled="transfer.type === 2 || transfer.type === 3 || transfer.type === 4"
>
<img :src="svg_alipay_app" />
</el-radio>
<el-radio
label="wx_app"
value="wx_app"
:disabled="transfer.type === 1 || transfer.type === 3 || transfer.type === 4"
>
<img :src="svg_wx_app" />

2
src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
View File

@ -21,7 +21,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:label="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>