xiaoming_global hace 5 años
padre
commit
df5be4c334
Se han modificado 6 ficheros con 1240 adiciones y 12 borrados
  1. 2 1
      config/dev.env.js
  2. 6 0
      config/index.js
  3. 5 5
      config/prod.env.js
  4. 78 0
      src/api/micro/micro.js
  5. 6 6
      src/router/index.js
  6. 1143 0
      src/scrm_pages/qrcode/qrcode.vue

+ 2 - 1
config/dev.env.js Ver fichero

1
 module.exports = {
1
 module.exports = {
2
   NODE_ENV: '"development"',
2
   NODE_ENV: '"development"',
3
   ENV_CONFIG: '"dev"',
3
   ENV_CONFIG: '"dev"',
4
-  BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
4
+  // BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
5
+  BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
5
   
6
   
6
   //  SSO_HOST: '"http://testsso.sgjyun.com"',
7
   //  SSO_HOST: '"http://testsso.sgjyun.com"',
7
   //  SRCM_HOST: '"http://test1.sgjyun.com"',
8
   //  SRCM_HOST: '"http://test1.sgjyun.com"',

+ 6 - 0
config/index.js Ver fichero

16
     // can be overwritten by process.env.HOST
16
     // can be overwritten by process.env.HOST
17
     // if you want dev by ip, please set host: '0.0.0.0'
17
     // if you want dev by ip, please set host: '0.0.0.0'
18
 
18
 
19
+<<<<<<< .mine
19
     host: 'test1.sgjyun.com',
20
     host: 'test1.sgjyun.com',
21
+
22
+=======
23
+    //  host: 'test1.sgjyun.com',
24
+     host: 'microweb.kuyicloud.com',
25
+>>>>>>> .theirs
20
     // host: 'localhost',
26
     // host: 'localhost',
21
     // host: 'jk.kuyicloud.com',
27
     // host: 'jk.kuyicloud.com',
22
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
28
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

+ 5 - 5
config/prod.env.js Ver fichero

4
   BASE_API: '"http://api.scrm.kuyicloud.com"',
4
   BASE_API: '"http://api.scrm.kuyicloud.com"',
5
   // BASE_API: '"http://api.test1.sgjyun.com"',
5
   // BASE_API: '"http://api.test1.sgjyun.com"',
6
 
6
 
7
-  SSO_HOST: '"https://sso.kuyicloud.com"',
8
-  SRCM_HOST: '"http://jk.kuyicloud.com"',
9
-  XT_HOST: '"http://xt.kuyicloud.com"',
10
-  MIRCO_MALL_HOST: '"http://mall.kuyicloud.com"',
11
-  CDM_HOST: '"http://cdm.kuyicloud.com"',
7
+  // SSO_HOST: '"https://sso.kuyicloud.com"',
8
+  // SRCM_HOST: '"http://jk.kuyicloud.com"',
9
+  // XT_HOST: '"http://xt.kuyicloud.com"',
10
+  // MIRCO_MALL_HOST: '"http://mall.kuyicloud.com"',
11
+  // CDM_HOST: '"http://cdm.kuyicloud.com"',
12
 }
12
 }

+ 78 - 0
src/api/micro/micro.js Ver fichero

1
+import request from '@/utils/request'
2
+
3
+export function getHospitaldata(params){
4
+    return request({
5
+        url:"/api/site/getdata",
6
+        method:"Post",
7
+        params:params,
8
+    })
9
+ }
10
+
11
+ export function getArticlelist(data){
12
+    return request({
13
+        url:"/api/site/getarticlelist",
14
+        method:"Post",
15
+        data:data,
16
+    })
17
+ }
18
+
19
+ export function getActivities(params){
20
+   
21
+    return request({
22
+        url:"/api/site/getactivities",
23
+        method:"Post",
24
+        params:params, 
25
+    })
26
+ }
27
+
28
+ 
29
+export function hispitalmore(id,data){
30
+    return request({
31
+        url:"/api/site/hispitalmore?id="+id,
32
+        method:"Get",
33
+        data:data,
34
+    })
35
+  }
36
+
37
+  
38
+export function officemore(id,data){
39
+    return request({
40
+        url:"/api/site/officemore?id="+id,
41
+        method:"Get",
42
+        data:data,
43
+    })
44
+ }
45
+
46
+
47
+ export function docmore(id,data){
48
+    return request({
49
+       url:"/api/site/docmore?id="+id,
50
+       method:"Get",
51
+       data:data,
52
+    })
53
+ }
54
+
55
+ export function kemore(id,data){
56
+    console.log('香港回归',id)
57
+   return request({
58
+       url:"/api/site/kemore?id="+id,
59
+       method:'Get',
60
+       data:data,
61
+   })
62
+}
63
+
64
+export function articlemore(id,data){
65
+     return request({
66
+         url:"/api/site/articlemore?id="+id,
67
+         method:"Get",
68
+         data:data,
69
+     })
70
+}
71
+
72
+export function Activitiesmore(id,data){
73
+    return request({
74
+       url:"/api/site/activitiesmore?id="+id,
75
+       method:"Get",
76
+       data:data, 
77
+    })
78
+}

+ 6 - 6
src/router/index.js Ver fichero

57
 },
57
 },
58
 {
58
 {
59
   path: '',
59
   path: '',
60
-  component: Layout,
61
-  redirect: '/home',
60
+  component: ()=>import('@/scrm_pages/qrcode/qrcode'),
61
+  redirect: '/qrcode',
62
   children: [{
62
   children: [{
63
-    path: '/home',
64
-    component: () => import('@/scrm_pages/home/index'),
65
-    name: 'home',
63
+    path: '/qrcode',
64
+    component: () => import('@/scrm_pages/qrcode/qrcode'),
65
+    name: 'qrcode',
66
     meta: {
66
     meta: {
67
-      title: 'home',
67
+      title: 'qrcode',
68
       icon: 'dashboard',
68
       icon: 'dashboard',
69
       noCache: true
69
       noCache: true
70
     }
70
     }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1143 - 0
src/scrm_pages/qrcode/qrcode.vue