Commit 9b79d974 by liang ce

orgId测试版本

parent 8ebfd081
import axios from 'axios';
import constant from './constant.js';
const api = {
ddConfigGetDate: () => {
axios.get()
}
}
\ No newline at end of file
...@@ -8,7 +8,8 @@ const config = { ...@@ -8,7 +8,8 @@ const config = {
let senddate = qs.stringify({ let senddate = qs.stringify({
version: MINGPAY_CONSTANT.MINGPAY_CONSTANT_VERSION, version: MINGPAY_CONSTANT.MINGPAY_CONSTANT_VERSION,
url: MINGPAY_CONSTANT.MINGPAY_CONSTANT_URL, url: MINGPAY_CONSTANT.MINGPAY_CONSTANT_URL,
agentId: MINGPAY_CONSTANT.MINGPAY_CONSTANT_AGENTID agentId: MINGPAY_CONSTANT.MINGPAY_CONSTANT_AGENTID,
orgId: 'ding9a93ca550f036ffe35c2f4657eb6378f'
}) })
return axios.post(`http://139.196.213.18:8300/v1/auth/getJsAuthenticationParameter?${senddate}`).then((res) => { return axios.post(`http://139.196.213.18:8300/v1/auth/getJsAuthenticationParameter?${senddate}`).then((res) => {
let agentId = res.data.data.agentId let agentId = res.data.data.agentId
......
const MINGPAY_CONSTANT = { const MINGPAY_CONSTANT = {
MINGPAY_CONSTANT_URL: 'http://mingpay-web-beta.mingwork.com:8888/', // MINGPAY_CONSTANT_URL: 'http://mingpay-web-beta.mingwork.com:8888/',
// MINGPAY_CONSTANT_URL: 'http://ming.vaiwan.com/', MINGPAY_CONSTANT_URL: 'http://ming.vaiwan.com/',
MINGPAY_CONSTANT_AGENTID: 270198704, MINGPAY_CONSTANT_AGENTID: 270198704,
MINGPAY_CONSTANT_VERSION: 'v1' MINGPAY_CONSTANT_VERSION: 'v1'
} }
......
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
{{ departmentNameListToStr(departmentNameList) }} {{ departmentNameListToStr(departmentNameList) }}
</span> </span>
<span slot="chargeAmount">充值金额</span> <span slot="chargeAmount">充值金额</span>
<span slot="agent">经办人</span> <span slot="agent" slot-scope="agent, record">
{{ agent === '' && record.payTypeCode === 'EXTERNAL_ALI_RECHAGE' ? '支付宝自充' : agent }}
</span>
<span slot="orderNo">单号</span> <span slot="orderNo">单号</span>
<span slot="orderStatus" slot-scope="orderStatus"> <span slot="orderStatus" slot-scope="orderStatus">
{{ returnStatus(orderStatus)}} {{ returnStatus(orderStatus)}}
...@@ -65,7 +67,8 @@ export default { ...@@ -65,7 +67,8 @@ export default {
dataIndex: 'chargeAmount' dataIndex: 'chargeAmount'
}, { }, {
title: '经办人', title: '经办人',
dataIndex: 'agent' dataIndex: 'agent',
scopedSlots: { customRender: 'agent' }
}, { }, {
title: '单号', title: '单号',
dataIndex: 'orderNo' dataIndex: 'orderNo'
......
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
}, },
// 退款 // 退款
refund () { refund () {
const _that = this; const _that = this
if (this.form.getFieldsValue().remark === undefined) { if (this.form.getFieldsValue().remark === undefined) {
this.$message.error('请输入备注') this.$message.error('请输入备注')
} else { } else {
......
...@@ -35,6 +35,7 @@ Vue.prototype.$message = message ...@@ -35,6 +35,7 @@ Vue.prototype.$message = message
router.beforeEach(function (to, from, next) { router.beforeEach(function (to, from, next) {
// 项目初始化进行鉴权 // 项目初始化进行鉴权
console.log('main')
if (to.name === 'noPermission' || to.name === 'configError') { if (to.name === 'noPermission' || to.name === 'configError') {
next() next()
} else { } else {
......
...@@ -95,6 +95,13 @@ export default new Router({ ...@@ -95,6 +95,13 @@ export default new Router({
path: '/configError', path: '/configError',
name: 'configError', name: 'configError',
component: resolve => require(['./components/pages/ConfigError.vue'], resolve) component: resolve => require(['./components/pages/ConfigError.vue'], resolve)
},
{
path: '/*',
redirect: '/dashboard',
beforeEnter (to, from, next) {
console.log(to)
}
} }
] ]
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment