From 3487829ea20275bf18a700b783a9a7c5cb03171c Mon Sep 17 00:00:00 2001
From: xiejiahao <422618910@qq.com>
Date: Mon, 9 May 2022 12:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E8=BF=94=E5=9B=9E=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ModulesMenu/allMenus.vue       |  4 +-
 src/components/ModulesMenu/modulesOfRouter.js | 50 +++++++++----------
 src/views/order/createOrder.vue               |  4 +-
 src/views/order/enterprise.vue                |  4 +-
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/components/ModulesMenu/allMenus.vue b/src/components/ModulesMenu/allMenus.vue
index 66ea61fc..35aeef69 100644
--- a/src/components/ModulesMenu/allMenus.vue
+++ b/src/components/ModulesMenu/allMenus.vue
@@ -123,11 +123,11 @@ export default {
                 let name = "";
                 modulesOfRouter.forEach(e => {
                     if(e.id == item.id) {
-                        name = e.router;
+                        name = e.path;
                     }
                 })
                 if(name != "") {
-                    this.$router.push({name: name})
+                    this.$router.push({path: name})
                 }
                 this.visible = false;
             }
diff --git a/src/components/ModulesMenu/modulesOfRouter.js b/src/components/ModulesMenu/modulesOfRouter.js
index b7be586e..659bc378 100644
--- a/src/components/ModulesMenu/modulesOfRouter.js
+++ b/src/components/ModulesMenu/modulesOfRouter.js
@@ -1,102 +1,102 @@
 export const modulesOfRouter = [
     {
         id: 'mall',
-        router: ''
+        path: ''
     },
     {
         id: 'mall-marketing',
-        router: ''
+        path: ''
     },  
     {
         id: 'mdp-arc',
-        router: ''
+        path: ''
     },  
     {
         id: 'mdp-sys',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-asset',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-attendance',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-car',
-        router: '',
+        path: '',
     },  
     {
         id: 'oa-contract',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-customer',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-file',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-finance',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-meeting',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-office',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-performance',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-schedule',
-        router: ''
+        path: ''
     },  
     {
         id: 'oa-seal',
-        router: '',
+        path: '',
     },  
     {
         id: 'oa-supervision',
-        router: ''
+        path: ''
     },  
     {
         id: 'xm-analysis',
-        router: 'reportIndex',
+        path: 'reportIndex',
     },  
     {
         id: 'xm-development',
-        router: ''
+        path: ''
     },
     {
         id: 'xm-pipeline',
-        router: ''
+        path: ''
     },
     {
         id: 'xm-product',
-        router: 'XmProductAllMng'
+        path: '/xm/core/xmProduct/XmProductAllMng'
     },
     {
         id: 'xm-project',
-        router: 'xmProjectAllMng'
+        path: 'xmProjectAllMng'
     },
     {
         id: 'xm-test',
-        router: 'XmQuestionAdd'
+        path: 'XmQuestionAdd'
     },
     {
         id: 'xm-workload',
-        router: 'XmTaskWorkloadInfoMy',
+        path: 'XmTaskWorkloadInfoMy',
     },
     {
         id: 'xm-crowd',
-        router: '',
+        path: '',
     }
 ]
\ No newline at end of file
diff --git a/src/views/order/createOrder.vue b/src/views/order/createOrder.vue
index e2927318..d09a5e89 100644
--- a/src/views/order/createOrder.vue
+++ b/src/views/order/createOrder.vue
@@ -134,7 +134,7 @@ export default {
       let params = { 
         id: orderId,
         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 => {
         if(res.data.tips.isOk) {
@@ -198,7 +198,7 @@ export default {
   created() {
     let data = JSON.parse(window.localStorage.getItem("BUY_MODULES"));
     this.data = data;
-    console.log(this.data, "data-->");
+   
   },
 
 }
diff --git a/src/views/order/enterprise.vue b/src/views/order/enterprise.vue
index 8530cf19..2099943f 100644
--- a/src/views/order/enterprise.vue
+++ b/src/views/order/enterprise.vue
@@ -16,7 +16,7 @@
         </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="head"  :class="{active: item.isChecked == true}" @click="selectItem(item, index)">
             <div class="module_top">
@@ -27,7 +27,6 @@
               <i class="selected el-icon-check"></i>
             </div>
           </div>
-
           <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>
           </div>
@@ -228,6 +227,7 @@ export default {
   watch: {
     allAmount: {
       handler(val, oval) {
+        if(this.menus == null) return;
         let tempData = [];
         let xm = this.menus.xmgl.filter(res => {return res.isChecked ==  true;})
         let oa = this.menus.oa.filter(res => {return res.isChecked ==  true;})