默认提交

@@ -33,6 +33,11 @@
       "integrity": "sha1-aQoUdbhPKohP0HzXl8APXzE1bqg=",
       "dev": true
     },
+    "@vant/weapp": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/@vant/weapp/download/@vant/weapp-1.0.2.tgz",
+      "integrity": "sha1-1xyxDXjloa7EDYIuTUbCZWBhXqI="
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
@@ -525,7 +530,8 @@
       "version": "1.3.0",
       "resolved": "http://registry.npm.taobao.org/base64-js/download/base64-js-1.3.0.tgz",
       "integrity": "sha1-yrHmEY8FEJXli1KBrqjBzSK/wOM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -758,6 +764,7 @@
           "resolved": "http://registry.npm.taobao.org/p-timeout/download/p-timeout-2.0.1.tgz",
           "integrity": "sha1-2N0ZeVldLcATnh/ka4tkbLPN8Dg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "p-finally": "^1.0.0"
           }
@@ -798,6 +805,7 @@
       "resolved": "http://registry.npm.taobao.org/bl/download/bl-1.2.2.tgz",
       "integrity": "sha1-oWCRFxcQPAdBDO9j71Gzl8Alr5w=",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -874,6 +882,7 @@
       "resolved": "http://registry.npm.taobao.org/buffer/download/buffer-5.2.1.tgz",
       "integrity": "sha1-3Vf6DxCaxZxgJHkETcp7iz0LcdY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4"
@@ -884,6 +893,7 @@
       "resolved": "http://registry.npm.taobao.org/buffer-alloc/download/buffer-alloc-1.2.0.tgz",
       "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-alloc-unsafe": "^1.1.0",
         "buffer-fill": "^1.0.0"
@@ -893,13 +903,15 @@
       "version": "1.1.0",
       "resolved": "http://registry.npm.taobao.org/buffer-alloc-unsafe/download/buffer-alloc-unsafe-1.1.0.tgz",
       "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "http://registry.npm.taobao.org/buffer-crc32/download/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-equal": {
       "version": "1.0.0",
