瀏覽代碼

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

xiaoming_global 5 年之前
父節點
當前提交
ec5e3b9fdb

+ 1 - 1
build/cdn.json 查看文件

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

+ 2 - 2
config/prod.env.js 查看文件

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 - 91
package-lock.json 查看文件

285
         }
285
         }
286
       }
286
       }
287
     },
287
     },
288
-    "@types/better-scroll": {
289
-      "version": "1.12.1",
290
-      "resolved": "https://registry.npmjs.org/@types/better-scroll/-/better-scroll-1.12.1.tgz",
291
-      "integrity": "sha512-jI/nmYl6+RbGsVIhJpqpoh09hC5Kf/OZiwYKCcfmoihpxxTPkeuNdz9DyRhdXf09Wgl1l9n/bOXXo9ucwgp4Lg=="
292
-    },
293
     "@types/commander": {
288
     "@types/commander": {
294
       "version": "2.12.2",
289
       "version": "2.12.2",
295
       "resolved": "https://registry.npmjs.org/@types/commander/-/commander-2.12.2.tgz",
290
       "resolved": "https://registry.npmjs.org/@types/commander/-/commander-2.12.2.tgz",
465
     },
460
     },
466
     "amdefine": {
461
     "amdefine": {
467
       "version": "1.0.1",
462
       "version": "1.0.1",
468
-      "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",
469
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
464
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
470
       "dev": true
465
       "dev": true
471
     },
466
     },
845
     },
840
     },
846
     "array-filter": {
841
     "array-filter": {
847
       "version": "1.0.0",
842
       "version": "1.0.0",
848
-      "resolved": "http://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
843
+      "resolved": "https://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
849
       "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
844
       "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
850
     },
845
     },
851
     "array-find": {
846
     "array-find": {
852
       "version": "1.0.0",
847
       "version": "1.0.0",
853
-      "resolved": "http://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
848
+      "resolved": "https://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
854
       "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg="
849
       "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg="
855
     },
850
     },
856
     "array-find-index": {
851
     "array-find-index": {
876
     },
871
     },
877
     "array-map": {
872
     "array-map": {
878
       "version": "0.0.0",
873
       "version": "0.0.0",
879
-      "resolved": "http://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
874
+      "resolved": "https://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
880
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
875
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
881
     },
876
     },
882
     "array-shuffle": {
877
     "array-shuffle": {
883
       "version": "1.0.1",
878
       "version": "1.0.1",
884
-      "resolved": "http://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
879
+      "resolved": "https://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
885
       "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo="
880
       "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo="
886
     },
881
     },
887
     "array-union": {
882
     "array-union": {
1010
     },
1005
     },
1011
     "async-foreach": {
1006
     "async-foreach": {
1012
       "version": "0.1.3",
1007
       "version": "0.1.3",
1013
-      "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",
1014
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
1009
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
1015
       "dev": true
1010
       "dev": true
1016
     },
1011
     },
1056
     },
1051
     },
1057
     "autosize": {
1052
     "autosize": {
1058
       "version": "3.0.21",
1053
       "version": "3.0.21",
1059
-      "resolved": "http://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
1054
+      "resolved": "https://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
1060
       "integrity": "sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM="
1055
       "integrity": "sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM="
1061
     },
1056
     },
1062
     "aws-sign2": {
1057
     "aws-sign2": {
2191
     },
2186
     },
2192
     "block-stream": {
2187
     "block-stream": {
2193
       "version": "0.0.9",
2188
       "version": "0.0.9",
2194
-      "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",
2195
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
2190
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
2196
       "dev": true,
2191
       "dev": true,
2197
       "requires": {
2192
       "requires": {
2318
       "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",
2319
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2314
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2320
       "dev": true,
2315
       "dev": true,
2321
-      "optional": true,
2322
       "requires": {
2316
       "requires": {
2323
         "hoek": "2.x.x"
2317
         "hoek": "2.x.x"
2324
       }
2318
       }
2482
     },
2476
     },
2483
     "buffer-concat": {
2477
     "buffer-concat": {
2484
       "version": "0.0.1",
2478
       "version": "0.0.1",
2485
-      "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",
2486
       "integrity": "sha1-Q+Hjx389IvtVvqaJCpLQN3jEwQo=",
2480
       "integrity": "sha1-Q+Hjx389IvtVvqaJCpLQN3jEwQo=",
2487
       "dev": true
2481
       "dev": true
2488
     },
2482
     },
3242
     },
3236
     },
