diff --git a/yudao-ui-admin/.env.dev b/yudao-ui-admin/.env.dev index ddd0c6f76..4667a55eb 100644 --- a/yudao-ui-admin/.env.dev +++ b/yudao-ui-admin/.env.dev @@ -5,8 +5,8 @@ ENV = 'development' VUE_APP_TITLE = 创盈商户管理系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/admin-api' -#VUE_APP_BASE_API = 'http://192.168.1.147:48080' +#VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/admin-api' +VUE_APP_BASE_API = 'http://192.168.1.147:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/yudao-ui-app/components/paymentMember/index.vue b/yudao-ui-app/components/paymentMember/index.vue new file mode 100644 index 000000000..db335cfec --- /dev/null +++ b/yudao-ui-app/components/paymentMember/index.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue index 92bfb2485..faa53b235 100644 --- a/yudao-ui-app/pages/member_application/index.vue +++ b/yudao-ui-app/pages/member_application/index.vue @@ -29,7 +29,7 @@ - + @@ -38,11 +38,11 @@ import { memberGradeInfo } from '@/api/member.js'; - import payment from '@/components/payment'; + import paymentMember from '@/components/paymentMember'; export default { name: "member_application", components: { - payment + paymentMember }, data() { return { @@ -58,20 +58,22 @@ form: { phone:'' }, - pay_order_id: '123123', - totalPrice: '123', + payInfo:{ + userPhone: '', + confirmPhone: '', + orderInfos: [] + }, payMode: [{ name: "微信支付", icon: "icon-weixinzhifu", - value: 'weixin', + value: 'WXPAY', title: '微信快捷支付' }, { - name: "余额支付", - icon: "icon-yuezhifu", - value: 'yue', - title: '可用余额:', - number: 0 + name: "支付宝", + icon: "icon-zhifubao", + value: 'ALIPAY', + title: '支付宝快捷支付' } ], pay_close: false, @@ -107,12 +109,20 @@ * 打开支付组件 * */ - goPay(pay_price, order_id) { + goPay() { this.$set(this, 'pay_close', true); - this.$set(this, 'pay_order_id', '4646'); - this.$set(this, 'totalPrice', '4646'); + this.payInfo = { + userPhone: '15760696662', + confirmPhone: '15760696662', + orderInfos: [{ + gearId: '1', + name: '套餐1', + gearRemarks: '备注1', + gearAmount: 0.01 + }] + } }, - /** + /** * 事件回调 * */