Browse Source

Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

See999 5 years ago
parent
commit
8fa79d2903

+ 1 - 1
build/cdn.json View File

1
 {
1
 {
2
-  "version": "1.0.206"
2
+  "version": "1.0.308"
3
 }
3
 }

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

1
 'use strict'
1
 'use strict'
2
 module.exports = {
2
 module.exports = {
3
   NODE_ENV: '"production"',
3
   NODE_ENV: '"production"',
4
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
4
+  BASE_API: '"https://api.xt.kuyicloud.com"'
5
 
5
 
6
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
6
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
7
   // http://api.xt.test.sgjyun.com
7
   // http://api.xt.test.sgjyun.com
8
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
8
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
9
 }
9
 }

+ 65 - 86
package-lock.json View File

460
     },
460
     },
461
     "amdefine": {
461
     "amdefine": {
462
       "version": "1.0.1",
462
       "version": "1.0.1",
463
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
463
+      "resolved": "https://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz",
464
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
464
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
465
       "dev": true
465
       "dev": true
466
     },
466
     },
840
     },
840
     },
841
     "array-filter": {
841
     "array-filter": {
842
       "version": "1.0.0",
842
       "version": "1.0.0",
843
-      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz",
843
+      "resolved": "https://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
844
       "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
844
       "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
845
     },
845
     },
846
     "array-find": {
846
     "array-find": {
847
       "version": "1.0.0",
847
       "version": "1.0.0",
848
-      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
848
+      "resolved": "https://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
849
       "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg="
849
       "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg="
850
     },
850
     },
851
     "array-find-index": {
851
     "array-find-index": {
871
     },
871
     },
872
     "array-map": {
872
     "array-map": {
873
       "version": "0.0.0",
873
       "version": "0.0.0",
874
-      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
874
+      "resolved": "https://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
875
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
875
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
876
     },
876
     },
877
     "array-shuffle": {
877
     "array-shuffle": {
878
       "version": "1.0.1",
878
       "version": "1.0.1",
879
-      "resolved": "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz",
879
+      "resolved": "https://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
880
       "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo="
880
       "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo="
881
     },
881
     },
882
     "array-union": {
882
     "array-union": {
1005
     },
1005
     },
1006
     "async-foreach": {
1006
     "async-foreach": {
1007
       "version": "0.1.3",
1007
       "version": "0.1.3",
1008
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
1008
+      "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
1009
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
1009
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
1010
       "dev": true
1010
       "dev": true
1011
     },
1011
     },
1051
     },
1051
     },
1052
     "autosize": {
1052
     "autosize": {
1053
       "version": "3.0.21",
1053
       "version": "3.0.21",
1054
-      "resolved": "https://registry.npmjs.org/autosize/-/autosize-3.0.21.tgz",
1054
+      "resolved": "https://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
1055
       "integrity": "sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM="
1055
       "integrity": "sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM="
1056
     },
1056
     },
1057
     "aws-sign2": {
1057
     "aws-sign2": {
2186
     },
2186
     },
2187
     "block-stream": {
2187
     "block-stream": {
2188
       "version": "0.0.9",
2188
       "version": "0.0.9",
2189
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
2189
+      "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
2190
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
2190
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
2191
       "dev": true,
2191
       "dev": true,
2192
       "requires": {
2192
       "requires": {
2313
       "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
2313
       "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
2314
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2314
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2315
       "dev": true,
2315
       "dev": true,
2316
-      "optional": true,
2317
       "requires": {
2316
       "requires": {
2318
         "hoek": "2.x.x"
2317
         "hoek": "2.x.x"
2319
       }
2318
       }
2477
     },
2476
     },
2478
     "buffer-concat": {
2477
     "buffer-concat": {
2479
       "version": "0.0.1",
2478
       "version": "0.0.1",
2480
-      "resolved": "https://registry.npmjs.org/buffer-concat/-/buffer-concat-0.0.1.tgz",
2479
+      "resolved": "https://registry.npm.taobao.org/buffer-concat/download/buffer-concat-0.0.1.tgz",
2481
       "integrity": "sha1-Q+Hjx389IvtVvqaJCpLQN3jEwQo=",
2480
       "integrity": "sha1-Q+Hjx389IvtVvqaJCpLQN3jEwQo=",
2482
       "dev": true
2481
       "dev": true
2483
     },
2482
     },
3237
     },
3236
     },
