diff --git a/bitcopay后台-开发环境.zip b/bitcopay后台-开发环境.zip index a59ca73..485e0c6 100644 Binary files a/bitcopay后台-开发环境.zip and b/bitcopay后台-开发环境.zip differ diff --git a/src/api/user/userCustomer.js b/src/api/user/userCustomer.js index 620fa14..edb757d 100644 --- a/src/api/user/userCustomer.js +++ b/src/api/user/userCustomer.js @@ -71,4 +71,12 @@ export function upgradeLevel(data) { url: '/user/userCustomer/upgradeLevel?userId=' + data, method: 'post', }) +} + +// 降级成为商家 +export function downgradeToMerchant(data) { + return request({ + url: '/user/userCustomer/downgradeToMerchant?userId=' + data, + method: 'post', + }) } \ No newline at end of file diff --git a/src/views/otc/otcStoreRechargeOrder/index.vue b/src/views/otc/otcStoreRechargeOrder/index.vue index 989008f..73d33e1 100644 --- a/src/views/otc/otcStoreRechargeOrder/index.vue +++ b/src/views/otc/otcStoreRechargeOrder/index.vue @@ -146,6 +146,14 @@ :value="item.id"> + + + + + + + @@ -192,6 +200,16 @@ export default { value: 3, }, ], + payType: [ + { + label: '地址支付', + value: 'address', + }, + { + label: '卡支付', + value: 'card', + }, + ], // 所有商户 merchantCon: [], dateRange: [], @@ -234,6 +252,9 @@ export default { form: {}, // 表单校验 rules: { + type: [ + { required: true, message: "请选择订单类型", trigger: "blur" }, + ], merchantId: [ { required: true, message: "请选择商户", trigger: "blur" }, ], diff --git a/src/views/user/userCustomer/index.vue b/src/views/user/userCustomer/index.vue index 94e23c3..3572ba4 100644 --- a/src/views/user/userCustomer/index.vue +++ b/src/views/user/userCustomer/index.vue @@ -151,6 +151,8 @@