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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.206"
+  "version": "1.0.308"
 }

config/prod.env.js

@@ -1,9 +1,9 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
+  BASE_API: '"https://api.xt.kuyicloud.com"'
 
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

package-lock.json

@@ -285,11 +285,6 @@
         }
       }
     },
-    "@types/better-scroll": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@types/better-scroll/-/better-scroll-1.12.1.tgz",
-      "integrity": "sha512-jI/nmYl6+RbGsVIhJpqpoh09hC5Kf/OZiwYKCcfmoihpxxTPkeuNdz9DyRhdXf09Wgl1l9n/bOXXo9ucwgp4Lg=="
-    },
     "@types/commander": {
       "version": "2.12.2",
       "resolved": "https://registry.npmjs.org/@types/commander/-/commander-2.12.2.tgz",
@@ -465,7 +460,7 @@
     },
     "amdefine": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
@@ -845,12 +840,12 @@
     },
     "array-filter": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
       "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
     },
     "array-find": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
       "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg="
     },
     "array-find-index": {
@@ -876,12 +871,12 @@
     },
     "array-map": {
       "version": "0.0.0",
-      "resolved": "http://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
     },
     "array-shuffle": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
       "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo="
     },
     "array-union": {
@@ -1010,7 +1005,7 @@
     },
     "async-foreach": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
       "dev": true
     },
@@ -1056,7 +1051,7 @@
     },
     "autosize": {
       "version": "3.0.21",
-      "resolved": "http://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
+      "resolved": "https://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
       "integrity": "sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM="
     },
     "aws-sign2": {
@@ -2191,7 +2186,7 @@
     },
     "block-stream": {
       "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
@@ -2318,7 +2313,6 @@
       "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
@@ -2482,7 +2476,7 @@
     },
     "buffer-concat": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-concat/-/buffer-concat-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/buffer-concat/download/buffer-concat-0.0.1.tgz",
       "integrity": "sha1-Q+Hjx389IvtVvqaJCpLQN3jEwQo=",
       "dev": true
     },
@@ -3242,7 +3236,7 @@
     },
     "console-control-strings": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true
     },
@@ -3426,12 +3420,12 @@
     },
     "countup.js": {
       "version": "1.9.3",
-      "resolved": "http://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
       "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
     },
     "crc32": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/crc32/-/crc32-0.2.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/crc32/download/crc32-0.2.2.tgz",
       "integrity": "sha1-etIg1v/c0Rn5/BJ6d3LKzqOQpLo=",
       "dev": true
     },
@@ -4101,7 +4095,7 @@
     },
     "delegates": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
       "dev": true
     },
@@ -5305,7 +5299,7 @@
     },
     "fastclick": {
       "version": "1.0.6",
-      "resolved": "http://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
       "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
     },
     "fastparse": {
@@ -5624,7 +5618,7 @@
     },
     "formstream": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/formstream/-/formstream-0.0.7.tgz",
+      "resolved": "https://registry.npm.taobao.org/formstream/download/formstream-0.0.7.tgz",
       "integrity": "sha1-mB0ANnQ1lsVIIO49+0S6yhg0l4g=",
       "dev": true,
       "requires": {
@@ -5635,7 +5629,7 @@
       "dependencies": {
         "mime": {
           "version": "1.2.9",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.9.tgz",
+          "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",
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
           "dev": true
         }
@@ -5748,8 +5742,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5770,14 +5763,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5792,20 +5783,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5922,8 +5910,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5935,7 +5922,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5950,7 +5936,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5958,14 +5943,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5984,7 +5967,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6065,8 +6047,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6078,7 +6059,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6164,8 +6144,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6201,7 +6180,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6221,7 +6199,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6265,14 +6242,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -6338,7 +6313,7 @@
     },
     "gauge": {
       "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
@@ -6354,7 +6329,7 @@
       "dependencies": {
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
@@ -6363,7 +6338,7 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "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",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
@@ -6537,7 +6512,7 @@
     },
     "hammerjs": {
       "version": "2.0.8",
-      "resolved": "http://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handle-thing": {
@@ -6606,7 +6581,7 @@
     },
     "has-unicode": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
       "dev": true
     },
@@ -6730,8 +6705,7 @@
       "version": "2.16.3",
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -6880,7 +6854,7 @@
     },
     "http-basic": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/http-basic/download/http-basic-2.5.1.tgz",
       "integrity": "sha1-jORHvbW2xXf4pj4/p4BW7Eu02/s=",
       "dev": true,
       "requires": {
@@ -6891,7 +6865,7 @@
       "dependencies": {
         "caseless": {
           "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.11.0.tgz",
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
           "dev": true
         }
@@ -6974,7 +6948,7 @@
     },
     "http-response-object": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/http-response-object/download/http-response-object-1.1.0.tgz",
       "integrity": "sha1-p8TnWq6C87tJBOT0P2FWc7TVGMM=",
       "dev": true
     },
@@ -7099,7 +7073,7 @@
     },
     "in-publish": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/in-publish/download/in-publish-2.0.0.tgz",
       "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
       "dev": true
     },
