Selaa lähdekoodia

Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-vue

xiaoming_global 5 vuotta sitten
vanhempi
commit
74f68c2357
3 muutettua tiedostoa jossa 80 lisäystä ja 85 poistoa
  1. 60 60
      package-lock.json
  2. 13 20
      src/scrm_pages/site/index.vue
  3. 7 5
      src/scrm_pages/site/preview.vue

+ 60 - 60
package-lock.json Näytä tiedosto

@@ -196,8 +196,8 @@
196 196
     },
197 197
     "adjust-sourcemap-loader": {
198 198
       "version": "1.2.0",
199
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz",
200
-      "integrity": "sha512-958oaHHVEXMvsY7v7cC5gEkNIcoaAVIhZ4mBReYVZJOTP9IgKmzLjIOhTtzpLMu+qriXvLsVjJ155EeInp45IQ==",
199
+      "resolved": "https://registry.npm.taobao.org/adjust-sourcemap-loader/download/adjust-sourcemap-loader-1.2.0.tgz",
200
+      "integrity": "sha1-4z/eleUNufKoAuNkfjEdL8UADGk=",
201 201
       "requires": {
202 202
         "assert": "^1.3.0",
203 203
         "camelcase": "^1.2.1",
@@ -210,12 +210,12 @@
210 210
       "dependencies": {
211 211
         "camelcase": {
212 212
           "version": "1.2.1",
213
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
213
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz",
214 214
           "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
215 215
         },
216 216
         "lodash.defaults": {
217 217
           "version": "3.1.2",
218
-          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
218
+          "resolved": "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-3.1.2.tgz",
219 219
           "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
220 220
           "requires": {
221 221
             "lodash.assign": "^3.0.0",
@@ -224,7 +224,7 @@
224 224
           "dependencies": {
225 225
             "lodash.assign": {
226 226
               "version": "3.2.0",
227
-              "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
227
+              "resolved": "https://registry.npm.taobao.org/lodash.assign/download/lodash.assign-3.2.0.tgz",
228 228
               "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
229 229
               "requires": {
230 230
                 "lodash._baseassign": "^3.0.0",
@@ -534,7 +534,7 @@
534 534
     },
535 535
     "autoprefixer-loader": {
536 536
       "version": "3.2.0",
537
-      "resolved": "https://registry.npmjs.org/autoprefixer-loader/-/autoprefixer-loader-3.2.0.tgz",
537
+      "resolved": "https://registry.npm.taobao.org/autoprefixer-loader/download/autoprefixer-loader-3.2.0.tgz",
538 538
       "integrity": "sha1-Oae2ZGqCaYZQc9lYyX9IYVLCyEo=",
539 539
       "requires": {
540 540
         "autoprefixer": "^6.0.2",
@@ -545,17 +545,17 @@
545 545
       "dependencies": {
546 546
         "ansi-regex": {
547 547
           "version": "2.1.1",
548
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
548
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz?cache=0&sync_timestamp=1570188663907&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-2.1.1.tgz",
549 549
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
550 550
         },
551 551
         "ansi-styles": {
552 552
           "version": "2.2.1",
553
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
553
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
554 554
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
555 555
         },
556 556
         "autoprefixer": {
557 557
           "version": "6.7.7",
558
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
558
+          "resolved": "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-6.7.7.tgz",
559 559
           "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
560 560
           "requires": {
561 561
             "browserslist": "^1.7.6",
@@ -568,12 +568,12 @@
568 568
         },
569 569
         "big.js": {
570 570
           "version": "3.2.0",
571
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
572
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
571
+          "resolved": "https://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz",
572
+          "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4="
573 573
         },
574 574
         "browserslist": {
575 575
           "version": "1.7.7",
576
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
576
+          "resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-1.7.7.tgz",
577 577
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
578 578
           "requires": {
579 579
             "caniuse-db": "^1.0.30000639",
@@ -582,7 +582,7 @@
582 582
         },
583 583
         "chalk": {
584 584
           "version": "1.1.3",
585
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
585
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
586 586
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
587 587
           "requires": {
588 588
             "ansi-styles": "^2.2.1",
@@ -594,19 +594,19 @@
594 594
           "dependencies": {
595 595
             "supports-color": {
596 596
               "version": "2.0.0",
597
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
597
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
598 598
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
599 599
             }
600 600
           }
601 601
         },
602 602
         "has-flag": {
603 603
           "version": "1.0.0",
604
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
604
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
605 605
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
606 606
         },
607 607
         "loader-utils": {
608 608
           "version": "0.2.17",
609
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
609
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz",
610 610
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
611 611
           "requires": {
612 612
             "big.js": "^3.1.3",
@@ -617,8 +617,8 @@
617 617
         },
618 618
         "postcss": {
619 619
           "version": "5.2.18",
620
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
621
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
620
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
621
+          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
622 622
           "requires": {
623 623
             "chalk": "^1.1.3",
624 624
             "js-base64": "^2.1.9",
@@ -628,12 +628,12 @@
628 628
         },
629 629
         "source-map": {
630 630
           "version": "0.5.7",
631
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
631
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
632 632
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
633 633
         },
634 634
         "strip-ansi": {
635 635
           "version": "3.0.1",
636
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
636
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
637 637
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
638 638
           "requires": {
639 639
             "ansi-regex": "^2.0.0"
@@ -641,7 +641,7 @@
641 641
         },
642 642
         "supports-color": {
643 643
           "version": "3.2.3",
644
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
644
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz",
645 645
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
646 646
           "requires": {
647 647
             "has-flag": "^1.0.0"
@@ -2790,8 +2790,8 @@
2790 2790
     },
2791 2791
     "css": {
2792 2792
       "version": "2.2.4",
2793
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
2794
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
2793
+      "resolved": "https://registry.npm.taobao.org/css/download/css-2.2.4.tgz",
2794
+      "integrity": "sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk=",
2795 2795
       "requires": {
2796 2796
         "inherits": "^2.0.3",
2797 2797
         "source-map": "^0.6.1",
@@ -6841,7 +6841,7 @@
6841 6841
     },
6842 6842
     "lodash._baseassign": {
6843 6843
       "version": "3.2.0",
6844
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
6844
+      "resolved": "https://registry.npm.taobao.org/lodash._baseassign/download/lodash._baseassign-3.2.0.tgz",
6845 6845
       "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
6846 6846
       "requires": {
6847 6847
         "lodash._basecopy": "^3.0.0",
@@ -6850,17 +6850,17 @@
6850 6850
     },
6851 6851
     "lodash._basecopy": {
6852 6852
       "version": "3.0.1",
6853
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
6853
+      "resolved": "https://registry.npm.taobao.org/lodash._basecopy/download/lodash._basecopy-3.0.1.tgz",
6854 6854
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
6855 6855
     },
6856 6856
     "lodash._bindcallback": {
6857 6857
       "version": "3.0.1",
6858
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
6858
+      "resolved": "https://registry.npm.taobao.org/lodash._bindcallback/download/lodash._bindcallback-3.0.1.tgz",
6859 6859
       "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
6860 6860
     },
6861 6861
     "lodash._createassigner": {
6862 6862
       "version": "3.1.1",
6863
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
6863
+      "resolved": "https://registry.npm.taobao.org/lodash._createassigner/download/lodash._createassigner-3.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash._createassigner%2Fdownload%2Flodash._createassigner-3.1.1.tgz",
6864 6864
       "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
6865 6865
       "requires": {
6866 6866
         "lodash._bindcallback": "^3.0.0",
@@ -6870,12 +6870,12 @@
6870 6870
     },
6871 6871
     "lodash._getnative": {
6872 6872
       "version": "3.9.1",
6873
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
6873
+      "resolved": "https://registry.npm.taobao.org/lodash._getnative/download/lodash._getnative-3.9.1.tgz",
6874 6874
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
6875 6875
     },
6876 6876
     "lodash._isiterateecall": {
6877 6877
       "version": "3.0.9",
6878
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
6878
+      "resolved": "https://registry.npm.taobao.org/lodash._isiterateecall/download/lodash._isiterateecall-3.0.9.tgz",
6879 6879
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
6880 6880
     },
6881 6881
     "lodash.assign": {
@@ -6896,22 +6896,22 @@
6896 6896
     },
6897 6897
     "lodash.defaults": {
6898 6898
       "version": "4.2.0",
6899
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
6899
+      "resolved": "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz",
6900 6900
       "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
6901 6901
     },
6902 6902
     "lodash.isarguments": {
6903 6903
       "version": "3.1.0",
6904
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
6904
+      "resolved": "https://registry.npm.taobao.org/lodash.isarguments/download/lodash.isarguments-3.1.0.tgz",
6905 6905
       "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
6906 6906
     },
6907 6907
     "lodash.isarray": {
6908 6908
       "version": "3.0.4",
6909
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
6909
+      "resolved": "https://registry.npm.taobao.org/lodash.isarray/download/lodash.isarray-3.0.4.tgz",
6910 6910
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
6911 6911
     },
6912 6912
     "lodash.keys": {
6913 6913
       "version": "3.1.2",
6914
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
6914
+      "resolved": "https://registry.npm.taobao.org/lodash.keys/download/lodash.keys-3.1.2.tgz",
6915 6915
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
6916 6916
       "requires": {
6917 6917
         "lodash._getnative": "^3.0.0",
@@ -6932,7 +6932,7 @@
6932 6932
     },
6933 6933
     "lodash.restparam": {
6934 6934
       "version": "3.6.1",
6935
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
6935
+      "resolved": "https://registry.npm.taobao.org/lodash.restparam/download/lodash.restparam-3.6.1.tgz",
6936 6936
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
6937 6937
     },
6938 6938
     "lodash.tail": {
@@ -7797,7 +7797,7 @@
7797 7797
     },
7798 7798
     "object-path": {
7799 7799
       "version": "0.9.2",
7800
-      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
7800
+      "resolved": "https://registry.npm.taobao.org/object-path/download/object-path-0.9.2.tgz",
7801 7801
       "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU="
7802 7802
     },
7803 7803
     "object-visit": {
@@ -8236,8 +8236,8 @@
8236 8236
     },
8237 8237
     "photoswipe": {
8238 8238
       "version": "4.1.3",
8239
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.3.tgz",
8240
-      "integrity": "sha512-89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA=="
8239
+      "resolved": "https://registry.npm.taobao.org/photoswipe/download/photoswipe-4.1.3.tgz",
8240
+      "integrity": "sha1-WfSUlO653atYiNAzkpJqGbwZdVA="
8241 8241
     },
8242 8242
     "pify": {
8243 8243
       "version": "3.0.0",
@@ -10303,7 +10303,7 @@
10303 10303
     },
10304 10304
     "postcss-safe-parser": {
10305 10305
       "version": "1.0.7",
10306
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-1.0.7.tgz",
10306
+      "resolved": "https://registry.npm.taobao.org/postcss-safe-parser/download/postcss-safe-parser-1.0.7.tgz",
10307 10307
       "integrity": "sha1-Q70MjITV99hHTeglxpnk2ryscqg=",
10308 10308
       "requires": {
10309 10309
         "postcss": "^5.0.18"
@@ -10311,17 +10311,17 @@
10311 10311
       "dependencies": {
10312 10312
         "ansi-regex": {
10313 10313
           "version": "2.1.1",
10314
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
10314
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz?cache=0&sync_timestamp=1570188663907&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-2.1.1.tgz",
10315 10315
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
10316 10316
         },
10317 10317
         "ansi-styles": {
10318 10318
           "version": "2.2.1",
10319
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
10319
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
10320 10320
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
10321 10321
         },
10322 10322
         "chalk": {
10323 10323
           "version": "1.1.3",
10324
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
10324
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
10325 10325
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
10326 10326
           "requires": {
10327 10327
             "ansi-styles": "^2.2.1",
@@ -10333,20 +10333,20 @@
10333 10333
           "dependencies": {
10334 10334
             "supports-color": {
10335 10335
               "version": "2.0.0",
10336
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
10336
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
10337 10337
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
10338 10338
             }
10339 10339
           }
10340 10340
         },
10341 10341
         "has-flag": {
10342 10342
           "version": "1.0.0",
10343
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
10343
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
10344 10344
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
10345 10345
         },
10346 10346
         "postcss": {
10347 10347
           "version": "5.2.18",
10348
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
10349
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
10348
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
10349
+          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
10350 10350
           "requires": {
10351 10351
             "chalk": "^1.1.3",
10352 10352
             "js-base64": "^2.1.9",
@@ -10356,12 +10356,12 @@
10356 10356
         },
10357 10357
         "source-map": {
10358 10358
           "version": "0.5.7",
10359
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
10359
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
10360 10360
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
10361 10361
         },
10362 10362
         "strip-ansi": {
10363 10363
           "version": "3.0.1",
10364
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
10364
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
10365 10365
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
10366 10366
           "requires": {
10367 10367
             "ansi-regex": "^2.0.0"
@@ -10369,7 +10369,7 @@
10369 10369
         },
10370 10370
         "supports-color": {
10371 10371
           "version": "3.2.3",
10372
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
10372
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz",
10373 10373
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
10374 10374
           "requires": {
10375 10375
             "has-flag": "^1.0.0"
@@ -11355,8 +11355,8 @@
11355 11355
     },
11356 11356
     "regex-parser": {
11357 11357
       "version": "2.2.10",
11358
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
11359
-      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA=="
11358
+      "resolved": "https://registry.npm.taobao.org/regex-parser/download/regex-parser-2.2.10.tgz",
11359
+      "integrity": "sha1-nmao9z2JoQdhbmOznU3t3+6RKzc="
11360 11360
     },
11361 11361
     "regexpu-core": {
11362 11362
       "version": "2.0.0",
@@ -11546,8 +11546,8 @@
11546 11546
     },
11547 11547
     "resolve-url-loader": {
11548 11548
       "version": "2.3.2",
11549
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-2.3.2.tgz",
11550
-      "integrity": "sha512-sc/UVgiADdoTc+4cGPB7cUCnlEkzlxD1NXHw4oa9qA0fp30H8mAQ2ePJBP9MQ029DUuhEPouhNdvzT37pBCV0g==",
11549
+      "resolved": "https://registry.npm.taobao.org/resolve-url-loader/download/resolve-url-loader-2.3.2.tgz",
11550
+      "integrity": "sha1-g7uevDkrZsVjeV7vIvB4lwNXom4=",
11551 11551
       "requires": {
11552 11552
         "adjust-sourcemap-loader": "^1.1.0",
11553 11553
         "camelcase": "^4.1.0",
@@ -11562,7 +11562,7 @@
11562 11562
       "dependencies": {
11563 11563
         "source-map": {
11564 11564
           "version": "0.5.7",
11565
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
11565
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
11566 11566
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
11567 11567
         }
11568 11568
       }
@@ -11584,7 +11584,7 @@
11584 11584
     },
11585 11585
     "rework": {
11586 11586
       "version": "1.0.1",
11587
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
11587
+      "resolved": "https://registry.npm.taobao.org/rework/download/rework-1.0.1.tgz",
11588 11588
       "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
11589 11589
       "requires": {
11590 11590
         "convert-source-map": "^0.3.3",
@@ -11593,14 +11593,14 @@
11593 11593
       "dependencies": {
11594 11594
         "convert-source-map": {
11595 11595
           "version": "0.3.5",
11596
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
11596
+          "resolved": "https://registry.npm.taobao.org/convert-source-map/download/convert-source-map-0.3.5.tgz",
11597 11597
           "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
11598 11598
         }
11599 11599
       }
11600 11600
     },
11601 11601
     "rework-visit": {
11602 11602
       "version": "1.0.0",
11603
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
11603
+      "resolved": "https://registry.npm.taobao.org/rework-visit/download/rework-visit-1.0.0.tgz",
11604 11604
       "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
11605 11605
     },
11606 11606
     "right-align": {
@@ -12783,8 +12783,8 @@
12783 12783
     },
12784 12784
     "style-loader": {
12785 12785
       "version": "0.19.1",
12786
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
12787
-      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
12786
+      "resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-0.19.1.tgz",
12787
+      "integrity": "sha1-WR/8gLzv4mi3fF2evAUF13Jhn4U=",
12788 12788
       "requires": {
12789 12789
         "loader-utils": "^1.0.2",
12790 12790
         "schema-utils": "^0.3.0"
@@ -13774,8 +13774,8 @@
13774 13774
     },
13775 13775
     "vue-photo-preview": {
13776 13776
       "version": "1.1.3",
13777
-      "resolved": "https://registry.npmjs.org/vue-photo-preview/-/vue-photo-preview-1.1.3.tgz",
13778
-      "integrity": "sha512-L9JTQh62rYqLHNCdpy7zQdqVisks9dvkmUpM8+7kIKG7l+KkbRLzKWK7lCjCKc6OQT42o6/ngK6B13niXunS9Q==",
13777
+      "resolved": "https://registry.npm.taobao.org/vue-photo-preview/download/vue-photo-preview-1.1.3.tgz",
13778
+      "integrity": "sha1-juYpI+hl08uvAQsHsMyEGJJjMCg=",
13779 13779
       "requires": {
13780 13780
         "autoprefixer-loader": "^3.2.0",
13781 13781
         "babel-core": "^6.26.0",

+ 13 - 20
src/scrm_pages/site/index.vue Näytä tiedosto

@@ -29,7 +29,7 @@
29 29
             </div>
30 30
             <div class="phoneone">
31 31
               <iframe
32
-                id="myIframe"
32
+                class="myIframe"
33 33
                 :src="this.url"
34 34
                 width="100%"
35 35
                 height="100%"
@@ -47,9 +47,9 @@
47 47
 
48 48
 <script>
49 49
 import BreadCrumb from "../components/bread-crumb";
50
-import QRCode from 'qrcodejs2';
50
+import QRCode from "qrcodejs2";
51 51
 // import {GetDefaultData,GetUserOrgid} from '@/api/site/site';
52
-import Vue from 'vue';
52
+import Vue from "vue";
53 53
 export default {
54 54
   name: "site",
55 55
   components: {
@@ -61,9 +61,10 @@ export default {
61 61
       codeImg: require("../../assets/home/wei.jpg"),
62 62
       usreOrgID: "",
63 63
       // url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
64
-       url:"http://jk.test.sgjyun.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
64
+      url:
65
+        "http://jk.test.sgjyun.com/#/microHome?orgid=" +
66
+        this.$store.getters.xt_user.org_id
65 67
       // url:"http://microweb.kuyicloud.com/#/microHome?orgid=3877",
66
-
67 68
     };
68 69
   },
69 70
   methods: {
@@ -72,7 +73,9 @@ export default {
72 73
         width: 100,
73 74
         height: 100, // 高度
74 75
         // text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
75
-        text:'http://jk.test.sgjyun.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id,// 二维码内容
76
+        text:
77
+          "http://jk.test.sgjyun.com/#/microHome?orgid=" +
78
+          this.$store.getters.xt_user.org_id // 二维码内容
76 79
         // render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
77 80
         // background: '#f0f'
78 81
         // foreground: '#ff0'
@@ -94,31 +97,21 @@ export default {
94 97
           console.log("我的世界我做主", usreOrgID);
95 98
         }
96 99
       });
97
-    },
98
-    OK() {
99
-      // 操作iframe中内容的CSS
100
-      var iframe = document.getElementById("myIframe");
101
-      var body = iframe.contentWindow.document.body;
102
-      console.log(
103
-        "结案设计师的拉升恐龙当家哈萨克刘德华拉科技好看多了经安徽省科技的哈里数据库蝴蝶结卡时间段哈萨克京东卡SDK"
104
-      );
105
-      console.log(body);
106
-
107
-      body.style.color = "red";
108
-      // a.style.margin = 50;
109 100
     }
110 101
   },
111 102
   mounted() {
112 103
     this.qrcode();
113
-    this.OK();
114 104
   },
115 105
   created() {
116 106
     // this.GetUserOrgid();
117
-   }
107
+  }
118 108
 };
119 109
 </script>
120 110
 
121 111
 <style rel="stylesheet/scss" lang="scss" scoped>
112
+.myIframe {
113
+  border-radius: 15px;
114
+}
122 115
 .success {
123 116
   text-align: center;
124 117
   align-items: center;

+ 7 - 5
src/scrm_pages/site/preview.vue Näytä tiedosto

@@ -1430,7 +1430,7 @@
1430 1430
              </el-dialog>
1431 1431
 
1432 1432
               <!-- 手机模拟页面 -->
1433
-               <el-col :span="10" class="one">
1433
+               <el-col :span="10" class="text">
1434 1434
                   <div class="phone">
1435 1435
                    <div class="time">9:42</div>
1436 1436
                    <div class="xinhao"></div>
@@ -1793,7 +1793,7 @@
1793 1793
                  <div class="macgic">
1794 1794
                    <div class="macgicone" v-for="item in this.navigationdatatwo" :key="item.id">
1795 1795
                      <div class="macgicfive">
1796
-                         <img :src="item.nonavimages" style="width:30px; height:30px">
1796
+                         <img :src="item.navimages" style="width:30px; height:30px">
1797 1797
                      </div>
1798 1798
                      <div class="macgicsix">
1799 1799
                          {{item.navtitle}}
@@ -5432,7 +5432,7 @@ export default {
5432 5432
        margin-left: 220px;
5433 5433
        margin-top: -22px;
5434 5434
      }
5435
-.one{
5435
+.text{
5436 5436
   display: flex;
5437 5437
   justify-content: space-around;
5438 5438
 }
@@ -5447,13 +5447,14 @@ export default {
5447 5447
   .macgic{
5448 5448
      @include border-top;
5449 5449
     position: absolute;
5450
-    width: 319px;
5450
+    width: 315px;
5451 5451
     height:60px;
5452 5452
     background-color: white;
5453 5453
     // border: solid 1px #333333;
5454 5454
     // margin-left: 32px;
5455
-    margin-top: 652px;
5455
+    margin-top: 654px;
5456 5456
     z-index: 999;
5457
+    border-radius: 12px 12px 30px 30px;
5457 5458
     // border:solid 1px red;
5458 5459
   }
5459 5460
   .macgicone{
@@ -5572,6 +5573,7 @@ export default {
5572 5573
    margin-top:-22px;
5573 5574
    overflow-y: auto;
5574 5575
    position: absolute;
5576
+   border-radius: 0 0 50px 50px;
5575 5577
   //  border: 1px solid red;
5576 5578
  }
5577 5579
   ::-webkit-scrollbar{width:0px;}