3238
     "console-control-strings": {
3237
     "console-control-strings": {
3239
       "version": "1.1.0",
3238
       "version": "1.1.0",
3240
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
3239
+      "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
3241
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
3240
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
3242
       "dev": true
3241
       "dev": true
3243
     },
3242
     },
3421
     },
3420
     },
3422
     "countup.js": {
3421
     "countup.js": {
3423
       "version": "1.9.3",
3422
       "version": "1.9.3",
3424
-      "resolved": "https://registry.npmjs.org/countup.js/-/countup.js-1.9.3.tgz",
3423
+      "resolved": "https://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
3425
       "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
3424
       "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
3426
     },
3425
     },
3427
     "crc32": {
3426
     "crc32": {
3428
       "version": "0.2.2",
3427
       "version": "0.2.2",
3429
-      "resolved": "https://registry.npmjs.org/crc32/-/crc32-0.2.2.tgz",
3428
+      "resolved": "https://registry.npm.taobao.org/crc32/download/crc32-0.2.2.tgz",
3430
       "integrity": "sha1-etIg1v/c0Rn5/BJ6d3LKzqOQpLo=",
3429
       "integrity": "sha1-etIg1v/c0Rn5/BJ6d3LKzqOQpLo=",
3431
       "dev": true
3430
       "dev": true
3432
     },
3431
     },
4096
     },
4095
     },
4097
     "delegates": {
4096
     "delegates": {
4098
       "version": "1.0.0",
4097
       "version": "1.0.0",
4099
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
4098
+      "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
4100
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
4099
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
4101
       "dev": true
4100
       "dev": true
4102
     },
4101
     },
5300
     },
5299
     },
5301
     "fastclick": {
5300
     "fastclick": {
5302
       "version": "1.0.6",
5301
       "version": "1.0.6",
5303
-      "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
5302
+      "resolved": "https://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
5304
       "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
5303
       "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
5305
     },
5304
     },
5306
     "fastparse": {
5305
     "fastparse": {
5619
     },
5618
     },