3243
     "console-control-strings": {
3237
     "console-control-strings": {
3244
       "version": "1.1.0",
3238
       "version": "1.1.0",
3245
-      "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",
3246
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
3240
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
3247
       "dev": true
3241
       "dev": true
3248
     },
3242
     },
3426
     },
3420
     },
3427
     "countup.js": {
3421
     "countup.js": {
3428
       "version": "1.9.3",
3422
       "version": "1.9.3",
3429
-      "resolved": "http://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
3423
+      "resolved": "https://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
3430
       "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
3424
       "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
3431
     },
3425
     },
3432
     "crc32": {
3426
     "crc32": {
3433
       "version": "0.2.2",
3427
       "version": "0.2.2",
3434
-      "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",
3435
       "integrity": "sha1-etIg1v/c0Rn5/BJ6d3LKzqOQpLo=",
3429
       "integrity": "sha1-etIg1v/c0Rn5/BJ6d3LKzqOQpLo=",
3436
       "dev": true
3430
       "dev": true
3437
     },
3431
     },
4101
     },
4095
     },
4102
     "delegates": {
4096
     "delegates": {
4103
       "version": "1.0.0",
4097
       "version": "1.0.0",
4104
-      "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",
4105
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
4099
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
4106
       "dev": true
4100
       "dev": true
4107
     },
4101
     },
5305
     },
5299
     },
5306
     "fastclick": {
5300
     "fastclick": {
5307
       "version": "1.0.6",
5301
       "version": "1.0.6",
5308
-      "resolved": "http://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
5302
+      "resolved": "https://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
5309
       "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
5303
       "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
5310
     },
5304
     },
5311
     "fastparse": {
5305
     "fastparse": {
5624
     },
5618
     },