@@ -8716,7 +8690,7 @@
     },
     "lodash.throttle": {
       "version": "4.1.1",
-      "resolved": "http://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
     "lodash.unionwith": {
@@ -9589,7 +9563,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "npm-run-path": {
@@ -10126,7 +10100,7 @@
     },
     "pause-stream": {
       "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "resolved": "https://registry.npm.taobao.org/pause-stream/download/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
@@ -12553,7 +12527,7 @@
     },
     "qiniu": {
       "version": "6.1.13",
-      "resolved": "https://registry.npmjs.org/qiniu/-/qiniu-6.1.13.tgz",
+      "resolved": "https://registry.npm.taobao.org/qiniu/download/qiniu-6.1.13.tgz",
       "integrity": "sha1-V/XWCXTGTYhx2A8n331DIRrjTwM=",
       "dev": true,
       "requires": {
@@ -12566,7 +12540,7 @@
       "dependencies": {
         "mime": {
           "version": "1.2.9",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.9.tgz",
+          "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",
           "integrity": "sha1-AJzUCGe9Nd5SGzuWbwTi+NTRPQk=",
           "dev": true
         }
@@ -12574,7 +12548,7 @@
     },
     "qiniu-webpack-plugin": {
       "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/qiniu-webpack-plugin/-/qiniu-webpack-plugin-0.4.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/qiniu-webpack-plugin/download/qiniu-webpack-plugin-0.4.2.tgz",
       "integrity": "sha1-eeSzD3KErNsOWP8os+PYaYQb/ts=",
       "dev": true,
       "requires": {
@@ -12585,7 +12559,7 @@
     },
     "qr.js": {
       "version": "0.0.0",
-      "resolved": "http://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
     },
     "qs": {
@@ -13507,7 +13481,7 @@
     },
     "sass-graph": {
       "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
@@ -13519,13 +13493,13 @@
       "dependencies": {
         "camelcase": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "dev": true
         },
         "cliui": {
           "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "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",
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
@@ -13536,7 +13510,7 @@
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
@@ -13545,7 +13519,7 @@
         },
         "os-locale": {
           "version": "1.4.0",
-          "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz",
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
           "dev": true,
           "requires": {
@@ -13554,7 +13528,7 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "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",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
@@ -13565,19 +13539,19 @@
         },
         "which-module": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz",
           "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
           "dev": true
         },
         "y18n": {
           "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz",
           "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
           "dev": true
         },
         "yargs": {
           "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz",
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
@@ -13598,7 +13572,7 @@
         },
         "yargs-parser": {
           "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0.tgz",
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
           "dev": true,
           "requires": {
@@ -13685,7 +13659,7 @@
     },
     "scss-tokenizer": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
@@ -13695,7 +13669,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
@@ -13858,7 +13832,7 @@
     },
     "shake.js": {
       "version": "1.2.2",
-      "resolved": "http://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
       "integrity": "sha1-sqxWCoKr5o14oCliOnCI4bMLrP8="
     },
     "shallow-clone": {
@@ -14621,7 +14595,7 @@
     },
     "sync-request": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-3.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/sync-request/download/sync-request-3.0.1.tgz",
       "integrity": "sha1-yqEjWq+Im6UBB2oYNMQ2gwqC+3M=",
       "dev": true,
       "requires": {
@@ -14709,7 +14683,7 @@
     },
     "then-request": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/then-request/download/then-request-2.2.0.tgz",
       "integrity": "sha1-ZnizL6DKIY/laZgbvYhxtZQGDYE=",
       "dev": true,
       "requires": {
@@ -14723,7 +14697,7 @@
       "dependencies": {
         "caseless": {
           "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.11.0.tgz",
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
           "dev": true
         }
@@ -15302,7 +15276,7 @@
     },
     "urllib": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/urllib/-/urllib-0.5.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/urllib/download/urllib-0.5.1.tgz",
       "integrity": "sha1-niVrK3A9/gpZY3yw27QwjtVxlxs=",
       "dev": true,
       "requires": {
@@ -15312,7 +15286,7 @@
       "dependencies": {
         "debug": {
           "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.2.tgz",
+          "resolved": "http://registry.npm.taobao.org/debug/download/debug-0.7.2.tgz",
           "integrity": "sha1-BWaSyGZwl38RXegpF5GLjouaEPA=",
           "dev": true
         }
@@ -15384,7 +15358,7 @@
     },
     "vanilla-masker": {
       "version": "1.2.0",
-      "resolved": "http://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
     },
     "vant": {
@@ -15681,7 +15655,7 @@
     },
     "vux-blazy": {
       "version": "1.6.4",
-      "resolved": "http://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
       "integrity": "sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78="
     },
     "vux-loader": {
@@ -15918,7 +15892,7 @@
     },
     "vux-xscroll": {
       "version": "3.1.12",
-      "resolved": "http://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
+      "resolved": "https://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
       "integrity": "sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA="
     },
     "w3c-hr-time": {

package.json

@@ -17,7 +17,6 @@
     "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
   },
   "dependencies": {
-    "@types/better-scroll": "^1.12.1",
     "axios": "^0.19.0",
     "better-scroll": "^1.15.2",
     "cropperjs": "^1.4.3",

src/pages/main/dialog/OrdersDialog.vue

@@ -939,6 +939,9 @@
         }
       },
       checkAdvice () {
+        if (this.$store.getters.user.user.user_type == 2 && !this.isPremission){
+          return
+        }
         if (this.currentAdvices.length <= 0) {
           return
         }
@@ -1069,6 +1072,9 @@
         // });
       },
       execAdvice () {
+        if (this.$store.getters.user.user.user_type == 2 && !this.isPremission){
+          return
+        }
 
         if (this.currentAdvices.length <= 0) {
           return

src/pages/main/today/TodayTab.vue

@@ -1447,7 +1447,7 @@ import {parseTime} from '@/utils'
 }
   .today_panel {
   height: calc(100% - 63px);
- 
+
   }
 
   .mainContent {

src/pages/personal/ElectronicSignature.vue

@@ -431,6 +431,7 @@ export default {
       text-align: center;
       padding: 10px 0;
       min-height: 200px;
+      overflow-x: hidden;
       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC");
     }
     .name {
@@ -495,7 +496,7 @@ export default {
   flex-direction: column;
   > :first-child {
     flex: 1;
-    overflow: auto;
+    overflow-y: auto;
   }
 }
 </style>