XMLWAN 4 years ago
parent
commit
5ed7be93f2

+ 2 - 2
config/dev.env.js View File

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

+ 2 - 2
config/index.js View File

@@ -16,9 +16,9 @@ module.exports = {
16 16
     // can be overwritten by process.env.HOST
17 17
     // if you want dev by ip, please set host: '0.0.0.0'
18 18
 
19
-    // host: "test1.sgjyun.com",
19
+    host: "test1.sgjyun.com",
20 20
     //  host: 'microweb.kuyicloud.com',
21
-     host: "localhost",
21
+    //host: "localhost",
22 22
     // host: 'jk.kuyicloud.com',
23 23
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
24 24
     // host: 'test1.sgjyun.com',

+ 26 - 34
package-lock.json View File

@@ -656,9 +656,9 @@
656 656
       "dev": true
657 657
     },
658 658
     "aws4": {
659
-      "version": "1.8.0",
660
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
661
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
659
+      "version": "1.9.1",
660
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
661
+      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
662 662
       "dev": true
663 663
     },
664 664
     "axios": {
@@ -2416,9 +2416,9 @@
2416 2416
       "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
2417 2417
     },
2418 2418
     "combined-stream": {
2419
-      "version": "1.0.7",
2420
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
2421
-      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
2419
+      "version": "1.0.8",
2420
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
2421
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
2422 2422
       "dev": true,
2423 2423
       "requires": {
2424 2424
         "delayed-stream": "~1.0.0"
@@ -5337,9 +5337,9 @@
5337 5337
       }
5338 5338
     },
5339 5339
     "globule": {
5340
-      "version": "1.2.1",
5341
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
5342
-      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
5340
+      "version": "1.3.0",
5341
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz",
5342
+      "integrity": "sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==",
5343 5343
       "dev": true,
5344 5344
       "requires": {
5345 5345
         "glob": "~7.1.1",
@@ -6888,12 +6888,6 @@
6888 6888
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
6889 6889
       "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
6890 6890
     },
6891
-    "lodash.clonedeep": {
6892
-      "version": "4.5.0",
6893
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
6894
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
6895
-      "dev": true
6896
-    },
6897 6891
     "lodash.defaults": {
6898 6892
       "version": "4.2.0",
6899 6893
       "resolved": "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz",
@@ -6924,12 +6918,6 @@
6924 6918
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
6925 6919
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
6926 6920
     },
6927
-    "lodash.mergewith": {
6928
-      "version": "4.6.1",
6929
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
6930
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
6931
-      "dev": true
6932
-    },
6933 6921
     "lodash.restparam": {
6934 6922
       "version": "3.6.1",
6935 6923
       "resolved": "https://registry.npm.taobao.org/lodash.restparam/download/lodash.restparam-3.6.1.tgz",
@@ -7536,9 +7524,9 @@
7536 7524
       }
7537 7525
     },
7538 7526
     "node-sass": {
7539
-      "version": "4.11.0",
7540
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
7541
-      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
7527
+      "version": "4.13.1",
7528
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz",
7529
+      "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==",
7542 7530
       "dev": true,
7543 7531
       "requires": {
7544 7532
         "async-foreach": "^0.1.3",
@@ -7548,12 +7536,10 @@
7548 7536
         "get-stdin": "^4.0.1",
7549 7537
         "glob": "^7.0.3",
7550 7538
         "in-publish": "^2.0.0",
7551
-        "lodash.assign": "^4.2.0",
7552
-        "lodash.clonedeep": "^4.3.2",
7553
-        "lodash.mergewith": "^4.6.0",
7539
+        "lodash": "^4.17.15",
7554 7540
         "meow": "^3.7.0",
7555 7541
         "mkdirp": "^0.5.1",
7556
-        "nan": "^2.10.0",
7542
+        "nan": "^2.13.2",
7557 7543
         "node-gyp": "^3.8.0",
7558 7544
         "npmlog": "^4.0.0",
7559 7545
         "request": "^2.88.0",
@@ -7597,6 +7583,12 @@
7597 7583
             "which": "^1.2.9"
7598 7584
           }
7599 7585
         },
7586
+        "lodash": {
7587
+          "version": "4.17.15",
7588
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
7589
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
7590
+          "dev": true
7591
+        },
7600 7592
         "strip-ansi": {
7601 7593
           "version": "3.0.1",
7602 7594
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -10807,9 +10799,9 @@
10807 10799
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
10808 10800
     },
