Browse Source

修改支付成功返回链接

master
xiejiahao 4 years ago
parent
commit
3487829ea2
  1. 4
      src/components/ModulesMenu/allMenus.vue
  2. 50
      src/components/ModulesMenu/modulesOfRouter.js
  3. 4
      src/views/order/createOrder.vue
  4. 4
      src/views/order/enterprise.vue

4
src/components/ModulesMenu/allMenus.vue

@ -123,11 +123,11 @@ export default {
let name = ""; let name = "";
modulesOfRouter.forEach(e => { modulesOfRouter.forEach(e => {
if(e.id == item.id) { if(e.id == item.id) {
name = e.router;
name = e.path;
} }
}) })
if(name != "") { if(name != "") {
this.$router.push({name: name})
this.$router.push({path: name})
} }
this.visible = false; this.visible = false;
} }

50
src/components/ModulesMenu/modulesOfRouter.js

@ -1,102 +1,102 @@
export const modulesOfRouter = [ export const modulesOfRouter = [
{ {
id: 'mall', id: 'mall',
router: ''
path: ''
}, },
{ {
id: 'mall-marketing', id: 'mall-marketing',
router: ''
path: ''
}, },
{ {
id: 'mdp-arc', id: 'mdp-arc',
router: ''
path: ''
}, },
{ {
id: 'mdp-sys', id: 'mdp-sys',
router: ''
path: ''
}, },
{ {
id: 'oa-asset', id: 'oa-asset',
router: ''
path: ''
}, },
{ {
id: 'oa-attendance', id: 'oa-attendance',
router: ''
path: ''
}, },
{ {
id: 'oa-car', id: 'oa-car',
router: '',
path: '',
}, },
{ {
id: 'oa-contract', id: 'oa-contract',
router: ''
path: ''
}, },
{ {
id: 'oa-customer', id: 'oa-customer',
router: ''
path: ''
}, },
{ {
id: 'oa-file', id: 'oa-file',
router: ''
path: ''
}, },
{ {
id: 'oa-finance', id: 'oa-finance',
router: ''
path: ''
}, },
{ {
id: 'oa-meeting', id: 'oa-meeting',
router: ''
path: ''
}, },
{ {
id: 'oa-office', id: 'oa-office',
router: ''
path: ''
}, },
{ {
id: 'oa-performance', id: 'oa-performance',
router: ''
path: ''
}, },
{ {
id: 'oa-schedule', id: 'oa-schedule',
router: ''
path: ''
}, },
{ {
id: 'oa-seal', id: 'oa-seal',
router: '',
path: '',
}, },
{ {
id: 'oa-supervision', id: 'oa-supervision',
router: ''
path: ''
}, },
{ {
id: 'xm-analysis', id: 'xm-analysis',
router: 'reportIndex',
path: 'reportIndex',
}, },
{ {
id: 'xm-development', id: 'xm-development',
router: ''
path: ''
}, },
{ {
id: 'xm-pipeline', id: 'xm-pipeline',
router: ''
path: ''
}, },
{ {
id: 'xm-product', id: 'xm-product',
router: 'XmProductAllMng'
path: '/xm/core/xmProduct/XmProductAllMng'
}, },
{ {
id: 'xm-project', id: 'xm-project',
router: 'xmProjectAllMng'
path: 'xmProjectAllMng'
}, },
{ {
id: 'xm-test', id: 'xm-test',
router: 'XmQuestionAdd'
path: 'XmQuestionAdd'
}, },
{ {
id: 'xm-workload', id: 'xm-workload',
router: 'XmTaskWorkloadInfoMy',
path: 'XmTaskWorkloadInfoMy',
}, },
{ {
id: 'xm-crowd', id: 'xm-crowd',
router: '',
path: '',
} }
] ]

4
src/views/order/createOrder.vue

@ -134,7 +134,7 @@ export default {
let params = { let params = {
id: orderId, id: orderId,
otype: 1, otype: 1,
returnUrl: "http://359n6r5527.wicp.vip/#/my/order/paySuccess"
returnUrl: `${window.location.protocol+"//"+window.location.host}/${process.env.CONTEXT}/${process.env.VERSION}/#/my/order/paySuccess`
} }
aliPay(params).then(res => { aliPay(params).then(res => {
if(res.data.tips.isOk) { if(res.data.tips.isOk) {
@ -198,7 +198,7 @@ export default {
created() { created() {
let data = JSON.parse(window.localStorage.getItem("BUY_MODULES")); let data = JSON.parse(window.localStorage.getItem("BUY_MODULES"));
this.data = data; this.data = data;
console.log(this.data, "data-->");
}, },
} }

4
src/views/order/enterprise.vue

@ -16,7 +16,7 @@
</div> </div>
</div> </div>
<div class="sys_modules">
<div class="sys_modules" v-if="this.menus != null">
<div class="module" v-for="(item, index) in menus[active]" :key="index" > <div class="module" v-for="(item, index) in menus[active]" :key="index" >
<div class="head" :class="{active: item.isChecked == true}" @click="selectItem(item, index)"> <div class="head" :class="{active: item.isChecked == true}" @click="selectItem(item, index)">
<div class="module_top"> <div class="module_top">
@ -27,7 +27,6 @@
<i class="selected el-icon-check"></i> <i class="selected el-icon-check"></i>
</div> </div>
</div> </div>
<div class="footer" v-if="item.isChecked == true"> <div class="footer" v-if="item.isChecked == true">
<el-input-number style="width: 180px;" @change="numChange(item)" v-model="item.num" :min="10" :max="99999" ></el-input-number> <el-input-number style="width: 180px;" @change="numChange(item)" v-model="item.num" :min="10" :max="99999" ></el-input-number>
</div> </div>
@ -228,6 +227,7 @@ export default {
watch: { watch: {
allAmount: { allAmount: {
handler(val, oval) { handler(val, oval) {
if(this.menus == null) return;
let tempData = []; let tempData = [];
let xm = this.menus.xmgl.filter(res => {return res.isChecked == true;}) let xm = this.menus.xmgl.filter(res => {return res.isChecked == true;})
let oa = this.menus.oa.filter(res => {return res.isChecked == true;}) let oa = this.menus.oa.filter(res => {return res.isChecked == true;})

Loading…
Cancel
Save