@@ -911,7 +923,8 @@
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/buffer-fill/download/buffer-fill-1.0.0.tgz",
       "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-from": {
       "version": "1.1.1",
@@ -1002,6 +1015,7 @@
       "resolved": "http://registry.npm.taobao.org/caw/download/caw-2.0.1.tgz",
       "integrity": "sha1-bDygcfwZRyCIPC3F2psHS/x+npU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-proxy": "^2.0.0",
         "isurl": "^1.0.0-alpha5",
@@ -1254,6 +1268,7 @@
       "resolved": "http://registry.npm.taobao.org/commander/download/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -1287,6 +1302,7 @@
       "resolved": "http://registry.npm.taobao.org/config-chain/download/config-chain-1.1.12.tgz",
       "integrity": "sha1-D96NCRIA616AjK8l/mGMAvSOTvo=",
       "dev": true,
+      "optional": true,
       "requires": {
         "ini": "^1.3.4",
         "proto-list": "~1.2.1"
@@ -1310,6 +1326,7 @@
       "resolved": "http://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.3.tgz",
       "integrity": "sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70=",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "5.1.2"
       }
@@ -1409,6 +1426,7 @@
       "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz",
       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "lru-cache": "^4.0.1",
         "shebang-command": "^1.2.0",
@@ -1598,6 +1616,7 @@
       "resolved": "http://registry.npm.taobao.org/decompress/download/decompress-4.2.0.tgz",
       "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
       "dev": true,
+      "optional": true,
       "requires": {
         "decompress-tar": "^4.0.0",
         "decompress-tarbz2": "^4.0.0",
@@ -1613,7 +1632,8 @@
           "version": "2.3.0",
           "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1622,6 +1642,7 @@
       "resolved": "http://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz",
       "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "dev": true,
+      "optional": true,
       "requires": {
         "mimic-response": "^1.0.0"
       }
@@ -1631,6 +1652,7 @@
       "resolved": "http://registry.npm.taobao.org/decompress-tar/download/decompress-tar-4.1.1.tgz",
       "integrity": "sha1-cYy9P8sWIJcW5womuE57pFkuWvE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^5.2.0",
         "is-stream": "^1.1.0",
@@ -1641,7 +1663,8 @@
           "version": "5.2.0",
           "resolved": "http://registry.npm.taobao.org/file-type/download/file-type-5.2.0.tgz",
           "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1650,6 +1673,7 @@
       "resolved": "http://registry.npm.taobao.org/decompress-tarbz2/download/decompress-tarbz2-4.1.1.tgz",
       "integrity": "sha1-MIKluIDqQEOBY0nzeLVsUWvho5s=",
       "dev": true,
+      "optional": true,
       "requires": {
         "decompress-tar": "^4.1.0",
         "file-type": "^6.1.0",
@@ -1662,7 +1686,8 @@
           "version": "6.2.0",
           "resolved": "http://registry.npm.taobao.org/file-type/download/file-type-6.2.0.tgz",
           "integrity": "sha1-5QzXXTVv/tTjBtxPW89Sp5kDqRk=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1671,6 +1696,7 @@
       "resolved": "http://registry.npm.taobao.org/decompress-targz/download/decompress-targz-4.1.1.tgz",
       "integrity": "sha1-wJvDXE0R894J8tLaU+neI+fOHu4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "decompress-tar": "^4.1.1",
         "file-type": "^5.2.0",
@@ -1681,7 +1707,8 @@
           "version": "5.2.0",
           "resolved": "http://registry.npm.taobao.org/file-type/download/file-type-5.2.0.tgz",
           "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1690,6 +1717,7 @@
       "resolved": "http://registry.npm.taobao.org/decompress-unzip/download/decompress-unzip-4.0.1.tgz",
       "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.8.0",
         "get-stream": "^2.2.0",
@@ -1701,13 +1729,15 @@
           "version": "3.9.0",
           "resolved": "http://registry.npm.taobao.org/file-type/download/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "get-stream": {
           "version": "2.3.1",
           "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-2.3.1.tgz",
           "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "object-assign": "^4.0.1",
             "pinkie-promise": "^2.0.0"
@@ -1717,7 +1747,8 @@
           "version": "2.3.0",
           "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1971,7 +2002,8 @@
       "version": "0.1.4",
       "resolved": "http://registry.npm.taobao.org/duplexer3/download/duplexer3-0.1.4.tgz",
       "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "duplexify": {
       "version": "3.7.1",
@@ -2213,6 +2245,7 @@
       "resolved": "http://registry.npm.taobao.org/execa/download/execa-0.7.0.tgz",
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
+      "optional": true,
       "requires": {
         "cross-spawn": "^5.0.1",
         "get-stream": "^3.0.0",
@@ -2291,6 +2324,7 @@
       "resolved": "http://registry.npm.taobao.org/ext-list/download/ext-list-2.2.2.tgz",
       "integrity": "sha1-C5jmTtgvWs8PKTG6v2khLvUt3Tc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "mime-db": "^1.28.0"
       }
@@ -2300,6 +2334,7 @@
       "resolved": "http://registry.npm.taobao.org/ext-name/download/ext-name-5.0.0.tgz",
       "integrity": "sha1-cHgZgdGD7hXROZPIgiBFxQbI8KY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "ext-list": "^2.0.0",
         "sort-keys-length": "^1.0.0"
@@ -2504,6 +2539,7 @@
       "resolved": "http://registry.npm.taobao.org/fd-slicer/download/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -2535,13 +2571,15 @@
       "version": "2.0.0",
       "resolved": "http://registry.npm.taobao.org/filename-reserved-regex/download/filename-reserved-regex-2.0.0.tgz",
       "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "filenamify": {
       "version": "2.1.0",
       "resolved": "http://registry.npm.taobao.org/filenamify/download/filenamify-2.1.0.tgz",
       "integrity": "sha1-iPr0lfsbR6v9YSMAACoWIoxnfuk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "filename-reserved-regex": "^2.0.0",
         "strip-outer": "^1.0.0",
@@ -2716,7 +2754,8 @@
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/fs-constants/download/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -2765,7 +2804,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2786,12 +2826,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2806,17 +2848,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2933,7 +2978,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2945,6 +2991,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2959,6 +3006,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2966,12 +3014,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -2990,6 +3040,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3070,7 +3121,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3082,6 +3134,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3167,7 +3220,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3203,6 +3257,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3222,6 +3277,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3265,12 +3321,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3353,6 +3411,7 @@
       "resolved": "http://registry.npm.taobao.org/get-proxy/download/get-proxy-2.1.0.tgz",
       "integrity": "sha1-NJ8rTZHUTE1NTpy6KtkBQ/rF75M=",
       "dev": true,
+      "optional": true,
       "requires": {
         "npm-conf": "^1.1.0"
       }
@@ -3367,7 +3426,8 @@
       "version": "3.0.0",
       "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz",
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "get-value": {
       "version": "2.0.6",
@@ -3656,7 +3716,8 @@
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/graceful-readlink/download/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "growl": {
       "version": "1.10.5",
@@ -4148,7 +4209,8 @@
       "version": "1.4.2",
       "resolved": "http://registry.npm.taobao.org/has-symbol-support-x/download/has-symbol-support-x-1.4.2.tgz",
       "integrity": "sha1-FAn5i8ACR9pF2mfO4KNvKC/yZFU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "has-symbols": {
       "version": "1.0.0",
@@ -4161,6 +4223,7 @@
       "resolved": "http://registry.npm.taobao.org/has-to-string-tag-x/download/has-to-string-tag-x-1.4.1.tgz",
       "integrity": "sha1-oEWrOD17SyASoAFIqwql8pAETU0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "has-symbol-support-x": "^1.4.1"
       }
@@ -4263,7 +4326,8 @@
       "version": "1.1.13",
       "resolved": "http://registry.npm.taobao.org/ieee754/download/ieee754-1.1.13.tgz",
       "integrity": "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "ignore": {
       "version": "3.3.10",
@@ -4622,7 +4686,8 @@
       "version": "4.0.1",
       "resolved": "http://registry.npm.taobao.org/is-natural-number/download/is-natural-number-4.0.1.tgz",
       "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-negated-glob": {
       "version": "1.0.0",
@@ -4660,7 +4725,8 @@
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/is-object/download/is-object-1.0.1.tgz",
       "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-path-cwd": {
       "version": "2.0.0",
@@ -4690,7 +4756,8 @@
       "version": "1.1.0",
       "resolved": "http://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-1.1.0.tgz",
       "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -4736,7 +4803,8 @@
       "version": "1.1.0",
       "resolved": "http://registry.npm.taobao.org/is-retry-allowed/download/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -4836,6 +4904,7 @@
       "resolved": "http://registry.npm.taobao.org/isurl/download/isurl-1.0.0.tgz",
       "integrity": "sha1-sn9PSfPNqj6kSgpbfzRi5u3DnWc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "has-to-string-tag-x": "^1.2.0",
         "is-object": "^1.0.1"
@@ -5398,7 +5467,8 @@
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -5597,7 +5667,8 @@
       "version": "1.39.0",
       "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.39.0.tgz",
       "integrity": "sha1-+VogJ1dC99KtBCms/kD0IzVDeA4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "mime-types": {
       "version": "2.1.22",
@@ -5626,7 +5697,8 @@
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz",
       "integrity": "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "minimatch": {
       "version": "3.0.4",
@@ -6015,6 +6087,7 @@
       "resolved": "http://registry.npm.taobao.org/npm-conf/download/npm-conf-1.1.3.tgz",
       "integrity": "sha1-JWzEe9DiGMJZxOlVC/QTvCGSr/k=",
       "dev": true,
+      "optional": true,
       "requires": {
         "config-chain": "^1.1.11",
         "pify": "^3.0.0"
@@ -6024,7 +6097,8 @@
           "version": "3.0.0",
           "resolved": "http://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz",
           "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -6380,6 +6454,7 @@
       "resolved": "http://registry.npm.taobao.org/p-timeout/download/p-timeout-1.2.1.tgz",
       "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "p-finally": "^1.0.0"
       }
@@ -6863,7 +6938,8 @@
       "version": "1.2.4",
       "resolved": "http://registry.npm.taobao.org/proto-list/download/proto-list-1.2.4.tgz",
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "pseudomap": {
       "version": "1.0.2",
@@ -7411,6 +7487,7 @@
       "resolved": "http://registry.npm.taobao.org/seek-bzip/download/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
+      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -7692,6 +7769,7 @@
       "resolved": "http://registry.npm.taobao.org/sort-keys/download/sort-keys-1.1.2.tgz",
       "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-plain-obj": "^1.0.0"
       }
@@ -7701,6 +7779,7 @@
       "resolved": "http://registry.npm.taobao.org/sort-keys-length/download/sort-keys-length-1.0.1.tgz",
       "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
       "dev": true,
+      "optional": true,
       "requires": {
         "sort-keys": "^1.0.0"
       }
@@ -8178,6 +8257,7 @@
       "resolved": "http://registry.npm.taobao.org/strip-dirs/download/strip-dirs-2.1.0.tgz",
       "integrity": "sha1-SYdzYmT8NEzyD2w0rKnRPR1O1sU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-natural-number": "^4.0.1"
       }
@@ -8202,6 +8282,7 @@
       "resolved": "http://registry.npm.taobao.org/strip-outer/download/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -8475,6 +8556,7 @@
       "resolved": "http://registry.npm.taobao.org/tar-stream/download/tar-stream-1.6.2.tgz",
       "integrity": "sha1-jqVdqzeXIlPZqa+Q/c1VmuQ1xVU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -8489,13 +8571,15 @@
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/temp-dir/download/temp-dir-1.0.0.tgz",
       "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "tempfile": {
       "version": "2.0.0",
       "resolved": "http://registry.npm.taobao.org/tempfile/download/tempfile-2.0.0.tgz",
       "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "temp-dir": "^1.0.0",
         "uuid": "^3.0.1"
@@ -8585,7 +8669,8 @@
       "version": "4.0.1",
       "resolved": "http://registry.npm.taobao.org/timed-out/download/timed-out-4.0.1.tgz",
       "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "to-absolute-glob": {
       "version": "2.0.2",
@@ -8601,7 +8686,8 @@
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/to-buffer/download/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "to-object-path": {
       "version": "0.3.0",
@@ -8683,6 +8769,7 @@
       "resolved": "http://registry.npm.taobao.org/trim-repeated/download/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -8777,6 +8864,7 @@
       "resolved": "http://registry.npm.taobao.org/unbzip2-stream/download/unbzip2-stream-1.3.3.tgz",
       "integrity": "sha1-0VbSBeZw2NjDk+HALr1QZCKHP2o=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
@@ -8943,7 +9031,8 @@
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/url-to-options/download/url-to-options-1.0.1.tgz",
       "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "use": {
       "version": "3.1.1",
@@ -9475,6 +9564,7 @@
       "resolved": "http://registry.npm.taobao.org/yauzl/download/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"

@@ -48,5 +48,8 @@
     "postcss-lazysprite": "^2.0.0",
     "postcss-px2rpx": "0.0.4",
     "yargs": "^13.1.0"
+  },
+  "dependencies": {
+    "@vant/weapp": "^1.0.2"
   }
 }

@@ -22,6 +22,7 @@
     "empty-tips": "../../component/empty-tips/empty-tips",
     "shortcut": "../../component/shortcut/shortcut",
     "van-popup": "../../ui/vant-weapp/popup/index",
+    "van-dialog": "../../ui/vant-weapp/dialog/index",
     "van-sticky": "../../ui/vant-weapp/sticky/index",
     "van-tab": "../../ui/vant-weapp/tab/index",
     "van-tabs": "../../ui/vant-weapp/tabs/index"

@@ -15,6 +15,8 @@ module.exports = {
   wxPay: '/wx/pay', // 帐号详情
   stat: '/dot', //  打点
 
+  blessDetail: "/bless/detail", //
+
   /**
    * 通用接口
    * 请求时 "mode"传"custom"

@@ -3,7 +3,10 @@ let Store = require('./../utils/stroage');
 let Router = require('./../router/index');
 const errMsg = '服务异常，请稍后重试';
 
-// let isWxLogin = false;
+/**
+ * 1.业务接口返回404时，会自动调用自定义login接口重拉sessionId，成功后会重新调用该业务接口
+ * 2.当自定义login接口返回状态码不为200时，弹出授权登陆
+ */
 
 function wxLogin() {
   return new Promise((resolve, reject) => {
@@ -58,6 +61,7 @@ function login() {
           } = res2.data;
           if (code == 200 && content.sessionId) {
             Store.setItem('sessionId', content.sessionId);
+            Store.setItem('memberCode', content.memberCode);
             resolve();
           } else {
             wx.hideLoading();
@@ -128,9 +132,6 @@ const fetch = function ({
           if (res.code == 404) {
             //登陆失效的回调
             Store.clear("sessionId");
-            // wx.reLaunch({
-            //   url: '/pages/index/index'
-            // })
             // 404后拉取登陆后再做一次
             login().then((resultLogin) => {
               wx.request({

@@ -2,6 +2,9 @@ import {
   getBindtapData
 } from '../../utils/util';
 
+
+import Dialog from '../../ui/vant-weapp/dialog/dialog';
+
 let app = getApp();
 Page({
   data: {
@@ -12,6 +15,10 @@ Page({
     productList: [], // 产品列表
     indexInfo: {},
     userInfo: {},
+    show: true,
+    detailData: {},
+    memberList: [],
+    options: {}
   },
   onShareAppMessage() {},
   showAuth() {
@@ -19,7 +26,25 @@ Page({
       authorizeVisible: true
     })
   },
-  onLoad(options) {},
+  onLoad(options) {
+    this.setData({
+      options
+    });
+    this.queryBlessDetail();
+    this.initData();
+    // Dialog.confirm({
+    //     title: '标题',
+    //     message: '弹窗内容',
+    //     asyncClose: true
+    //   }).then(() => {
+    //     setTimeout(() => {
+    //       Dialog.close();
+    //     }, 1000);
+    //   })
+    //   .catch(() => {
+    //     Dialog.close();
+    //   });
+  },
 
   /**
    * 基础方法
@@ -33,12 +58,12 @@ Page({
    * 做加载更多操作
    */
   onReachBottom() {
-    if (this.data.dataList.length < this.data.total) {
-      this.setData({
-        page: this.data.page + 1
-      });
-      this.queryDataList();
-    }
+    // if (this.data.dataList.length < this.data.total) {
+    //   this.setData({
+    //     page: this.data.page + 1
+    //   });
+    //   this.queryDataList();
+    // }
   },
 
   // 重置页面列表 点击搜索条件时需要
@@ -74,6 +99,30 @@ Page({
     });
   },
 
+
+  /**
+   * 视频详情
+   */
+  queryBlessDetail() {
+    return new Promise((resolve, reject) => {
+      app.post({
+        url: app.api.blessDetail,
+        data: {
+          blessCode: this.data.options.c,
+          ownerMemberCode: this.data.options.m ? this.data.options.m : app.store.getItem("memberCode") ? app.store.getItem("memberCode") : "",
+        }
+      }).then((result) => {
+        this.setData({
+          detailData: result,
+          memberList: result.memberList
+        });
+        resolve(result);
+      }).catch((err) => {
+        reject(err);
+      });
+    });
+  },
+
   /**
    * 隐藏蒙层
    */
@@ -99,9 +148,9 @@ Page({
         this.hideMask();
         break;
 
-      /**
-       * 重拉数据已在
-       */
+        /**
+         * 重拉数据已在
+         */
       case "_evt_auth_complete":
         // this.initData();
         this.hideMask();

@@ -7,7 +7,7 @@
     <!-- <view class="top-bg"></view> -->
     <view class="top-space"></view>
     <view class="content">
-      <view class="title">大年初一</view>
+      <view class="title">{{detailData.lunarCalendar}}</view>
       <!-- 用户 -->
       <view class="user">
         <!-- 用户头像 -->
@@ -17,18 +17,18 @@
         </view>
         <!-- 用户名称 -->
         <view class="name">
-          <view class="tt">姓名</view>
+          <view class="tt">{{detailData.familyName}}</view>
           <image class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
         </view>
         <!-- 编辑 -->
         <view class="edit">
-          <view class="tt t1">携家人</view>
+          <view class="tt t1">{{detailData.sentence}}</view>
           <image class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
-          <view class="tt t2">2人</view>
+          <view class="tt t2">{{memberList.length}}人</view>
         </view>
         <!-- 用户组 -->
         <view class="group">
-          <view wx:for="{{6}}" class="group-item">
+          <view wx:for="{{memberList}}" wx:key="{{index}}" class="group-item">
             <view class="group-item-portrait"></view>
             <view class="group-item-name">
               <view class="t1">李四</view>
@@ -42,7 +42,7 @@
           <image class="icon-down" mode="widthFix" src="../../image/blessing/icon-down-arrow.png" />
         </view>
         <!-- 自定义句子 -->
-        <view class="sentence">给您拜年啦！</view>
+        <view class="sentence">{{detailData.sentence}}</view>
       </view>
       <!-- 尾部内容 -->
       <view class="tail">
@@ -77,3 +77,4 @@
     </view>
   </view>
 </view>
+<van-dialog id="van-dialog" />

@@ -12,11 +12,12 @@ Page({
     size: 10,
     dataList: [],
     tabList: [], // 标签列表
+    listType: 2, // 	0是普通视频列表 1是推荐 2是祝福语 非2就是普通视频
     bannerList: [],
     curTab: {},
     queueCode: "", // 队列标识，每次请求，会返回一个队列标识，用户加载更多时候请携带queueCode参数
     active: 0,
-    curBanner: {}
+    curBanner: {},
   },
   onShareAppMessage(res) {
     if (res.from === 'button') {
@@ -110,15 +111,29 @@ Page({
    */
   onDetailHandler(evt) {
     let curItem = getBindtapData(evt);
-    let videoCode = curItem.videoCode || ""
-    if (videoCode) {
-      app.router.push({
-        path: "detail",
-        query: {
-          c: videoCode
-        }
-      })
+    let listType = this.data.listType;
+    if (listType == 2) {
+      let blessCode = curItem.blessCode || "";
+      if (blessCode) {
+        app.router.push({
+          path: "blessing",
+          query: {
+            c: blessCode
+          }
+        })
+      }
+    } else {
+      let videoCode = curItem.videoCode || "";
+      if (videoCode) {
+        app.router.push({
+          path: "detail",
+          query: {
+            c: videoCode
+          }
+        })
+      }
     }
+
   },
 
   /**
@@ -273,6 +288,7 @@ Page({
           dataList: dataList,
           total: result.total,
           queueCode: result.queueCode,
+          listType: result.type
         })
         resolve(result);
       }).catch((err) => {

@@ -74,6 +74,30 @@
       margin: 0 auto;
       width: $contentWidth;
 
+      // 拜年祝福item
+      &-bless-item {
+        display: flex;
+        justify-content: space-between;
+        border-bottom: solid 2px #dfdfdf;
+        padding: 24px 0;
+
+        .tit {
+          @extend .bb;
+          padding: 8px 0;
+          height: 180px;
+          flex: 1;
+          font-size: 40px;
+          @include ellipsis(3);
+        }
+
+        .poster {
+          width: 350px;
+          height: 180px;
+          border-radius: 8px;
+        }
+      }
+
+      // 视频item
       &-item {
         // @extend .shadow;
         box-shadow: 0 6px 10px 0 rgba(0, 0, 0, 0.6);
@@ -113,7 +137,7 @@
             bottom: 0;
             @include ellipsis(2);
 
-            .tit-t1{
+            .tit-t1 {
               @extend .bb;
               padding: 0 24px;
               position: relative;

@@ -24,28 +24,38 @@
     </view>
     <view class="content">
       <view class="list">
-        <view wx:for="{{dataList}}" wx:key="index" class="list-item">
-          <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="list-item-video">
-            <image class="img" src="{{item.thumbnail}}" mode="aspectFill" />
-            <view class="tit">
-              <view class="tit-bg"></view>
-              <view class="tit-t1">{{item.videoName}}</view>
-            </view>
-            <div class="play">
-              <span class="iconfont iconplay"></span>
-            </div>
+        <!-- 拜年item -->
+        <block wx:if="{{listType == 2}}">
+          <view wx:for="{{dataList}}" bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:key="index" class="list-bless-item">
+            <image class="poster" src="{{item.thumbnail}}" />
+            <view class="tit">{{item.blessTitle}}</view>
           </view>
-          <view class="list-item-func">
-            <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="user">
-              <image class="portrait" mode="aspectFill" src="{{item.headImage}}" />
-              <text class="name">{{item.accountName || ""}}</text>
+        </block>
+        <!-- 视频item -->
+        <block wx:else>
+          <view wx:for="{{dataList}}" wx:key="index" class="list-item">
+            <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="list-item-video">
+              <image class="img" src="{{item.thumbnail}}" mode="aspectFill" />
+              <view class="tit">
+                <view class="tit-bg"></view>
+                <view class="tit-t1">{{item.videoName}}</view>
+              </view>
+              <div class="play">
+                <span class="iconfont iconplay"></span>
+              </div>
+            </view>
+            <view class="list-item-func">
+              <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="user">
+                <image class="portrait" mode="aspectFill" src="{{item.headImage}}" />
+                <text class="name">{{item.accountName || ""}}</text>
+              </view>
+              <button data-data="{{item}}" data-index="{{index}}" class="share" open-type="share" bindtap="onShareItem">
+                <span class="t1 iconfont iconwechat"></span>
+                <span class="t1">分享</span>
+              </button>
             </view>
-            <button data-data="{{item}}" data-index="{{index}}" class="share" open-type="share" bindtap="onShareItem">
-              <span class="t1 iconfont iconwechat"></span>
-              <span class="t1">分享</span>
-            </button>
           </view>
-        </view>
+        </block>
       </view>
     </view>
   </view>