10809 10801
     "psl": {
10810
-      "version": "1.1.31",
10811
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
10812
-      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
10802
+      "version": "1.7.0",
10803
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
10804
+      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
10813 10805
       "dev": true
10814 10806
     },
10815 10807
     "public-encrypt": {
@@ -13636,9 +13628,9 @@
13636 13628
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
13637 13629
     },
13638 13630
     "uuid": {
13639
-      "version": "3.3.2",
13640
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
13641
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
13631
+      "version": "3.4.0",
13632
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
13633
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
13642 13634
       "dev": true
13643 13635
     },
13644 13636
     "v-viewer": {

+ 1 - 1
package.json View File

@@ -110,7 +110,7 @@
110 110
     "html-webpack-plugin": "2.30.1",
111 111
     "lint-staged": "7.2.0",
112 112
     "node-notifier": "5.1.2",
113
-    "node-sass": "^4.7.2",
113
+    "node-sass": "^4.13.1",
114 114
     "optimize-css-assets-webpack-plugin": "3.2.0",
115 115
     "ora": "1.3.0",
116 116
     "portfinder": "1.0.13",

File diff suppressed because it is too large
+ 816 - 816
src/api/site/site.js


+ 11 - 0
src/scrm_pages/site/components/new-feature.vue View File

@@ -2590,5 +2590,16 @@ export default {
2590 2590
     color: inherit;
2591 2591
     margin-top: 30px;
2592 2592
 }
2593
+
2594
+.el-dialog__wrapper {
2595
+    position: fixed;
2596
+    top: 0;
2597
+    right: 0;
2598
+    bottom: 0;
2599
+    left: 0;
2600
+    overflow: auto;
2601
+    margin: 0;
2602
+    z-index: 1000 !important;
2603
+}
2593 2604
 </style>
2594 2605
 

+ 4 - 3
src/scrm_pages/site/preview.vue View File

@@ -20,7 +20,7 @@
20 20
                                   <ul>
21 21
                                    <li>
22 22
                                     <span class="name">{{item.title}}</span>
23
-                                    <span class="icon">
23
+                                    <span>
24 24
                                     <i class="el-icon-edit-outline" @click="editModelByID(item.id,item.mode_type,index)"></i>
25 25
                                     <i class="el-icon-delete" @click="deleteModleById(item.id,index);deletelinkaddress()"></i>
26 26
                                    </span>
@@ -43,7 +43,7 @@
43 43
                                  <ul>
44 44
                                    <li>
45 45
                                      <span class="name">{{item.title}}</span>
46
-                                     <span class="icon">
46
+                                     <span>
47 47
                                      <i class="el-icon-edit-outline" @click="eidtmodel(item.id,item.mode_type,index)"></i>
48 48
                                      <i class="el-icon-delete" @click="deletemodle(item.id,index)"></i>
49 49
                                     </span>
@@ -2646,7 +2646,7 @@ export default {
2646 2646
           var ordmodel = response.data.data.ordmodel
2647 2647
                   this.ordmodel = response.data.data.ordmodel
2648 2648
                   // var images = [];
2649
-                  //  console.log("我爱你中国",this.ordmodel);
2649
+                   console.log("好难",this.ordmodel);
2650 2650
                   // for (let index = 0; index < this.ordmodel.length; index++) {
2651 2651
                   //    var rotationImages = this.ordmodel[index].Oldration.rotation_images;
2652 2652
                   //    console.log("rotationImages",rotationImages)
@@ -6948,6 +6948,7 @@ export default {
6948 6948
       // line-height: 1.3125rem;
6949 6949
     }
6950 6950
   }
6951
+
6951 6952
   // border:solid 1px blue;
6952 6953
 }
6953 6954
 

+ 8 - 8
src/xt_permission.js View File

@@ -10,14 +10,14 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
10 10
 
11 11
 router.beforeEach((to, from, next) => {
12 12
   // 线上注释
13
-  if (store.getters.permission_routers === undefined) {
14
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
15
-      next()
16
-    })
17
-  } else {
18
-    next()
19
-  }
20
-  return
13
+  // if (store.getters.permission_routers === undefined) {
14
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
15
+  //     next()
16
+  //   })
17
+  // } else {
18
+  //   next()
19
+  // }
20
+  // return
21 21
   // 线上注释
22 22
 
23 23
   NProgress.start()