5620
     "formstream": {
5619
     "formstream": {
5621
       "version": "0.0.7",
5620
       "version": "0.0.7",
5622
-      "resolved": "https://registry.npmjs.org/formstream/-/formstream-0.0.7.tgz",
5621
+      "resolved": "https://registry.npm.taobao.org/formstream/download/formstream-0.0.7.tgz",
5623
       "integrity": "sha1-mB0ANnQ1lsVIIO49+0S6yhg0l4g=",
5622
       "integrity": "sha1-mB0ANnQ1lsVIIO49+0S6yhg0l4g=",
5624
       "dev": true,
5623
       "dev": true,
5625
       "requires": {
5624
       "requires": {
5630
       "dependencies": {
5629
       "dependencies": {
5631
         "mime": {
5630
         "mime": {
5632
           "version": "1.2.9",
5631
           "version": "1.2.9",
5633
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.9.tgz",
5632
+          "resolved": "https://registry.npm.taobao.org/mime/download/mime-1.2.9.tgz?cache=0&sync_timestamp=1560034758817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-1.2.9.tgz",
5634
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
5633
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
5635
           "dev": true
5634
           "dev": true
5636
         }
5635
         }
5743
         "ansi-regex": {
5742
         "ansi-regex": {
5744
           "version": "2.1.1",
5743
           "version": "2.1.1",
5745
           "bundled": true,
5744
           "bundled": true,
5746
-          "dev": true,
5747
-          "optional": true
5745
+          "dev": true
5748
         },
5746
         },
5749
         "aproba": {
5747
         "aproba": {
5750
           "version": "1.2.0",
5748
           "version": "1.2.0",
5765
         "balanced-match": {
5763
         "balanced-match": {
5766
           "version": "1.0.0",
5764
           "version": "1.0.0",
5767
           "bundled": true,
5765
           "bundled": true,
5768
-          "dev": true,
5769
-          "optional": true
5766
+          "dev": true
5770
         },
5767
         },
5771
         "brace-expansion": {
5768
         "brace-expansion": {
5772
           "version": "1.1.11",
5769
           "version": "1.1.11",
5773
           "bundled": true,
5770
           "bundled": true,
5774
           "dev": true,
5771
           "dev": true,
5775
-          "optional": true,
5776
           "requires": {
5772
           "requires": {
5777
             "balanced-match": "^1.0.0",
5773
             "balanced-match": "^1.0.0",
5778
             "concat-map": "0.0.1"
5774
             "concat-map": "0.0.1"
5787
         "code-point-at": {
5783
         "code-point-at": {
5788
           "version": "1.1.0",
5784
           "version": "1.1.0",
5789
           "bundled": true,
5785
           "bundled": true,
5790
-          "dev": true,
5791
-          "optional": true
5786
+          "dev": true
5792
         },
5787
         },
5793
         "concat-map": {
5788
         "concat-map": {
5794
           "version": "0.0.1",
5789
           "version": "0.0.1",
5795
           "bundled": true,
5790
           "bundled": true,
5796
-          "dev": true,
5797
-          "optional": true
5791
+          "dev": true
5798
         },
5792
         },
5799
         "console-control-strings": {
5793
         "console-control-strings": {
5800
           "version": "1.1.0",
5794
           "version": "1.1.0",
5801
           "bundled": true,
5795
           "bundled": true,
5802
-          "dev": true,
5803
-          "optional": true
5796
+          "dev": true
5804
         },
5797
         },
5805
         "core-util-is": {
5798
         "core-util-is": {
5806
           "version": "1.0.2",
5799
           "version": "1.0.2",
5917
         "inherits": {
5910
         "inherits": {
5918
           "version": "2.0.3",
5911
           "version": "2.0.3",
5919
           "bundled": true,
5912
           "bundled": true,
5920
-          "dev": true,
5921
-          "optional": true
5913
+          "dev": true
5922
         },
5914
         },
5923
         "ini": {
5915
         "ini": {
5924
           "version": "1.3.5",
5916
           "version": "1.3.5",
5930
           "version": "1.0.0",
5922
           "version": "1.0.0",
5931
           "bundled": true,
5923
           "bundled": true,
5932
           "dev": true,
5924
           "dev": true,
5933
-          "optional": true,
5934
           "requires": {
5925
           "requires": {
5935
             "number-is-nan": "^1.0.0"
5926
             "number-is-nan": "^1.0.0"
5936
           }
5927
           }
5945
           "version": "3.0.4",
5936
           "version": "3.0.4",
5946
           "bundled": true,
5937
           "bundled": true,
5947
           "dev": true,
5938
           "dev": true,
5948
-          "optional": true,
5949
           "requires": {
5939
           "requires": {
5950
             "brace-expansion": "^1.1.7"
5940
             "brace-expansion": "^1.1.7"
5951
           }
5941
           }
5953
         "minimist": {
5943
         "minimist": {
5954
           "version": "0.0.8",
5944
           "version": "0.0.8",
5955
           "bundled": true,
5945
           "bundled": true,
5956
-          "dev": true,
5957
-          "optional": true
5946
+          "dev": true
5958
         },
5947
         },
5959
         "minipass": {
5948
         "minipass": {
5960
           "version": "2.2.4",
5949
           "version": "2.2.4",
5961
           "bundled": true,
5950
           "bundled": true,
5962
           "dev": true,
5951
           "dev": true,
5963
-          "optional": true,
5964
           "requires": {
5952
           "requires": {
5965
             "safe-buffer": "^5.1.1",
5953
             "safe-buffer": "^5.1.1",
5966
             "yallist": "^3.0.0"
5954
             "yallist": "^3.0.0"
5979
           "version": "0.5.1",
5967
           "version": "0.5.1",
5980
           "bundled": true,
5968
           "bundled": true,
5981
           "dev": true,
5969
           "dev": true,
5982
-          "optional": true,
5983
           "requires": {
5970
           "requires": {
5984
             "minimist": "0.0.8"
5971
             "minimist": "0.0.8"
5985
           }
5972
           }
6060
         "number-is-nan": {
6047
         "number-is-nan": {
6061
           "version": "1.0.1",
6048
           "version": "1.0.1",
6062
           "bundled": true,
6049
           "bundled": true,
6063
-          "dev": true,
6064
-          "optional": true
6050
+          "dev": true
6065
         },
6051
         },
6066
         "object-assign": {
6052
         "object-assign": {
6067
           "version": "4.1.1",
6053
           "version": "4.1.1",
6073
           "version": "1.4.0",
6059
           "version": "1.4.0",
6074
           "bundled": true,
6060
           "bundled": true,
6075
           "dev": true,
6061
           "dev": true,
6076
-          "optional": true,
6077
           "requires": {
6062
           "requires": {
6078
             "wrappy": "1"
6063
             "wrappy": "1"
6079
           }
6064
           }
6159
         "safe-buffer": {
6144
         "safe-buffer": {
6160
           "version": "5.1.1",
6145
           "version": "5.1.1",
6161
           "bundled": true,
6146
           "bundled": true,
6162
-          "dev": true,
6163
-          "optional": true
6147
+          "dev": true
6164
         },
6148
         },
6165
         "safer-buffer": {
6149
         "safer-buffer": {
6166
           "version": "2.1.2",
6150
           "version": "2.1.2",
6196
           "version": "1.0.2",
6180
           "version": "1.0.2",
6197
           "bundled": true,
6181
           "bundled": true,
6198
           "dev": true,
6182
           "dev": true,
6199
-          "optional": true,
6200
           "requires": {
6183
           "requires": {
6201
             "code-point-at": "^1.0.0",
6184
             "code-point-at": "^1.0.0",
6202
             "is-fullwidth-code-point": "^1.0.0",
6185
             "is-fullwidth-code-point": "^1.0.0",
6216
           "version": "3.0.1",
6199
           "version": "3.0.1",
6217
           "bundled": true,
6200
           "bundled": true,
6218
           "dev": true,
6201
           "dev": true,
6219
-          "optional": true,
6220
           "requires": {
6202
           "requires": {
6221
             "ansi-regex": "^2.0.0"
6203
             "ansi-regex": "^2.0.0"
6222
           }
6204
           }
6260
         "wrappy": {
6242
         "wrappy": {
6261
           "version": "1.0.2",
6243
           "version": "1.0.2",
6262
           "bundled": true,
6244
           "bundled": true,
6263
-          "dev": true,
6264
-          "optional": true
6245
+          "dev": true
6265
         },
6246
         },
6266
         "yallist": {
6247
         "yallist": {
6267
           "version": "3.0.2",
6248
           "version": "3.0.2",
6268
           "bundled": true,
6249
           "bundled": true,
6269
-          "dev": true,
6270
-          "optional": true
6250
+          "dev": true
6271
         }
6251
         }
6272
       }
6252
       }
6273
     },
6253
     },
6333
     },
6313
     },
6334
     "gauge": {
6314
     "gauge": {
6335
       "version": "2.7.4",
6315
       "version": "2.7.4",
6336
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
6316
+      "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
6337
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
6317
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
6338
       "dev": true,
6318
       "dev": true,
6339
       "requires": {
6319
       "requires": {
6349
       "dependencies": {
6329
       "dependencies": {
6350
         "is-fullwidth-code-point": {
6330
         "is-fullwidth-code-point": {
6351
           "version": "1.0.0",
6331
           "version": "1.0.0",
6352
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
6332
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
6353
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
6333
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
6354
           "dev": true,
6334
           "dev": true,
6355
           "requires": {
6335
           "requires": {
6358
         },
6338
         },
6359
         "string-width": {
6339
         "string-width": {
6360
           "version": "1.0.2",
6340
           "version": "1.0.2",
6361
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
6341
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz",
6362
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
6342
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
6363
           "dev": true,
6343
           "dev": true,
6364
           "requires": {
6344
           "requires": {
6532
     },
6512
     },
6533
     "hammerjs": {
6513
     "hammerjs": {
6534
       "version": "2.0.8",
6514
       "version": "2.0.8",
6535
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
6515
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
6536
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
6516
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
6537
     },
6517
     },
6538
     "handle-thing": {
6518
     "handle-thing": {
6601
     },
6581
     },
6602
     "has-unicode": {
6582
     "has-unicode": {
6603
       "version": "2.0.1",
6583
       "version": "2.0.1",
6604
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
6584
+      "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
6605
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
6585
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
6606
       "dev": true
6586
       "dev": true
6607
     },
6587
     },
6725
       "version": "2.16.3",
6705
       "version": "2.16.3",
6726
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6706
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6727
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6707
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6728
-      "dev": true,
6729
-      "optional": true
6708
+      "dev": true
6730
     },
6709
     },
6731
     "home-or-tmp": {
6710
     "home-or-tmp": {
6732
       "version": "2.0.0",
6711
       "version": "2.0.0",
6875
     },
6854
     },
6876
     "http-basic": {
6855
     "http-basic": {
6877
       "version": "2.5.1",
6856
       "version": "2.5.1",
6878
-      "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz",
6857
+      "resolved": "https://registry.npm.taobao.org/http-basic/download/http-basic-2.5.1.tgz",
6879
       "integrity": "sha1-jORHvbW2xXf4pj4/p4BW7Eu02/s=",
6858
       "integrity": "sha1-jORHvbW2xXf4pj4/p4BW7Eu02/s=",
6880
       "dev": true,
6859
       "dev": true,
6881
       "requires": {
6860
       "requires": {
6886
       "dependencies": {
6865
       "dependencies": {
6887
         "caseless": {
6866
         "caseless": {
6888
           "version": "0.11.0",
6867
           "version": "0.11.0",
6889
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
6868
+          "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.11.0.tgz",
6890
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
6869
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
6891
           "dev": true
6870
           "dev": true
6892
         }
6871
         }
6969
     },
6948
     },
6970
     "http-response-object": {
6949
     "http-response-object": {
6971
       "version": "1.1.0",
6950
       "version": "1.1.0",
6972
-      "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz",
6951
+      "resolved": "https://registry.npm.taobao.org/http-response-object/download/http-response-object-1.1.0.tgz",
6973
       "integrity": "sha1-p8TnWq6C87tJBOT0P2FWc7TVGMM=",
6952
       "integrity": "sha1-p8TnWq6C87tJBOT0P2FWc7TVGMM=",
6974
       "dev": true
6953
       "dev": true
6975
     },
6954
     },
7094
     },
7073
     },
7095
     "in-publish": {
7074
     "in-publish": {
7096
       "version": "2.0.0",
7075
       "version": "2.0.0",
7097
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
7076
+      "resolved": "https://registry.npm.taobao.org/in-publish/download/in-publish-2.0.0.tgz",
7098
       "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
7077
       "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
7099
       "dev": true
7078
       "dev": true
7100
     },
7079
     },
8711
     },
8690
     },
8712
     "lodash.throttle": {
8691
     "lodash.throttle": {
8713
       "version": "4.1.1",
8692
       "version": "4.1.1",
8714
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
8693
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
8715
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
8694
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
8716
     },
8695
     },
8717
     "lodash.unionwith": {
8696
     "lodash.unionwith": {
9584
     },
9563
     },
9585
     "normalize-wheel": {
9564
     "normalize-wheel": {
9586
       "version": "1.0.1",
9565
       "version": "1.0.1",
9587
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
9566
+      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
9588
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
9567
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
9589
     },
9568
     },
9590
     "npm-run-path": {
9569
     "npm-run-path": {
10121
     },
10100
     },
10122
     "pause-stream": {
10101
     "pause-stream": {
10123
       "version": "0.0.11",
10102
       "version": "0.0.11",
10124
-      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
10103
+      "resolved": "https://registry.npm.taobao.org/pause-stream/download/pause-stream-0.0.11.tgz",
10125
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
10104
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
10126
       "dev": true,
10105
       "dev": true,
10127
       "requires": {
10106
       "requires": {
12548
     },
12527
     },
12549
     "qiniu": {
12528
     "qiniu": {
12550
       "version": "6.1.13",
12529
       "version": "6.1.13",
12551
-      "resolved": "https://registry.npmjs.org/qiniu/-/qiniu-6.1.13.tgz",
12530
+      "resolved": "https://registry.npm.taobao.org/qiniu/download/qiniu-6.1.13.tgz",
12552
       "integrity": "sha1-V/XWCXTGTYhx2A8n331DIRrjTwM=",
12531
       "integrity": "sha1-V/XWCXTGTYhx2A8n331DIRrjTwM=",
12553
       "dev": true,
12532
       "dev": true,
12554
       "requires": {
12533
       "requires": {
12561
       "dependencies": {
12540
       "dependencies": {
12562
         "mime": {
12541
         "mime": {
12563
           "version": "1.2.9",
12542
           "version": "1.2.9",
12564
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.9.tgz",
12543
+          "resolved": "https://registry.npm.taobao.org/mime/download/mime-1.2.9.tgz?cache=0&sync_timestamp=1560034758817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-1.2.9.tgz",
12565
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
12544
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
12566
           "dev": true
12545
           "dev": true
12567
         }
12546
         }
12569
     },
12548
     },
12570
     "qiniu-webpack-plugin": {
12549
     "qiniu-webpack-plugin": {
12571
       "version": "0.4.2",
12550
       "version": "0.4.2",
12572
-      "resolved": "https://registry.npmjs.org/qiniu-webpack-plugin/-/qiniu-webpack-plugin-0.4.2.tgz",
12551
+      "resolved": "https://registry.npm.taobao.org/qiniu-webpack-plugin/download/qiniu-webpack-plugin-0.4.2.tgz",
12573
       "integrity": "sha1-eeSzD3KErNsOWP8os+PYaYQb/ts=",
12552
       "integrity": "sha1-eeSzD3KErNsOWP8os+PYaYQb/ts=",
12574
       "dev": true,
12553
       "dev": true,
12575
       "requires": {
12554
       "requires": {
12580
     },
12559
     },
12581
     "qr.js": {
12560
     "qr.js": {
12582
       "version": "0.0.0",
12561
       "version": "0.0.0",
12583
-      "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz",
12562
+      "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
12584
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
12563
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
12585
     },
12564
     },
12586
     "qs": {
12565
     "qs": {
13502
     },
13481
     },
13503
     "sass-graph": {
13482
     "sass-graph": {
13504
       "version": "2.2.4",
13483
       "version": "2.2.4",
13505
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
13484
+      "resolved": "https://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz",
13506
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
13485
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
13507
       "dev": true,
13486
       "dev": true,
13508
       "requires": {
13487
       "requires": {
13514
       "dependencies": {
13493
       "dependencies": {
13515
         "camelcase": {
13494
         "camelcase": {
13516
           "version": "3.0.0",
13495
           "version": "3.0.0",
13517
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
13496
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
13518
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
13497
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
13519
           "dev": true
13498
           "dev": true
13520
         },
13499
         },
13521
         "cliui": {
13500
         "cliui": {
13522
           "version": "3.2.0",
13501
           "version": "3.2.0",
13523
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
13502
+          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz?cache=0&sync_timestamp=1573943292170&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-3.2.0.tgz",
13524
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
13503
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
13525
           "dev": true,
13504
           "dev": true,
13526
           "requires": {
13505
           "requires": {
13531
         },
13510
         },
13532
         "is-fullwidth-code-point": {
13511
         "is-fullwidth-code-point": {
13533
           "version": "1.0.0",
13512
           "version": "1.0.0",
13534
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
13513
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
13535
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
13514
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
13536
           "dev": true,
13515
           "dev": true,
13537
           "requires": {
13516
           "requires": {
13540
         },
13519
         },
13541
         "os-locale": {
13520
         "os-locale": {
13542
           "version": "1.4.0",
13521
           "version": "1.4.0",
13543
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
13522
+          "resolved": "https://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz",
13544
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
13523
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
13545
           "dev": true,
13524
           "dev": true,
13546
           "requires": {
13525
           "requires": {
13549
         },
13528
         },
13550
         "string-width": {
13529
         "string-width": {
13551
           "version": "1.0.2",
13530
           "version": "1.0.2",
13552
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
13531
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz",
13553
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
13532
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
13554
           "dev": true,
13533
           "dev": true,
13555
           "requires": {
13534
           "requires": {
13560
         },
13539
         },
13561
         "which-module": {
13540
         "which-module": {
13562
           "version": "1.0.0",
13541
           "version": "1.0.0",
13563
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
13542
+          "resolved": "https://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz",
13564
           "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
13543
           "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
13565
           "dev": true
13544
           "dev": true
13566
         },
13545
         },
13567
         "y18n": {
13546
         "y18n": {
13568
           "version": "3.2.1",
13547
           "version": "3.2.1",
13569
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
13548
+          "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz",
13570
           "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
13549
           "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
13571
           "dev": true
13550
           "dev": true
13572
         },
13551
         },
13573
         "yargs": {
13552
         "yargs": {
13574
           "version": "7.1.0",
13553
           "version": "7.1.0",
13575
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
13554
+          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz",
13576
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
13555
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
13577
           "dev": true,
13556
           "dev": true,
13578
           "requires": {
13557
           "requires": {
13593
         },
13572
         },
13594
         "yargs-parser": {
13573
         "yargs-parser": {
13595
           "version": "5.0.0",
13574
           "version": "5.0.0",
13596
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
13575
+          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0.tgz",
13597
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
13576
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
13598
           "dev": true,
13577
           "dev": true,
13599
           "requires": {
13578
           "requires": {
13680
     },
13659
     },
13681
     "scss-tokenizer": {
13660
     "scss-tokenizer": {
13682
       "version": "0.2.3",
13661
       "version": "0.2.3",
13683
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
13662
+      "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
13684
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
13663
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
13685
       "dev": true,
13664
       "dev": true,
13686
       "requires": {
13665
       "requires": {
13690
       "dependencies": {
13669
       "dependencies": {
13691
         "source-map": {
13670
         "source-map": {
13692
           "version": "0.4.4",
13671
           "version": "0.4.4",
13693
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
13672
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz",
13694
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
13673
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
13695
           "dev": true,
13674
           "dev": true,
13696
           "requires": {
13675
           "requires": {
13853
     },
13832
     },
13854
     "shake.js": {
13833
     "shake.js": {
13855
       "version": "1.2.2",
13834
       "version": "1.2.2",
13856
-      "resolved": "https://registry.npmjs.org/shake.js/-/shake.js-1.2.2.tgz",
13835
+      "resolved": "https://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
13857
       "integrity": "sha1-sqxWCoKr5o14oCliOnCI4bMLrP8="
13836
       "integrity": "sha1-sqxWCoKr5o14oCliOnCI4bMLrP8="
13858
     },
13837
     },
13859
     "shallow-clone": {
13838
     "shallow-clone": {
14616
     },
14595
     },
14617
     "sync-request": {
14596
     "sync-request": {
14618
       "version": "3.0.1",
14597
       "version": "3.0.1",
14619
-      "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-3.0.1.tgz",
14598
+      "resolved": "https://registry.npm.taobao.org/sync-request/download/sync-request-3.0.1.tgz",
14620
       "integrity": "sha1-yqEjWq+Im6UBB2oYNMQ2gwqC+3M=",
14599
       "integrity": "sha1-yqEjWq+Im6UBB2oYNMQ2gwqC+3M=",
14621
       "dev": true,
14600
       "dev": true,
14622
       "requires": {
14601
       "requires": {
14704
     },
14683
     },
14705
     "then-request": {
14684
     "then-request": {
14706
       "version": "2.2.0",
14685
       "version": "2.2.0",
14707
-      "resolved": "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz",
14686
+      "resolved": "https://registry.npm.taobao.org/then-request/download/then-request-2.2.0.tgz",
14708
       "integrity": "sha1-ZnizL6DKIY/laZgbvYhxtZQGDYE=",
14687
       "integrity": "sha1-ZnizL6DKIY/laZgbvYhxtZQGDYE=",
14709
       "dev": true,
14688
       "dev": true,
14710
       "requires": {
14689
       "requires": {
14718
       "dependencies": {
14697
       "dependencies": {
14719
         "caseless": {
14698
         "caseless": {
14720
           "version": "0.11.0",
14699
           "version": "0.11.0",
14721
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
14700
+          "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.11.0.tgz",
14722
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
14701
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
14723
           "dev": true
14702
           "dev": true
14724
         }
14703
         }
15297
     },
15276
     },
15298
     "urllib": {
15277
     "urllib": {
15299
       "version": "0.5.1",
15278
       "version": "0.5.1",
15300
-      "resolved": "https://registry.npmjs.org/urllib/-/urllib-0.5.1.tgz",
15279
+      "resolved": "https://registry.npm.taobao.org/urllib/download/urllib-0.5.1.tgz",
15301
       "integrity": "sha1-niVrK3A9/gpZY3yw27QwjtVxlxs=",
15280
       "integrity": "sha1-niVrK3A9/gpZY3yw27QwjtVxlxs=",
15302
       "dev": true,
15281
       "dev": true,
15303
       "requires": {
15282
       "requires": {
15307
       "dependencies": {
15286
       "dependencies": {
15308
         "debug": {
15287
         "debug": {
15309
           "version": "0.7.2",
15288
           "version": "0.7.2",
15310
-          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.2.tgz",
15289
+          "resolved": "http://registry.npm.taobao.org/debug/download/debug-0.7.2.tgz",
15311
           "integrity": "sha1-BWaSyGZwl38RXegpF5GLjouaEPA=",
15290
           "integrity": "sha1-BWaSyGZwl38RXegpF5GLjouaEPA=",
15312
           "dev": true
15291
           "dev": true
15313
         }
15292
         }
15379
     },
15358
     },
15380
     "vanilla-masker": {
15359
     "vanilla-masker": {
15381
       "version": "1.2.0",
15360
       "version": "1.2.0",
15382
-      "resolved": "https://registry.npmjs.org/vanilla-masker/-/vanilla-masker-1.2.0.tgz",
15361
+      "resolved": "https://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
15383
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
15362
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
15384
     },
15363
     },
15385
     "vant": {
15364
     "vant": {
15676
     },
15655
     },
15677
     "vux-blazy": {
15656
     "vux-blazy": {
15678
       "version": "1.6.4",
15657
       "version": "1.6.4",
15679
-      "resolved": "https://registry.npmjs.org/vux-blazy/-/vux-blazy-1.6.4.tgz",
15658
+      "resolved": "https://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
15680
       "integrity": "sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78="
15659
       "integrity": "sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78="
15681
     },
15660
     },
15682
     "vux-loader": {
15661
     "vux-loader": {
15913
     },
15892
     },
15914
     "vux-xscroll": {
15893
     "vux-xscroll": {
15915
       "version": "3.1.12",
15894
       "version": "3.1.12",
15916
-      "resolved": "https://registry.npmjs.org/vux-xscroll/-/vux-xscroll-3.1.12.tgz",
15895
+      "resolved": "https://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
15917
       "integrity": "sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA="
15896
       "integrity": "sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA="
15918
     },
15897
     },
15919
     "w3c-hr-time": {
15898
     "w3c-hr-time": {

+ 6 - 0
src/pages/main/dialog/OrdersDialog.vue View File

939
         }
939
         }
940
       },
940
       },
941
       checkAdvice () {
941
       checkAdvice () {
942
+        if (this.$store.getters.user.user.user_type == 2 && !this.isPremission){
943
+          return
944
+        }
942
         if (this.currentAdvices.length <= 0) {
945
         if (this.currentAdvices.length <= 0) {
943
           return
946
           return
944
         }
947
         }
1069
         // });
1072
         // });
1070
       },
1073
       },
1071
       execAdvice () {
1074
       execAdvice () {
1075
+        if (this.$store.getters.user.user.user_type == 2 && !this.isPremission){
1076
+          return
1077
+        }
1072
 
1078
 
1073
         if (this.currentAdvices.length <= 0) {
1079
         if (this.currentAdvices.length <= 0) {
1074
           return
1080
           return

+ 1 - 1
src/pages/main/dialog/PrescriptionDialog.vue View File

1087
               this.zhiShow = true
1087
               this.zhiShow = true
1088
               this.totalShow = true
1088
               this.totalShow = true
1089
               this.huShow  = true  
1089
               this.huShow  = true  
1090
-              console.log("aaa")         
1090
+                
1091
             }
1091
             }
1092
           }
1092
           }
1093
         }
1093
         }

+ 1 - 1
src/pages/main/today/TodayTab.vue View File

1447
 }
1447
 }
1448
   .today_panel {
1448
   .today_panel {
1449
   height: calc(100% - 63px);
1449
   height: calc(100% - 63px);
1450
- 
1450
+
1451
   }
1451
   }
1452
 
1452
 
1453
   .mainContent {
1453
   .mainContent {