5625
     "formstream": {
5619
     "formstream": {
5626
       "version": "0.0.7",
5620
       "version": "0.0.7",
5627
-      "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",
5628
       "integrity": "sha1-mB0ANnQ1lsVIIO49+0S6yhg0l4g=",
5622
       "integrity": "sha1-mB0ANnQ1lsVIIO49+0S6yhg0l4g=",
5629
       "dev": true,
5623
       "dev": true,
5630
       "requires": {
5624
       "requires": {
5635
       "dependencies": {
5629
       "dependencies": {
5636
         "mime": {
5630
         "mime": {
5637
           "version": "1.2.9",
5631
           "version": "1.2.9",
5638
-          "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",
5639
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
5633
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
5640
           "dev": true
5634
           "dev": true
5641
         }
5635
         }
5748
         "ansi-regex": {
5742
         "ansi-regex": {
5749
           "version": "2.1.1",
5743
           "version": "2.1.1",
5750
           "bundled": true,
5744
           "bundled": true,
5751
-          "dev": true,
5752
-          "optional": true
5745
+          "dev": true
5753
         },
5746
         },
5754
         "aproba": {
5747
         "aproba": {
5755
           "version": "1.2.0",
5748
           "version": "1.2.0",
5770
         "balanced-match": {
5763
         "balanced-match": {
5771
           "version": "1.0.0",
5764
           "version": "1.0.0",
5772
           "bundled": true,
5765
           "bundled": true,
5773
-          "dev": true,
5774
-          "optional": true
5766
+          "dev": true
5775
         },
5767
         },
5776
         "brace-expansion": {
5768
         "brace-expansion": {
5777
           "version": "1.1.11",
5769
           "version": "1.1.11",
5778
           "bundled": true,
5770
           "bundled": true,
5779
           "dev": true,
5771
           "dev": true,
5780
-          "optional": true,
5781
           "requires": {
5772
           "requires": {
5782
             "balanced-match": "^1.0.0",
5773
             "balanced-match": "^1.0.0",
5783
             "concat-map": "0.0.1"
5774
             "concat-map": "0.0.1"
5792
         "code-point-at": {
5783
         "code-point-at": {
5793
           "version": "1.1.0",
5784
           "version": "1.1.0",
5794
           "bundled": true,
5785
           "bundled": true,
5795
-          "dev": true,
5796
-          "optional": true
5786
+          "dev": true
5797
         },
5787
         },
5798
         "concat-map": {
5788
         "concat-map": {
5799
           "version": "0.0.1",
5789
           "version": "0.0.1",
5800
           "bundled": true,
5790
           "bundled": true,
5801
-          "dev": true,
5802
-          "optional": true
5791
+          "dev": true
5803
         },
5792
         },
5804
         "console-control-strings": {
5793
         "console-control-strings": {
5805
           "version": "1.1.0",
5794
           "version": "1.1.0",
5806
           "bundled": true,
5795
           "bundled": true,
5807
-          "dev": true,
5808
-          "optional": true
5796
+          "dev": true
5809
         },
5797
         },
5810
         "core-util-is": {
5798
         "core-util-is": {
5811
           "version": "1.0.2",
5799
           "version": "1.0.2",
5922
         "inherits": {
5910
         "inherits": {
5923
           "version": "2.0.3",
5911
           "version": "2.0.3",
5924
           "bundled": true,
5912
           "bundled": true,
5925
-          "dev": true,
5926
-          "optional": true
5913
+          "dev": true
5927
         },
5914
         },
5928
         "ini": {
5915
         "ini": {
5929
           "version": "1.3.5",
5916
           "version": "1.3.5",
5935
           "version": "1.0.0",
5922
           "version": "1.0.0",
5936
           "bundled": true,
5923
           "bundled": true,
5937
           "dev": true,
5924
           "dev": true,
5938
-          "optional": true,
5939
           "requires": {
5925
           "requires": {
5940
             "number-is-nan": "^1.0.0"
5926
             "number-is-nan": "^1.0.0"
5941
           }
5927
           }
5950
           "version": "3.0.4",
5936
           "version": "3.0.4",
5951
           "bundled": true,
5937
           "bundled": true,
5952
           "dev": true,
5938
           "dev": true,
5953
-          "optional": true,
5954
           "requires": {
5939
           "requires": {
5955
             "brace-expansion": "^1.1.7"
5940
             "brace-expansion": "^1.1.7"
5956
           }
5941
           }
5958
         "minimist": {
5943
         "minimist": {
5959
           "version": "0.0.8",
5944
           "version": "0.0.8",
5960
           "bundled": true,
5945
           "bundled": true,
5961
-          "dev": true,
5962
-          "optional": true
5946
+          "dev": true
5963
         },
5947
         },
5964
         "minipass": {
5948
         "minipass": {
5965
           "version": "2.2.4",
5949
           "version": "2.2.4",
5966
           "bundled": true,
5950
           "bundled": true,
5967
           "dev": true,
5951
           "dev": true,
5968
-          "optional": true,
5969
           "requires": {
5952
           "requires": {
5970
             "safe-buffer": "^5.1.1",
5953
             "safe-buffer": "^5.1.1",
5971
             "yallist": "^3.0.0"
5954
             "yallist": "^3.0.0"
5984
           "version": "0.5.1",
5967
           "version": "0.5.1",
5985
           "bundled": true,
5968
           "bundled": true,
5986
           "dev": true,
5969
           "dev": true,
5987
-          "optional": true,
5988
           "requires": {
5970
           "requires": {
5989
             "minimist": "0.0.8"
5971
             "minimist": "0.0.8"
5990
           }
5972
           }
6065
         "number-is-nan": {
6047
         "number-is-nan": {
6066
           "version": "1.0.1",
6048
           "version": "1.0.1",
6067
           "bundled": true,
6049
           "bundled": true,
6068
-          "dev": true,
6069
-          "optional": true
6050
+          "dev": true
6070
         },
6051
         },
6071
         "object-assign": {
6052
         "object-assign": {
6072
           "version": "4.1.1",
6053
           "version": "4.1.1",
6078
           "version": "1.4.0",
6059
           "version": "1.4.0",
6079
           "bundled": true,
6060
           "bundled": true,
6080
           "dev": true,
6061
           "dev": true,
6081
-          "optional": true,
6082
           "requires": {
6062
           "requires": {
6083
             "wrappy": "1"
6063
             "wrappy": "1"
6084
           }
6064
           }
6164
         "safe-buffer": {
6144
         "safe-buffer": {
6165
           "version": "5.1.1",
6145
           "version": "5.1.1",
6166
           "bundled": true,
6146
           "bundled": true,
6167
-          "dev": true,
6168
-          "optional": true
6147
+          "dev": true
6169
         },
6148
         },
6170
         "safer-buffer": {
6149
         "safer-buffer": {
6171
           "version": "2.1.2",
6150
           "version": "2.1.2",
6201
           "version": "1.0.2",
6180
           "version": "1.0.2",
6202
           "bundled": true,
6181
           "bundled": true,
6203
           "dev": true,
6182
           "dev": true,
6204
-          "optional": true,
6205
           "requires": {
6183
           "requires": {
6206
             "code-point-at": "^1.0.0",
6184
             "code-point-at": "^1.0.0",
6207
             "is-fullwidth-code-point": "^1.0.0",
6185
             "is-fullwidth-code-point": "^1.0.0",
6221
           "version": "3.0.1",
6199
           "version": "3.0.1",
6222
           "bundled": true,
6200
           "bundled": true,
6223
           "dev": true,
6201
           "dev": true,
6224
-          "optional": true,
6225
           "requires": {
6202
           "requires": {
6226
             "ansi-regex": "^2.0.0"
6203
             "ansi-regex": "^2.0.0"
6227
           }
6204
           }
6265
         "wrappy": {
6242
         "wrappy": {
6266
           "version": "1.0.2",
6243
           "version": "1.0.2",
6267
           "bundled": true,
6244
           "bundled": true,
6268
-          "dev": true,
6269
-          "optional": true
6245
+          "dev": true
6270
         },
6246
         },
6271
         "yallist": {
6247
         "yallist": {
6272
           "version": "3.0.2",
6248
           "version": "3.0.2",
6273
           "bundled": true,
6249
           "bundled": true,
6274
-          "dev": true,
6275
-          "optional": true
6250
+          "dev": true
6276
         }
6251
         }
6277
       }
6252
       }
6278
     },
6253
     },
6338
     },
6313
     },
6339
     "gauge": {
6314
     "gauge": {
6340
       "version": "2.7.4",
6315
       "version": "2.7.4",
6341
-      "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",
6342
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
6317
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
6343
       "dev": true,
6318
       "dev": true,
6344
       "requires": {
6319
       "requires": {
6354
       "dependencies": {
6329
       "dependencies": {
6355
         "is-fullwidth-code-point": {
6330
         "is-fullwidth-code-point": {
6356
           "version": "1.0.0",
6331
           "version": "1.0.0",
6357
-          "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",
6358
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
6333
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
6359
           "dev": true,
6334
           "dev": true,
6360
           "requires": {
6335
           "requires": {
6363
         },
6338
         },
6364
         "string-width": {
6339
         "string-width": {
6365
           "version": "1.0.2",
6340
           "version": "1.0.2",
6366
-          "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",
6367
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
6342
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
6368
           "dev": true,
6343
           "dev": true,
6369
           "requires": {
6344
           "requires": {
6537
     },
6512
     },
6538
     "hammerjs": {
6513
     "hammerjs": {
6539
       "version": "2.0.8",
6514
       "version": "2.0.8",
6540
-      "resolved": "http://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
6515
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
6541
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
6516
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
6542
     },
6517
     },
6543
     "handle-thing": {
6518
     "handle-thing": {
6606
     },
6581
     },
6607
     "has-unicode": {
6582
     "has-unicode": {
6608
       "version": "2.0.1",
6583
       "version": "2.0.1",
6609
-      "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",
6610
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
6585
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
6611
       "dev": true
6586
       "dev": true
6612
     },
6587
     },
6730
       "version": "2.16.3",
6705
       "version": "2.16.3",
6731
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6706
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6732
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6707
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6733
-      "dev": true,
6734
-      "optional": true
6708
+      "dev": true
6735
     },
6709
     },
6736
     "home-or-tmp": {
6710
     "home-or-tmp": {
6737
       "version": "2.0.0",
6711
       "version": "2.0.0",
6880
     },
6854
     },
6881
     "http-basic": {
6855
     "http-basic": {
6882
       "version": "2.5.1",
6856
       "version": "2.5.1",
6883
-      "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",
6884
       "integrity": "sha1-jORHvbW2xXf4pj4/p4BW7Eu02/s=",
6858
       "integrity": "sha1-jORHvbW2xXf4pj4/p4BW7Eu02/s=",
6885
       "dev": true,
6859
       "dev": true,
6886
       "requires": {
6860
       "requires": {
6891
       "dependencies": {
6865
       "dependencies": {
6892
         "caseless": {
6866
         "caseless": {
6893
           "version": "0.11.0",
6867
           "version": "0.11.0",
6894
-          "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",
6895
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
6869
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
6896
           "dev": true
6870
           "dev": true
6897
         }
6871
         }
6974
     },
6948
     },
6975
     "http-response-object": {
6949
     "http-response-object": {
6976
       "version": "1.1.0",
6950
       "version": "1.1.0",
6977
-      "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",
6978
       "integrity": "sha1-p8TnWq6C87tJBOT0P2FWc7TVGMM=",
6952
       "integrity": "sha1-p8TnWq6C87tJBOT0P2FWc7TVGMM=",
6979
       "dev": true
6953
       "dev": true
6980
     },
6954
     },
7099
     },
7073
     },
7100
     "in-publish": {
7074
     "in-publish": {
7101
       "version": "2.0.0",
7075
       "version": "2.0.0",
7102
-      "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",
7103
       "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
7077
       "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
7104
       "dev": true
7078
       "dev": true
7105
     },
7079
     },
8716
     },
8690
     },
8717
     "lodash.throttle": {
8691
     "lodash.throttle": {
8718
       "version": "4.1.1",
8692
       "version": "4.1.1",
8719
-      "resolved": "http://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
8693
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
8720
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
8694
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
8721
     },
8695
     },
8722
     "lodash.unionwith": {
8696
     "lodash.unionwith": {
9589
     },
9563
     },
9590
     "normalize-wheel": {
9564
     "normalize-wheel": {
9591
       "version": "1.0.1",
9565
       "version": "1.0.1",
9592
-      "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",
9593
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
9567
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
9594
     },
9568
     },
9595
     "npm-run-path": {
9569
     "npm-run-path": {
10126
     },
10100
     },
10127
     "pause-stream": {
10101
     "pause-stream": {
10128
       "version": "0.0.11",
10102
       "version": "0.0.11",
10129
-      "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",
10130
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
10104
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
10131
       "dev": true,
10105
       "dev": true,
10132
       "requires": {
10106
       "requires": {
12553
     },
12527
     },
12554
     "qiniu": {
12528
     "qiniu": {
12555
       "version": "6.1.13",
12529
       "version": "6.1.13",
12556
-      "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",
12557
       "integrity": "sha1-V/XWCXTGTYhx2A8n331DIRrjTwM=",
12531
       "integrity": "sha1-V/XWCXTGTYhx2A8n331DIRrjTwM=",
12558
       "dev": true,
12532
       "dev": true,
12559
       "requires": {
12533
       "requires": {
12566
       "dependencies": {
12540
       "dependencies": {
12567
         "mime": {
12541
         "mime": {
12568
           "version": "1.2.9",
12542
           "version": "1.2.9",
12569
-          "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",
12570
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
12544
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
12571
           "dev": true
12545
           "dev": true
12572
         }
12546
         }
12574
     },
12548
     },
12575
     "qiniu-webpack-plugin": {
12549
     "qiniu-webpack-plugin": {
12576
       "version": "0.4.2",
12550
       "version": "0.4.2",
12577
-      "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",
12578
       "integrity": "sha1-eeSzD3KErNsOWP8os+PYaYQb/ts=",
12552
       "integrity": "sha1-eeSzD3KErNsOWP8os+PYaYQb/ts=",
12579
       "dev": true,
12553
       "dev": true,
12580
       "requires": {
12554
       "requires": {
12585
     },
12559
     },
12586
     "qr.js": {
12560
     "qr.js": {
12587
       "version": "0.0.0",
12561
       "version": "0.0.0",
12588
-      "resolved": "http://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
12562
+      "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
12589
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
12563
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
12590
     },
12564
     },
12591
     "qs": {
12565
     "qs": {
13507
     },
13481
     },
13508
     "sass-graph": {
13482
     "sass-graph": {
13509
       "version": "2.2.4",
13483
       "version": "2.2.4",
13510
-      "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",
13511
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
13485
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
13512
       "dev": true,
13486
       "dev": true,
13513
       "requires": {
13487
       "requires": {
13519
       "dependencies": {
13493
       "dependencies": {
13520
         "camelcase": {
13494
         "camelcase": {
13521
           "version": "3.0.0",
13495
           "version": "3.0.0",
13522
-          "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",
13523
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
13497
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
13524
           "dev": true
13498
           "dev": true
13525
         },
13499
         },
13526
         "cliui": {
13500
         "cliui": {
13527
           "version": "3.2.0",
13501
           "version": "3.2.0",
13528
-          "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",
13529
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
13503
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
13530
           "dev": true,
13504
           "dev": true,
13531
           "requires": {
13505
           "requires": {
13536
         },
13510
         },
13537
         "is-fullwidth-code-point": {
13511
         "is-fullwidth-code-point": {
13538
           "version": "1.0.0",
13512
           "version": "1.0.0",
13539
-          "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",
13540
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
13514
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
13541
           "dev": true,
13515
           "dev": true,
13542
           "requires": {
13516
           "requires": {
13545
         },
13519
         },
13546
         "os-locale": {
13520
         "os-locale": {
13547
           "version": "1.4.0",
13521
           "version": "1.4.0",
13548
-          "resolved": "http://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",
13549
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
13523
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
13550
           "dev": true,
13524
           "dev": true,
13551
           "requires": {
13525
           "requires": {
13554
         },
13528
         },
13555
         "string-width": {
13529
         "string-width": {
13556
           "version": "1.0.2",
13530
           "version": "1.0.2",
13557
-          "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",
13558
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
13532
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
13559
           "dev": true,
13533
           "dev": true,
13560
           "requires": {
13534
           "requires": {
13565
         },
13539
         },
13566
         "which-module": {
13540
         "which-module": {
13567
           "version": "1.0.0",
13541
           "version": "1.0.0",
13568
-          "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",
13569
           "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
13543
           "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
13570
           "dev": true
13544
           "dev": true
13571
         },
13545
         },
13572
         "y18n": {
13546
         "y18n": {
13573
           "version": "3.2.1",
13547
           "version": "3.2.1",
13574
-          "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",
13575
           "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
13549
           "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
13576
           "dev": true
13550
           "dev": true
13577
         },
13551
         },
13578
         "yargs": {
13552
         "yargs": {
13579
           "version": "7.1.0",
13553
           "version": "7.1.0",
13580
-          "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",
13581
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
13555
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
13582
           "dev": true,
13556
           "dev": true,
13583
           "requires": {
13557
           "requires": {
13598
         },
13572
         },
13599
         "yargs-parser": {
13573
         "yargs-parser": {
13600
           "version": "5.0.0",
13574
           "version": "5.0.0",
13601
-          "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",
13602
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
13576
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
13603
           "dev": true,
13577
           "dev": true,
13604
           "requires": {
13578
           "requires": {
13685
     },
13659
     },
13686
     "scss-tokenizer": {
13660
     "scss-tokenizer": {
13687
       "version": "0.2.3",
13661
       "version": "0.2.3",
13688
-      "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",
13689
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
13663
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
13690
       "dev": true,
13664
       "dev": true,
13691
       "requires": {
13665
       "requires": {
13695
       "dependencies": {
13669
       "dependencies": {
13696
         "source-map": {
13670
         "source-map": {
13697
           "version": "0.4.4",
13671
           "version": "0.4.4",
13698
-          "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",
13699
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
13673
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
13700
           "dev": true,
13674
           "dev": true,
13701
           "requires": {
13675
           "requires": {
13858
     },
13832
     },
13859
     "shake.js": {
13833
     "shake.js": {
13860
       "version": "1.2.2",
13834
       "version": "1.2.2",
13861
-      "resolved": "http://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
13835
+      "resolved": "https://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
13862
       "integrity": "sha1-sqxWCoKr5o14oCliOnCI4bMLrP8="
13836
       "integrity": "sha1-sqxWCoKr5o14oCliOnCI4bMLrP8="
13863
     },
13837
     },
13864
     "shallow-clone": {
13838
     "shallow-clone": {
14621
     },
14595
     },
14622
     "sync-request": {
14596
     "sync-request": {
14623
       "version": "3.0.1",
14597
       "version": "3.0.1",
14624
-      "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",
14625
       "integrity": "sha1-yqEjWq+Im6UBB2oYNMQ2gwqC+3M=",
14599
       "integrity": "sha1-yqEjWq+Im6UBB2oYNMQ2gwqC+3M=",
14626
       "dev": true,
14600
       "dev": true,
14627
       "requires": {
14601
       "requires": {
14709
     },
14683
     },
14710
     "then-request": {
14684
     "then-request": {
14711
       "version": "2.2.0",
14685
       "version": "2.2.0",
14712
-      "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",
14713
       "integrity": "sha1-ZnizL6DKIY/laZgbvYhxtZQGDYE=",
14687
       "integrity": "sha1-ZnizL6DKIY/laZgbvYhxtZQGDYE=",
14714
       "dev": true,
14688
       "dev": true,
14715
       "requires": {
14689
       "requires": {
14723
       "dependencies": {
14697
       "dependencies": {
14724
         "caseless": {
14698
         "caseless": {
14725
           "version": "0.11.0",
14699
           "version": "0.11.0",
14726
-          "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",
14727
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
14701
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
14728
           "dev": true
14702
           "dev": true
14729
         }
14703
         }
15302
     },
15276
     },
15303
     "urllib": {
15277
     "urllib": {
15304
       "version": "0.5.1",
15278
       "version": "0.5.1",
15305
-      "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",
15306
       "integrity": "sha1-niVrK3A9/gpZY3yw27QwjtVxlxs=",
15280
       "integrity": "sha1-niVrK3A9/gpZY3yw27QwjtVxlxs=",
15307
       "dev": true,
15281
       "dev": true,
15308
       "requires": {
15282
       "requires": {
15312
       "dependencies": {
15286
       "dependencies": {
15313
         "debug": {
15287
         "debug": {
15314
           "version": "0.7.2",
15288
           "version": "0.7.2",
15315
-          "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",
15316
           "integrity": "sha1-BWaSyGZwl38RXegpF5GLjouaEPA=",
15290
           "integrity": "sha1-BWaSyGZwl38RXegpF5GLjouaEPA=",
15317
           "dev": true
15291
           "dev": true
15318
         }
15292
         }
15384
     },
15358
     },
15385
     "vanilla-masker": {
15359
     "vanilla-masker": {
15386
       "version": "1.2.0",
15360
       "version": "1.2.0",
15387
-      "resolved": "http://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
15361
+      "resolved": "https://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
15388
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
15362
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
15389
     },
15363
     },
15390
     "vant": {
15364
     "vant": {
15681
     },
15655
     },
15682
     "vux-blazy": {
15656
     "vux-blazy": {
15683
       "version": "1.6.4",
15657
       "version": "1.6.4",
15684
-      "resolved": "http://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
15658
+      "resolved": "https://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
15685
       "integrity": "sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78="
15659
       "integrity": "sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78="
15686
     },
15660
     },
15687
     "vux-loader": {
15661
     "vux-loader": {
15918
     },
15892
     },
15919
     "vux-xscroll": {
15893
     "vux-xscroll": {
15920
       "version": "3.1.12",
15894
       "version": "3.1.12",
15921
-      "resolved": "http://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
15895
+      "resolved": "https://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
15922
       "integrity": "sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA="
15896
       "integrity": "sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA="
15923
     },
15897
     },
15924
     "w3c-hr-time": {
15898
     "w3c-hr-time": {

+ 0 - 1
package.json 查看文件

17
     "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
17
     "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
18
   },
18
   },
19
   "dependencies": {
19
   "dependencies": {
20
-    "@types/better-scroll": "^1.12.1",
21
     "axios": "^0.19.0",
20
     "axios": "^0.19.0",
22
     "better-scroll": "^1.15.2",
21
     "better-scroll": "^1.15.2",
23
     "cropperjs": "^1.4.3",
22
     "cropperjs": "^1.4.3",

+ 6 - 0
src/pages/main/dialog/OrdersDialog.vue 查看文件

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/today/TodayTab.vue 查看文件

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 {

+ 2 - 1
src/pages/personal/ElectronicSignature.vue 查看文件

431
       text-align: center;
431
       text-align: center;
432
       padding: 10px 0;
432
       padding: 10px 0;
433
       min-height: 200px;
433
       min-height: 200px;
434
+      overflow-x: hidden;
434
       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC");
435
       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC");
435
     }
436
     }
436
     .name {
437
     .name {
495
   flex-direction: column;
496
   flex-direction: column;
496
   > :first-child {
497
   > :first-child {
497
     flex: 1;
498
     flex: 1;
498
-    overflow: auto;
499
+    overflow-y: auto;
499
   }
500
   }
500
 }
501
 }
501
 </style>
502
 </style>