first push

package-lock.json

@@ -1846,6 +1846,12 @@
       "integrity": "sha1-XIXWYvdvodNFdXZsXc1mFavNMNg=",
       "dev": true
     },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -1912,6 +1918,12 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
       "dev": true
     },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
+      "dev": true
+    },
     "ansi-colors": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
@@ -1978,6 +1990,16 @@
       "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
       "dev": true
     },
+    "are-we-there-yet": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+      "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+      "dev": true,
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
+    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -2011,6 +2033,12 @@
       "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
       "dev": true
     },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
+      "dev": true
+    },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz",
@@ -2119,6 +2147,12 @@
       "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=",
       "dev": true
     },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
+      "dev": true
+    },
     "async-limiter": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
@@ -2473,6 +2507,15 @@
         "file-uri-to-path": "1.0.0"
       }
     },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmmirror.com/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.0"
+      }
+    },
     "bluebird": {
       "version": "3.5.5",
       "resolved": "https://registry.npm.taobao.org/bluebird/download/bluebird-3.5.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.5.5.tgz",
@@ -2832,6 +2875,24 @@
       "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
       "dev": true
     },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
+          "dev": true
+        }
+      }
+    },
     "caniuse-api": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
@@ -3213,6 +3274,12 @@
         "date-now": "^0.1.4"
       }
     },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "dev": true
+    },
     "consolidate": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
@@ -3735,6 +3802,15 @@
       "integrity": "sha1-8xz35PPiGLBybnOMqSoC00iO9hU=",
       "dev": true
     },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
     "cyclist": {
       "version": "0.2.2",
       "resolved": "http://registry.npm.taobao.org/cyclist/download/cyclist-0.2.2.tgz",
@@ -4011,6 +4087,12 @@
       "resolved": "http://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true
+    },
     "depd": {
       "version": "1.1.2",
       "resolved": "http://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz",
@@ -4973,18 +5055,98 @@
         "nan": "^2.12.1"
       }
     },
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmmirror.com/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      }
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz",
       "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
       "dev": true
     },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmmirror.com/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "requires": {
+        "globule": "^1.0.0"
+      }
+    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
+      "dev": true
+    },
     "get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz",
@@ -5081,6 +5243,17 @@
         "slash": "^1.0.0"
       }
     },
+    "globule": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmmirror.com/globule/-/globule-1.3.3.tgz",
+      "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
+      "dev": true,
+      "requires": {
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
+      }
+    },
     "graceful-fs": {
       "version": "4.2.0",
       "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.0.tgz",
@@ -5163,6 +5336,12 @@
       "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
       "dev": true
     },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "dev": true
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/has-value/download/has-value-1.0.0.tgz",
@@ -5635,6 +5814,21 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
+    "in-publish": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/in-publish/-/in-publish-2.0.1.tgz",
+      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
     "indexes-of": {
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz",
@@ -5859,6 +6053,12 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
+    "is-finite": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true
+    },
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz",
@@ -5983,6 +6183,12 @@
       "resolved": "http://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "dev": true
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "http://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz",
@@ -6024,6 +6230,12 @@
       "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=",
       "dev": true
     },
+    "js-base64": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
+      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+      "dev": true
+    },
     "js-levenshtein": {
       "version": "1.1.6",
       "resolved": "http://registry.npm.taobao.org/js-levenshtein/download/js-levenshtein-1.1.6.tgz",
@@ -6211,6 +6423,36 @@
       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
       "dev": true
     },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+          "dev": true
+        }
+      }
+    },
     "loader-runner": {
       "version": "2.4.0",
       "resolved": "http://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz",
@@ -6304,6 +6546,16 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
     "lower-case": {
       "version": "1.1.4",
       "resolved": "http://registry.npm.taobao.org/lower-case/download/lower-case-1.1.4.tgz",
@@ -6344,6 +6596,12 @@
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
       "dev": true
     },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true
+    },
     "map-visit": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/map-visit/download/map-visit-1.0.0.tgz",
@@ -6405,6 +6663,32 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmmirror.com/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        }
+      }
+    },
     "merge": {
       "version": "1.2.1",
       "resolved": "http://registry.npm.taobao.org/merge/download/merge-1.2.1.tgz",
@@ -6668,8 +6952,7 @@
       "version": "2.14.0",
       "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz",
       "integrity": "sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -6723,6 +7006,34 @@
       "integrity": "sha512-mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg==",
       "dev": true
     },
+    "node-gyp": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "dev": true,
+      "requires": {
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw==",
+          "dev": true
+        }
+      }
+    },
     "node-ipc": {
       "version": "9.1.1",
       "resolved": "http://registry.npm.taobao.org/node-ipc/download/node-ipc-9.1.1.tgz",
@@ -6782,6 +7093,98 @@
         "semver": "^5.3.0"
       }
     },
+    "node-sass": {
+      "version": "4.14.1",
+      "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
+      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
+      "dev": true,
+      "requires": {
+        "async-foreach": "^0.1.3",
+        "chalk": "^1.1.1",
+        "cross-spawn": "^3.0.0",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
+        "lodash": "^4.17.15",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "nan": "^2.13.2",
+        "node-gyp": "^3.8.0",
+        "npmlog": "^4.0.0",
+        "request": "^2.88.0",
+        "sass-graph": "2.2.5",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha512-eZ+m1WNhSZutOa/uRblAc9Ut5MQfukFrFMtPSm3bZCA888NmMd5AWXWdgRZ80zd+pTk1P2JrGjg9pUPTvl2PWQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+          "dev": true
+        }
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmmirror.com/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "http://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz",
@@ -6821,6 +7224,18 @@
         "path-key": "^2.0.0"
       }
     },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
     "nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
@@ -7054,6 +7469,12 @@
       "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
       "dev": true
     },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+      "dev": true
+    },
     "os-locale": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
@@ -7065,6 +7486,22 @@
         "mem": "^4.0.0"
       }
     },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "dev": true
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmmirror.com/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/p-defer/download/p-defer-1.0.0.tgz?cache=0&sync_timestamp=1559922734651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-defer%2Fdownload%2Fp-defer-1.0.0.tgz",
@@ -8158,6 +8595,65 @@
         }
       }
     },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmmirror.com/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmmirror.com/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmmirror.com/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
+          }
+        }
+      }
+    },
     "readable-stream": {
       "version": "2.3.6",
       "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freadable-stream%2Fdownload%2Freadable-stream-2.3.6.tgz",
@@ -8184,6 +8680,16 @@
         "readable-stream": "^2.0.2"
       }
     },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
+      "dev": true,
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      }
+    },
     "regenerate": {
       "version": "1.4.0",
       "resolved": "http://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz",
@@ -8370,6 +8876,15 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
     "request": {
       "version": "2.88.0",
       "resolved": "http://registry.npm.taobao.org/request/download/request-2.88.0.tgz",
@@ -8557,6 +9072,102 @@
       "resolved": "http://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz",
       "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo="
     },
+    "sass-graph": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmmirror.com/sass-graph/-/sass-graph-2.2.5.tgz",
+      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^13.3.2"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmmirror.com/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "sass-loader": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
@@ -8600,6 +9211,27 @@
         "ajv-keywords": "^3.1.0"
       }
     },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
+      "dev": true,
+      "requires": {
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "http://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz",
@@ -9236,6 +9868,15 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
+    "stdout-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz",
+      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/stealthy-require/download/stealthy-require-1.1.1.tgz",
@@ -9354,6 +9995,15 @@
         "ansi-regex": "^4.1.0"
       }
     },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/strip-eof/download/strip-eof-1.0.0.tgz",
@@ -9366,6 +10016,15 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true
     },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-json-comments%2Fdownload%2Fstrip-json-comments-2.0.1.tgz",
@@ -9438,6 +10097,17 @@
       "integrity": "sha1-ofzMBrWNth/XpF2i2kT186Pme6I=",
       "dev": true
     },
+    "tar": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmmirror.com/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "dev": true,
+      "requires": {
+        "block-stream": "*",
+        "fstream": "^1.0.12",
+        "inherits": "2"
+      }
+    },
     "terser": {
       "version": "4.1.2",
       "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.1.2.tgz?cache=0&sync_timestamp=1562580696479&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.1.2.tgz",
@@ -9775,12 +10445,27 @@
         }
       }
     },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
+      "dev": true
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz",
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "true-case-path": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/true-case-path/-/true-case-path-1.0.3.tgz",
+      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.2"
+      }
+    },
     "tryer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
@@ -10632,6 +11317,15 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
+    "wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmmirror.com/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/wordwrap/download/wordwrap-1.0.0.tgz",

src/components/basic-component/app-composition/app-composition.vue

@@ -19,7 +19,7 @@
             <view class="app-composition-type" v-if="item.type == 1 && large" :style="{'color':theme.color}">固定套餐</view>
             <view class="app-composition-type" v-if="item.type == 2 && large" :style="{'color':theme.color}">搭配套餐</view>
             <view class="app-composition-price">
-                套餐价<text :style="{'color':theme.color}">￥{{item.min_composition_price}}</text>
+                套餐价<text :style="{'color':theme.color}">￥{{item.actual_price}}</text>
             </view>
             <view class="app-composition-discount">
                 最多可省<text>￥{{item.max_discount}}</text>

src/components/basic-component/app-jump-button/app-jump-button.vue

@@ -32,7 +32,7 @@
 	import {
 		push
 	} from '../../../core/formId.js';
-
+	 import {mapGetters, mapState} from 'vuex';
 	export default {
 		name: 'app-jump-button',
 		props: {
@@ -133,10 +133,15 @@
 				required: false
 			}
 		},
+		computed:{
+			...mapState({
+				userInfo: state => state.user.info
+			})
+		},
 		methods: {
 			jumpLogic(e) {
 				if (this.form) push(e.detail.formId);
-				console.log(this.open_type)
+				
 				switch (this.open_type) {
 					case 'reLaunch':
 						uni.reLaunch({
@@ -151,6 +156,7 @@
 					case 'navigate':
 						if (this.url) {
 							let url = this.url;
+							console.log(this.userInfo)
 							if (this.params != '""' && this.params && this.params.length > 0) {
 								let p = `?`;
 								for (let i = 0; i < this.params.length; i++) {
@@ -175,9 +181,22 @@
 							}
 							/* #endif */
 							/* #ifdef MP-WEIXIN || MP-ALIPAY || H5 */
-							uni.navigateTo({
-								url: url
-							});
+							if(this.url=='/pages/sale/sale-user-center'){
+								if(this.userInfo.salesperson_info){
+									uni.navigateTo({
+										url: url
+									});
+								}else{
+									uni.navigateTo({
+										url: "/pages/sale/sale_login/sale_login"
+									});
+								}
+							}else{
+								uni.navigateTo({
+									url: url
+								});
+							}
+							
 							/* #endif */
 						}
 

src/components/basic-component/app-layout/app-coupon-modal/app-coupon-modal.vue

@@ -1,9 +1,31 @@
 <!-- 初版 代和yu分支融合 -->
 <template>
-    <view class="app-coupon-modal main-center cross-center" v-if="coupon && coupon.list && coupon.list.length > 0">
-        <view class="coupon-modal">
+    <view class="maincenter" v-if="coupon && coupon.list && coupon.list.length > 0" >
+		<view class="coupon-bg" v-for="(item, index) in coupon.list">
+			<view class="soup-msg">
+				<view class="soup-price">
+					<text style="font-size: 28rpx;">￥</text>
+					<text style="font-size: 40rpx;">{{item.sub_price}}</text>
+				</view>
+				<text class="send-success">领取成功</text>
+			</view>
+			<view class="send-count">
+				<view class="send-check">
+					<text>*优惠券已发放到账户，请到我的优惠券查看</text>
+				</view>
+ 
+				<view class="gouse"  @click="toGoods(item.page_url)">
+						<text>去使用</text>
+				</view>
+			</view>
+			<view class='closemain' @click='closeCouponBox'>
+			    <image src='https://shop.9026.com/web/statics/image/mall/static/icon/icon-popup-close.png' class="bottom-close"></image>
+			</view>
+		</view>
+		
+       <!-- <view class="coupon-modal">
             <image class="title-img" :src="img"></image>
-            <view class="get-coupon-content">
+            <view class="get-coupon-content ">
                 <view v-if="coupon.type === `receive` && coupon.list[0].rest >= 0"
                       class="rest dir-left-nowrap main-center cross-center">
                     <view>还剩</view>
@@ -48,7 +70,7 @@
             <view class='main-center' @click='closeCouponBox'>
                 <image src='https://shop.9026.com/web/statics/image/mall/static/icon/icon-popup-close.png' class="bottom-close"></image>
             </view>
-        </view>
+        </view> -->
     </view>
 </template>
 
@@ -119,6 +141,90 @@
 </script>
 
 <style scoped lang="scss">
+	.maincenter{
+		background-color: rgba($color: #000000, $alpha: 0.5);
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 998;
+		.coupon-bg{
+			background-image: url("https://wechat.xcrjhuixiangjia.com/web/statics/image/new/receive_coupon.png");
+			background-size:100% 100%;
+			position: fixed;
+			width: 570rpx;
+			height:640rpx;
+			right:0;
+			left: 0;			
+			top:0;
+			bottom: 0;
+			margin: 0 auto;
+			margin-top: calc(100vh - 1150rpx);
+			z-index: 999;
+			.soup-msg{
+				position: absolute;
+				top:200rpx;
+				left: 0;
+				right: 0;
+				margin: 0 auto;
+				color: #FFF8E2;
+				text-align: center;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+				.soup-price{
+					font-weight: bold;
+				}
+				.send-success{
+					color: #fff;
+					font-size: 22rpx;
+					padding-top: 5rpx;
+				}
+			}
+			.send-count{
+				position: absolute;
+				bottom:65rpx;
+				width: 570rpx;
+				margin: 0 auto;
+				left: 0;
+				right: 0;
+				.send-check{
+					    color: #333333;
+					    font-size: 22rpx;
+					    padding-bottom: 40rpx;
+					    padding-left: 40rpx;
+					
+				}
+				.gouse{
+					color: #FFF;
+					font-size: 28rpx;
+					text-align: center;
+				}
+			}
+			.closemain{
+					width: 40rpx;
+				    height: 40rpx;
+				    position: absolute;
+				    bottom: -65rpx;
+				    margin: 0 auto;
+				    left: 0;
+				    right: 0;
+				    border: 1rpx solid #CDCDCD;
+					border-style: dashed;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+				
+			}
+		}
+	}
+	
     .invite {
         text-align: center;
         margin-top: #{20px - 24px};
@@ -168,12 +274,12 @@
             .get-coupon-content {
                 width: #{580rpx};
                 background: #ef3030;
-                border-radius: 0 0 #{16rpx 16rpx};
+                border-radius:  #{16rpx 16rpx 16rpx 16rpx};
                 padding: #{24rpx 30rpx 30rpx 30rpx};
                 margin: 0 auto;
                 color: #ffffff;
                 font-size: $uni-font-size-weak-two;
-
+				
                 .rest {
                     color: #ffffff;
                     font-size: $uni-font-size-general-one;
@@ -195,7 +301,7 @@
 
                 .coupon-list {
                     max-height: #{312rpx};
-
+					
                     view:first-child {
                         margin-top: 0;
                     }
@@ -207,7 +313,7 @@
                         border-radius: #{16rpx};
                         background-color: #ffffff;
                         height: #{144rpx};
-
+						
                         .price {
                             font-size: #{56rpx};
                             color: #ff4544;

src/components/basic-component/app-layout/app-layout.vue

@@ -314,9 +314,7 @@
                ) {
                    currentRoute = this.$utils.deleteUrlParam(currentRoute, ['appid', 'appmsg_compact_url', 'wxwork_userid', 'weixinadinfo', 'gdt_vid'], true);
                }
-		console.log(currentRoute,"--------=========")
-		console.log(this.tabBarNavs,"tabbar---------=========")
-		console.log(currentRoute,"--------=========")
+		
                for (let i = 0; i < this.tabBarNavs.length; i++) {
                    if (currentRoute == this.tabBarNavs[i].url) {
                        return this.tabbarbool = true;

src/components/basic-component/app-layout/app-payment/app-payment.vue

@@ -247,6 +247,7 @@
 				balance = Math.abs(balance)
 				return price + balance
 			},
+			// 提交订单
 			setPayment() {
 				const vm = this;
 				Vue.use({
@@ -267,9 +268,7 @@
 						resolve: resolve,
 						reject: reject,
 					});
-					console.log('debug payment, setAll ok, id:', this.$store.state.payment.id);
-					console.log('debug payment, setAll ok, resolve:', this.$store.state.payment.resolve);
-					console.log('debug payment, setAll ok, reject:', this.$store.state.payment.reject);
+					
 					uni.showLoading({
 						mask: true,
 						title: '请求支付...',
@@ -320,8 +319,7 @@
 				this.$store.commit('payment/showPayment', true);
 			},
 			confirm() {
-				console.log('payment confirm 1:');
-				console.log('debug payment, confirm 1,', this.$store.state.payment.resolve);
+				
 				for (let i in this.$store.state.payment.payData.list) {
 					if (this.$store.state.payment.payData.list[i].checked) {
 						this.$store.commit('payment/payType', this.$store.state.payment.payData.list[i].key);

src/components/basic-component/app-layout/app-user-login/app-user-login.vue

@@ -206,7 +206,7 @@
 				this.$user.getUserProfile(e).then(res => {
 					this.getUserInfo(res);
 				}).catch(res => {
-					console.log(res)
+					
 				})
 				// #endif
             },
@@ -296,12 +296,12 @@
                                 return resolve(e);
                             },
                             fail(e) {
-                                console.log('getUserInfo fail:', e);
+                                
                             },
                         });
                     },
                     fail(e) {
-                        console.log('login fail:', e);
+                        
                     },
                 });
                 // #endif

src/components/page-component/app-area-picker/app-area-picker.vue

@@ -109,7 +109,7 @@ export default {
 			immediate: true
 		},
 		place(newData,old){
-			console.log('地址',newData)
+			
 			this.$emit('place', newData);
 		}
 	},

src/components/page-component/app-index-cat/app-index-cat.vue

@@ -63,7 +63,7 @@
                     this.newData = e.data;
                     if (e.code === 0 && e.data) {
                         let storage = this.$storage.getStorageSync('INDEX_MALL');
-                        console.log(storage);
+                      
                         storage.home_pages[this.index].list = this.newData;
                         this.$storage.setStorageSync('INDEX_MALL', storage);
                     }

src/components/page-component/app-order-banner/app-order-banner.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="app-order-banner order-status-box" :style="{'background-image': `url(${newPicUrl})`, 'background-size': '100% 100%'}">
-        <view class='text'>{{title}}</view>
+        <view class='text' >{{title}}</view>
         <view v-if="hint" class='hint'>{{hint}}</view>
     </view>
 </template>
@@ -27,7 +27,7 @@ export default {
         }
     },
     created() {
-        this.newPicUrl = this.$store.state.mallConfig.__wxapp_img.mall.order.status_bar;
+        this.newPicUrl ="https://wechat.xcrjhuixiangjia.com/web/statics/image/new/order_commit_bg.png";
     }
 }
 </script>
@@ -38,6 +38,7 @@ export default {
         flex-direction: column;
         justify-content: center;
         height: 120#{rpx};
+		// background-image: url(../../../static/image/icon/order-detail/bg-order-detail.png);
     }
     .text {
         z-index: 1;

src/components/page-component/app-swiper/app-swiper.vue

@@ -255,9 +255,9 @@
                 let search = url.split('?')[1];
                 if (search) {
                     let r = search.substr(0).match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)'))
-                    console.log(r);
+                    
                     if (r !== null) {
-                        console.log(unescape(r[2]));
+                       
                         return unescape(r[2])
                     }
                     return null

src/components/page-component/app-user-center-top/app-user-center-top.vue

@@ -232,7 +232,7 @@
 						<!-- #endif-->
 					</view>
 					<view class="number" :style="{'color':userNameColor}">
-						{{userInfo.mobile}}
+						{{userInfo.mobile?userInfo.mobile:''}}
 					</view>
 				</template>
 				<template v-else>
@@ -285,7 +285,7 @@
 						<!-- #endif-->
 					</view>
 					<view class="number" :style="{'color':userNameColor}">
-						{{userInfo.salesperson_info.mobile}}
+						{{userInfo.salesperson_info.mobile?userInfo.salesperson_info.mobile:''}}
 					</view>
 				</template>
 				<template v-else>

src/components/page-component/goods/u-attr.vue

@@ -286,7 +286,7 @@
 		},
 		methods: {
 			closePreview(index) {
-				console.log(index,this.attrIndex)
+			
                 if(index != this.attrIndex) {
 					let item = this.newGroup[0]
 					let attr = item.attr_list[index];
@@ -296,7 +296,7 @@
 				this.showPreview = false;
 			},
 			previewCover(index,status) {
-				console.log(index,this.attrIndex)
+		
                 if(!status) {
 					let item = this.newGroup[0]
 					let attr = item.attr_list[index];
@@ -443,7 +443,7 @@
 				let stock = this.stock;
 				if(this.sign == 'weekly_buy' && this.week_number > 0) {
 					stock = Math.floor(+this.stock / +this.week_number);
-					console.log(stock)
+	
 				}
 				if (value > stock) {
 					value = stock;
@@ -466,7 +466,7 @@
 				let stock = this.stock;
 				if(this.sign == 'weekly_buy' && this.week_number > 0) {
 					stock = Math.floor(+this.stock / +this.week_number);
-					console.log(stock)
+				
 				}
 				value++;
 				if (value > stock) {

src/components/page-component/index/app-nav-bar.vue

@@ -14,7 +14,8 @@
                         <view v-if="showLeftIcon">
 							<template v-if="xStyle==5">
 								<view class="main-left cross-center hxj-area" :style="{color:color}"  @click="leftClick">
-									<view class="tt t-omit">{{selectedProperties.name?selectedProperties.name:'绑定楼盘'}}</view>
+									<view class="tt t-omit" style="width:110rpx ;overflow: hidden;text-overflow:clip">{{selectedProperties.name?selectedProperties.name:'绑定楼盘'}}</view>
+									
 									<image src="https://t17.9026.com/web/statics/image/index/arrow-down.png" mode=""></image>
 								</view>
 							</template>
@@ -284,10 +285,19 @@ export default {
 
 <style lang="scss" scoped>
 	.hxj-area{
-		width: 260rpx;
+		width:194rpx;
+		height: 50rpx;
 		font-size: 28rpx;
 		font-weight: 500;
 		color: #ebe4e1;
+		// border:1px solid rgba($color: #000, $alpha: 0.22);
+		background-color: rgba($color: #000, $alpha: 0.22);
+		border-radius:25px;
+		display: flex;
+		align-items: center;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		justify-content:space-between; ;
 		.tt{
 			max-width: 240rpx;
 		}

src/components/page-component/u-announcement/u-announcement.vue

@@ -86,7 +86,7 @@ export default {
         },
         btnColor: {
             type: String,
-            default: '#ff4544'
+            default: '#A18353'
         },
         btnRadius: {
             type: String,
@@ -155,14 +155,15 @@ export default {
         flex-direction: row;
         align-items: center;
         justify-content: space-between;
+		
     }
     .u-icon-wrap {
         display: flex;
         align-items: center;
     }
     .u-icon-left {
-        width: 36upx;
-        height: 36upx;
+        width: 30upx;
+        height: 30upx;
         margin-right: 20upx;
     }
     .u-notice-box {
@@ -178,21 +179,20 @@ export default {
         white-space: nowrap
     }
     .u-notice-content {
-        animation: u-loop-animation 10s linear infinite both;
+        animation: u-loop-animation 460s linear infinite both;
         text-align: right;
-        padding-left: 100%;
+        padding-left: 0;
         display: flex;
         flex-direction: row;
         flex-wrap: nowrap;
     }
     @keyframes u-loop-animation {
         0% {
-            transform: translate3d(0, 0, 0);
-        }
-
-        100% {
             transform: translate3d(-100%, 0, 0);
         }
+		100%{
+			transform: translate3d(150%, 0, 0);
+		}
     }
     .u-icon-right {
         width: 12upx;
@@ -211,7 +211,7 @@ export default {
         background-repeat: no-repeat;
         background-size: cover;
         &.icon {
-            background-image: url("https://shop.9026.com/web/statics/image/mall/static/icon/announcement.png");
+            background-image: url("https://wechat.xcrjhuixiangjia.com/web/statics/image/new/ad_bg.png");
         }
     }
    	.u-bottom-content {

src/core/apiUrl.js

@@ -120,6 +120,7 @@ const apiUrl = {
     },
     order: {
         preview: 'api/order/preview',
+		mealview:'plugin/composition/api/index/order-submit',
         submit: 'api/order/submit',
         pay_data: 'api/order/pay-data',
         usable_coupon_list: 'api/order/usable-coupon-list',

src/core/request.js

@@ -48,7 +48,12 @@ const request = async function (args) {
 	/* 添加estate_id的接口 */
 	let goodsByEstate=['api/default/goods-list']
 	if(goodsByEstate.includes(args.url.split('r=')[1])){
-		args.data.estate_id=Vue.prototype.$store.state.user.selectedProperties.id
+		
+		if(Vue.prototype.$store.state.user.selectedProperties){
+			args.data.estate_id=Vue.prototype.$store.state.user.selectedProperties.id
+		}else{
+			args.data.estate_id=0	
+		}
 	}
 
     const [error, response] = await uni.request({

src/pages.json

@@ -632,7 +632,12 @@
 					"style": {
 						"navigationBarTitleText": "确认订单",
 						"navigationStyle": "custom"
-					}
+					},
+					"permission": {
+					    "scope.userLocation": {
+					      "desc": "你的位置信息将用于小程序位置接口的效果展示" // 高速公路行驶持续后台定位
+					    }
+					  }
 				},
 				{
 					"path": "address-pick",
@@ -1859,7 +1864,7 @@
 				}
 			}]
 		},
-		// { 
+		// {
 		// 	"root": "plugins/flash_sale", 
 		// 	"pages": [{
 		// 			"path": "index/index",

src/pages/balance/recharge.vue

@@ -37,7 +37,7 @@
                             :color="customPage.recharge_btn_color"
                             height="88"
                             :border-color="customPage.recharge_btn_background"
-                            :background="customPage.recharge_btn_background">{{customPage.recharge_btn_title}}
+                           style="background-color: #A18353;">{{customPage.recharge_btn_title}}
                 </app-button>
             </view>
             <view class="account">{{customPage.recharge_explanation_title}}</view>

src/pages/binding/app-phone-binding/app-phone-binding.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="app-phone-binding">
 		<view class="app-bound dir-top-nowrap cross-center" v-if="bind">
-			<image class="app-image" :src="wxapp_img.mall.binding"></image>
+			<image class="app-image" src="https://wechat.xcrjhuixiangjia.com/web/statics/image/new/bind_bg.png"></image>
 			<view class="app-phone-text dir-top-nowrap" >
 				<text>已绑定手机</text>
 				<text class="app-hone">{{phone}}</text>
@@ -331,7 +331,7 @@
 					line-height: #{88rpx};
 					text-align: center;
 					margin: #{80rpx 20rpx 0 24rpx};
-					background-color: #ff4544;
+					background-color: #A18353;
 					color: white;
 					font-size: #{32rpx};
 					border-radius: #{44rpx};

src/pages/binding/disabled/disabled.vue

@@ -0,0 +1,57 @@
+<template>
+    <app-layout>
+        <view class='dir-top-nowrap cross-center box'>
+            <image class='disabled_img' :src='picUrl'></image>
+            <text class='title'>{{text}}</text>
+            <text class='content'>请联系管理员</text>
+        </view>
+    </app-layout>
+</template>
+
+<script>
+    import { mapGetters } from "vuex";
+
+    export default {
+        data() {
+            return {
+                picUrl: '',
+                text: ''
+            }
+        },
+        computed: {
+            ...mapGetters('mallConfig', {
+                __wxapp_img: 'getWxappImg'
+            })
+        },
+        onLoad(options) { this.$commonLoad.onload(options);
+            this.picUrl = this.__wxapp_img.mall.disabled;
+            this.text = options.text;
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .box {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+    }
+
+    .disabled_img {
+        width: 380#{rpx};
+        height: 380#{rpx};
+        margin-top: 200#{rpx};
+    }
+
+    .title {
+        margin-top: 56#{rpx};
+        font-size: 13pt;
+        color: #5292ed;
+    }
+
+    .content {
+        margin-top: 24#{rpx};
+        font-size: 9pt;
+        color: $uni-general-color-two;
+    }
+</style>

src/pages/cart/cart.vue

@@ -506,9 +506,7 @@
                     }
                 }
                 let pass = false;
-                console.log(all_product_number == this.countList.express.number)
-                console.log(all_product_number == this.countList.city.number)
-                console.log(all_product_number == this.countList.offline.number)
+                
                 if(all_product_number == this.countList.express.number || all_product_number == this.countList.city.number || all_product_number == this.countList.offline.number) {
                     pass = true;
                 }

src/pages/cart/components/app-add-subtract/app-add-subtract.vue

@@ -49,13 +49,16 @@
                 }
             },
             good_id: [String,Number],
-			theme: Object
+			theme: Object,
+			checked:Object,
 	    },
 	    created() {
             this.inputValue = +this.value;
 	    },
 	    methods: {
             _calcValue(type) {
+				console.log(5548787)
+				console.log(this.checked,'888888888')
                 if (this.disabled) {
                     return;
                 }
@@ -74,7 +77,8 @@
             },
 		    
             _getDecimalScale() {
-                
+                console.log(this.checked,'888888888')
+				console.log(7897894)
                 let scale = 1;
                 // 浮点型
                 if (~~this.step !== this.step) {

src/pages/case/appointment/appointment-list.vue

@@ -81,7 +81,7 @@
 						}else{
 							this.VisitList=this.VisitList.concat(res.data.list) 
 						}
-						if(res.data.list.length<20){
+						if(res.data.list.length<10){
 							this.noMore=true
 						}
 					}

src/pages/case/appointment/appointment.vue

@@ -109,7 +109,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="noMake cross-center" v-if="!is_myself"><button type="default" @tap="goAppointment">{{dataDetail.is_already_appoint==1?'已预约':'立即预约'}}</button></view>
+		<view class="noMake cross-center" v-if="is_myself"><button type="default" @tap="goAppointment">{{dataDetail.is_already_appoint==1?'已预约':'立即预约'}}</button></view>
+		<!-- <view class="noMake cross-center" v-if="is_myself"><button type="default">没有预约权限</button></view> -->
 	</view>
 </template>
 

src/pages/case/components/hxj-bd-info.vue

@@ -178,6 +178,7 @@ border-radius: 60rpx 0px 0px 0px;
 		.hxj-ynum {
 			width: auto;
 			height: 30rpx;
+			// line-height: 30rpx;
 			border: 1rpx solid #AE8445;
 			border-radius: 4rpx;
 			font-size: 22rpx;
@@ -185,7 +186,7 @@ border-radius: 60rpx 0px 0px 0px;
 			color: #AE8445;
 			opacity: 0.6;
 			padding: 0 6rpx;
-			line-height: 24rpx;
+			line-height: 30rpx;
 			text-align: center;
 		}
 

src/pages/case/projectInfo.vue

@@ -502,7 +502,7 @@
 								open_type:"click",
 							})
 						}
-						console.log('this.compositionList',this.compositionList)
+					
 					}
 					this.$hideLoading();
 				})

src/pages/cats/cats.vue

@@ -1,4 +1,4 @@
-<template>
+ <template>
     <app-layout>
         <template v-if="loading">
             <view class="app-search" v-if="search_bool">

src/pages/coupon/list/list.vue

@@ -141,7 +141,7 @@
 				});
 			},
 			receive(coupon) {
-
+			
 				let that = this;
 				if (that.loading) {
 					return false

src/pages/goods/goods.vue

@@ -80,7 +80,7 @@
             ></bd-kb>
             <!--套餐组合-->
             <view  class="goods-composition" v-if="composition && composition.list.length > 0">
-                <view class="goods-composition-title">套餐组合</view>
+                <view class="goods-composition-title">套装组合</view>
                 <uni-swiper-dot :current="current" :theme="getTheme" :info="composition.list" mode="customize">
                     <swiper @change="change" class="goods-composition-swiper" :current="current" :autoplay="true">
                         <swiper-item v-for="item in composition.list" :key="item.id">
@@ -90,7 +90,7 @@
                 </uni-swiper-dot>
 				<navigator url="/pages/case/hot_sale_project" hover-class="none">
                 <view class="goods-composition-more main-between cross-center">
-                    <view>更多套餐组合</view>
+                    <view>更多套装组合</view>
                     <image src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png"></image>
                 </view>
 				</navigator>

src/pages/index/hxj_index_component.vue

@@ -13,14 +13,14 @@
 		</view>
 		<u-announcement
 		  v-bind:bgColor="homePages[1].data.background"
-		  v-bind:btn-color="homePages[1].data.btnColor"
+		  v-bind:btn-color="'#A18353'"
 		  v-bind:btn-height="homePages[1].data.btnHeight"
 		  v-bind:btn-radius="`${homePages[1].data.btnRadius}rpx`"
 		  v-bind:btn-text="homePages[1].data.btnText"
 		  v-bind:btn-text-color="homePages[1].data.btnTextColor"
 		  v-bind:btn-width="homePages[1].data.btnWidth"
 		  v-bind:content="homePages[1].data.content"
-		  v-bind:header-url="homePages[1].data.headerUrl"
+		  v-bind:header-url="'https://wechat.xcrjhuixiangjia.com/web/statics/image/new/ad_bg.png'"
 		  v-bind:icon="homePages[1].data.icon"
 		  v-bind:name="homePages[1].data.name"
 		  v-bind:textColor="homePages[1].data.textColor"
@@ -50,8 +50,8 @@
 						<view class="desc t-omit" style="width: 420rpx;">{{item.tag}}</view>
 					</view>
 					<view class="right">
-						<view class="price"><text class="rmb">￥</text><text>{{item.price}}</text><text
-								class="dw">元</text></view>
+						<view class="price"><text class="rmb">￥</text><text>{{item.actual_price}}</text><text
+								class="dw"></text></view>
 					</view>
 				</view>
 			</view>
@@ -69,7 +69,7 @@
 
 		</view>
 		<view class="coupon main-left">
-			<view class="item main-left" v-for="(item,index) in homePages[6].data.coupon_list" :key="index" @click="receive(index)">
+			<view class="item main-left" v-for="(item,index) in homePages[6].data.coupon_list" :key="index" @click="receive(index)" v-if="index<2">
 				<view class="Wb">
 					<view>
 						<view class="title_2">定制优享礼券 <text class="hjx-tc-B19D60 hjx-ts-21 hxj-ml-10">立即领取</text></view>
@@ -127,7 +127,7 @@
 				</view>
 			</view> -->
 		</view>
-		<view class="main-between link mt_20">
+		<view class="main-between link mt_20" v-if="homePages[9].data.list.length>0">
 			<view class="title1">
 				限时团购
 				<image class="coupon_1" src="https://t17.9026.com/web/statics/image/index/coupon_1.png" mode="">
@@ -139,8 +139,8 @@
 			</view>
 		</view>
 
-		<view class="group_list">
-			<swiper style="height: 556rpx;" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
+		<view class="group_list" v-if="homePages[9].data.list.length>0">
+			<swiper style="height:520rpx;" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
 				previous-margin="25rpx" next-margin="25rpx" :current="ptCurrent"  @change="ptChange">
 				<swiper-item class="" v-for="(item,index) in homePages[9].data.list" :key="index"
 					@click="goPage(item.page_url)">
@@ -160,14 +160,14 @@
 							</view>
 							<view class="right">
 								<view class="price"><text class="rmb">￥</text><text>{{item.pintuan_price}}</text><text
-										class="dw">元</text></view>
+										class="dw"></text></view>
 							</view>
 						</view>
 					</view>
 				</swiper-item>
 			</swiper>
 		</view>
-		<view class="link main-left">
+		<view class="link main-left" style="margin-top: 15px;">
 			<!-- <view class="title1" style="margin-right: 61rpx;">荟享自营</view>
 			<view class="title1" style="margin-right: 61rpx;color: #A7A7A7;">精选类别</view>
 			<view class="title1" style="margin-right: 61rpx;color: #A7A7A7;">精选类别</view>
@@ -198,7 +198,7 @@
 					<view class="title_2 t-omit" style="width: 320rpx;">{{item.name}}</view>
 					<view class="desc_2">{{item.sales}}</view>
 					<view class="price" style="margin-top: 27rpx;"><text class="rmb">￥</text><text>{{item.price}}</text><text
-							class="dw">元</text></view>
+							class="dw"></text></view>
 				</view>
 			</view>
 			<view class="more1" @click="goPage('/pages/cats/cats')">
@@ -207,7 +207,7 @@
 				</view>
 			</view>
 		</view>
-
+		
 		<view class="bottom_logo">
 			<image src="https://t17.9026.com/web/statics/image/index/bottom_logo.png" mode=""></image>
 			<view class="text">home shopping mall</view>
@@ -218,11 +218,13 @@
 <script>
 	import {mapState} from 'vuex'
 	import appScrollList from './components/scroll-list.vue'
-	import uAnnouncement from "@/components/page-component/u-announcement/u-announcement.vue";
+	import uAnnouncement from "@/components/page-component/u-announcement/u-announcement.vue";	
 	export default {
 		components: {
 			appScrollList,
-			uAnnouncement
+			uAnnouncement,
+			
+			
 		},
 		props: {
 			homePagesProps: {
@@ -263,6 +265,11 @@
 			homePagesProps:{
 				handler:function(nVal,oVal){
 					this.homePages=nVal;
+					if(this.homePages[11].data.catList){
+					      
+					     }else{
+					      this.homePages[11].data.catList = this.homePages[10].data.catList;
+					     }
 					this.countdown(nVal[9].data.list)
 				},
 				deep:true
@@ -275,6 +282,7 @@
 				swiperKey: 0, //轮播位置
 				bottom_goods_index:0, //底部商品分类索引
 				homePages:null,
+				addcouponda:false,
 				list: [
 
 					{
@@ -397,7 +405,7 @@
 					mask: true,
 					title: '领取中'
 				});
-			
+				
 				this.$request({
 					url: this.$api.coupon.receive,
 					data: {
@@ -406,15 +414,26 @@
 				}).then(e => {
 					uni.hideLoading();
 					if (e.code === 0) {
+						
+						this.addcouponda=true
+						this.$emit('addcouponda', this.addcouponda)
+						
+						
 						if (e.data.rest == 0) {
 							this.homePages[6].data.coupon_list[index].is_receive = '1';
 						}
-						let tempList = this.homePages[6].data.coupon_list;
-						this.flushCache(tempList);
+						
+						let tempList = this.homePages[6].data.coupon_list[index];
+						let allc=e.data
+						console.log(tempList,"4444444")
+						// this.flushCache(tempList);
+						// setTimeout(function(row) {
 						this.$store.dispatch('page/actionSetCoupon', {
-							list: [Object.assign(tempList[index], e.data)],
+							list: [Object.assign(tempList, allc)],
 							type: 'receive'
-						});
+						// });
+						}, 200)
+						console.log(111161111)
 					} else {
 						uni.showToast({
 							title: e.msg,

src/pages/index/index.scss

@@ -1,5 +1,5 @@
 .link {
-	padding: 30rpx 40rpx;
+	padding:20rpx 40rpx 30rpx 40rpx;
 	position: relative;
 	font-family: PingFangSC-Semibold, PingFang SC;
 	.hxj {
@@ -173,15 +173,15 @@
 				.price {
 					display: flex;
 					align-items: flex-end;
-					color: #000;
+					// color: #000;
 					font-size: 40rpx;
 					font-family: Helvetica;
-					color: #0e0e0e;
+					color: #A6814F;
 					.rmb {
 						padding-bottom: 10rpx;
 						font-size: 18rpx;
 						font-family: Helvetica;
-						color: #0e0e0e;
+						color: #A6814F;
 					}
 					.dw {
 						padding-bottom: 10rpx;
@@ -243,13 +243,15 @@
 }
 
 .coupon {
-	padding: 0 45rpx 0 40rpx;
+	padding: 0 25rpx 0 45rpx;
+	flex-wrap: wrap;
 	.item {
 		width: 320rpx;
 		height: 200rpx;
 		overflow: hidden;
 		border-radius: 20rpx;
-		margin-right: 25rpx;
+		margin-right: 20rpx;
+		margin-bottom: 10rpx;
 		position: relative;
 		background-image: url(https://t17.9026.com/web/statics/image/index/coupon_masking.png);
 		background-size: 320rpx 200rpx;
@@ -418,12 +420,12 @@
 					color: #000;
 					font-size: 40rpx;
 					font-family: Helvetica;
-					color: #0e0e0e;
+					color: #A6814F;
 					.rmb {
 						padding-bottom: 10rpx;
 						font-size: 18rpx;
 						font-family: Helvetica;
-						color: #0e0e0e;
+						color: #A6814F;
 					}
 					.dw {
 						padding-bottom: 10rpx;
@@ -528,12 +530,12 @@
 	color: #000;
 	font-size: 40rpx;
 	font-family: Helvetica;
-	color: #0e0e0e;
+	color: #A6814F;
 	.rmb {
 		padding-bottom: 10rpx;
 		font-size: 18rpx;
 		font-family: Helvetica;
-		color: #0e0e0e;
+		color: #A6814F;
 	}
 	.dw {
 		padding-bottom: 10rpx;

src/pages/index/index.vue

@@ -30,7 +30,8 @@
                           :is_storage="is_storage" :theme="getTheme" :page_id="page_id" :is_required="is_required"
                           :coupon_req="coupon_req"></app-diy-page> -->
 
-			<hxj-index :homePagesProps="homePages.navs[0].template.data[1].data.list[0].data"></hxj-index>
+			<hxj-index :homePagesProps="homePages.navs[0].template.data[1].data.list[0].data" @change="addCouponDa"></hxj-index>
+			
 			<view id="query"></view>
 		</template>
 		<!-- <app-buy-prompt :isShowAttention="isShowAttention" v-if="config.is_purchase_frame === 1"></app-buy-prompt> -->
@@ -43,6 +44,7 @@
 		mapGetters,
 		mapState
 	} from 'vuex';
+	
 	import hxjIndex from './hxj_index_component.vue';
 	import appIndex from '@/components/page-component/index/app-index.vue';
 	import appDiyPage from '@/components/page-component/index/app-diy-page.vue';
@@ -52,6 +54,7 @@
 	// #endif
 	import appAttr from '@/components/page-component/app-attr/app-attr.vue';
 	import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
+	
 	// #ifdef H5
 	import Vue from "vue";
 	import {mapState} from 'vuex'
@@ -68,7 +71,8 @@
 			// #endif
 			appAttr,
 			appNavBar,
-			hxjIndex
+			hxjIndex,
+			
 		},
 
 		data() {
@@ -94,6 +98,7 @@
 				// #endif
 				isShowAttention: false,
 				sss:0,
+				
 			}
 		},
 
@@ -165,6 +170,7 @@
 		/* #endif */
 
 		methods: {
+			
 			navProperties(){
 				uni.navigateTo({
 					url:'/pages/index/binding/binding?isSwitchMainBuilding=1'
@@ -175,7 +181,7 @@
 				const e = await this.$request({
 					url: this.$api.index.tplIndex,
 					data: {
-						page_id: 0
+						page_id: 0,
 					},
 					method: 'get'
 				});

src/pages/order-submit/app-coupon-pick.vue

@@ -218,6 +218,7 @@
             this.is_gift = typeof(this.theme) == 'string' && this.theme.indexOf('gift') >= 0 ? true : false;
             this.loadData();
             this.loadData(true);
+			console.log(this.plugin)
         },
         methods: {
             loadData(loadCantUse = false) {
@@ -235,16 +236,35 @@
                     if (response.code === 0) {
                         if (loadCantUse) {
                             this.cantUseList = response.data.list;
+							
                         } else {
                             for (let i in response.data.list) {
                                 response.data.list[i].checked = false;
                             }
-                            this.list = response.data.list;
+                            this.list = response.data.list;						
                             const mchNoCouponStatusList = this.$store.getters['orderSubmit/getMchNoCouponStatusList'];
                             let noCoupons = this.$validation.isEmpty(this.list);
                             this.$emit('update:noCoupons', noCoupons);
                             mchNoCouponStatusList[this.mchIndex] = noCoupons;
                             this.$store.commit('orderSubmit/mutSetMchNoCouponStatusList', mchNoCouponStatusList);
+							if(!noCoupons){
+								let maxcoupomale=this.$store.getters['orderSubmit/getmaxValueOfY'];
+								let maxValueOfY = Math.max(...this.list.map(o => o.sub_price), 0);
+								let maxcouponList=[]
+								let findmaxcoupon=this.list.find(i=> i.sub_price==maxValueOfY)
+								maxcouponList.push(findmaxcoupon)
+								maxcoupomale=maxcouponList[0]	
+								this.$store.commit('orderSubmit/mutmaxValueOfY', maxcoupomale);
+								const formData = this.$store.state.orderSubmit.formData;
+								console.log(maxcoupomale.id,"456464564646")
+								formData.list[this.mchIndex].user_coupon_id = maxcoupomale.id;
+								this.$store.commit('orderSubmit/mutSetFormData', formData);
+								let usemaxcoup=this.$store.getters['orderSubmit/getusemaxCoup'];
+								let maxy=1
+								usemaxcoup=maxy
+								this.$store.commit('orderSubmit/mutusemaxCoup', mutusemaxCoup);
+							}
+							
                         }
                     } else {
                     }

src/pages/order-submit/order-submit.vue

@@ -3,8 +3,11 @@
 		<view class="safe-area-inset-bottom">
 			<!-- 地址、商户、配送、商品、优惠、费用信息 -->
 			<view class="page" v-if="previewData">
-				<view style="background-image: url(https://t17.9026.com/web/statics/image/index/appointment_top.png);background-size: 100% 100%;padding-bottom: 24rpx;">
-					<app-nav-bar :fixed="true" :background-color="''" :background-image="'url(https://t17.9026.com/web/statics/image/index/appointment_top.png)'" :title="'确认订单'" :xStyle="1" :hasMallSetting="2" :hasHeight="true"></app-nav-bar>
+				<view
+					style="background-image: url(https://t17.9026.com/web/statics/image/index/appointment_top.png);background-size: 100% 100%;padding-bottom: 24rpx;">
+					<app-nav-bar :fixed="true" :background-color="''"
+						:background-image="'url(https://t17.9026.com/web/statics/image/index/appointment_top.png)'"
+						:title="'确认订单'" :xStyle="1" :hasMallSetting="2" :hasHeight="true"></app-nav-bar>
 					<!-- <template v-if="getIsEnterSales">
 						<view v-if="!customerInfo" @click="navCustomer" class="select-customer" >
 							请选择客户
@@ -13,7 +16,8 @@
 							客户：{{customerInfo.name}} 手机号：{{customerInfo.mobile}}
 						</view>
 					</template> -->
-					<view v-if="!previewData.hasCity && previewData.show_address !== false && previewData.hasRecipient" class="group">
+					<view v-if="!previewData.hasCity && previewData.show_address !== false && previewData.hasRecipient"
+						class="group">
 						<app-address-bar :address="previewData.address" :has-ziti="previewData.has_ziti"
 							:all-ziti="previewData.allZiti" @address-input="handleAddressInput"></app-address-bar>
 					</view>
@@ -27,7 +31,7 @@
 						<app-address-bar :address="previewData.address" :has-ziti="previewData.has_ziti"
 							:all-ziti="previewData.allZiti" :city="mch.city"></app-address-bar>
 					</view> -->
-					<view :key="mchIndex" >
+					<view :key="mchIndex">
 						<!-- 循环商户列表start -->
 						<view style="padding: 26rpx 32rpx;" v-if="false">
 							<view class="dir-left-nowrap cross-center" style="padding: 10rpx 0;line-height: 1.2;">
@@ -163,41 +167,45 @@
 							<view>以下商品满{{mch.pick_up_price}}元起送</view>
 						</view>
 						<view class="group">
-							<app-submit-goods :theme="theme" v-on:updateList="updateList" :index="mchIndex" :plugin="plugin"
-								:list="mch"></app-submit-goods>
+							<app-submit-goods :theme="theme" v-on:updateList="updateList" :index="mchIndex"
+								:plugin="plugin" :list="mch"></app-submit-goods>
 						</view>
-						
+
 						<view class="group">
-						<template v-if="(mch.coupon && mch.coupon.enabled)">
-							<view style="padding: 20rpx 32rpx;">
-								<template v-if="mch.coupon && mch.coupon.enabled">
-									<view @click="showCouponPicker(mchIndex)" style="padding: 16rpx 0;">
-										<view class="dir-left-nowrap cross-center">
-											<view class="box-grow-1">优惠券</view>
-											<view class="box-grow-0 mr-12" v-if="mch.coupon.use"
-												:class="[themeTextClass]"
-												:style="{'color': !is_gift ? theme.color : ''}">
-												-¥{{mch.coupon.coupon_discount}}
-											</view>
-											<view class="box-grow-0 mr-12 font-gray"
-												v-else-if="noCouponStatus(mchIndex)">
-												暂无优惠券可用
-											</view>
-											<view class="box-grow-0 mr-12 font-gray" v-else>选择优惠券</view>
-											<view class="box-grow-0">
-												<image
-													src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png"
-													style="width: 12rpx; height: 22rpx; margin-bottom: -2rpx;"></image>
+							<template v-if="(mch.coupon && mch.coupon.enabled)">
+								<view style="padding: 20rpx 32rpx;">
+									<template v-if="mch.coupon && mch.coupon.enabled">
+										<view @click="showCouponPicker(mchIndex)" style="padding: 16rpx 0;">
+											<view class="dir-left-nowrap cross-center">
+												<view class="box-grow-1">优惠券</view>
+												<view class="box-grow-0 mr-12" v-if="mch.coupon.use"
+													:class="[themeTextClass]"
+													:style="{'color': !is_gift ? theme.color : ''}">
+													-¥{{mch.coupon.coupon_discount==""?"加载中...":mch.coupon.coupon_discount}}
+												</view>
+												<view class="box-grow-0 mr-12 font-gray"
+													v-else-if="noCouponStatus(mchIndex)">
+													暂无优惠券可用
+												</view>
+												<!-- <view class="box-grow-0 mr-12 font-gray" v-else>
+													mch.coupon.coupon_discount?`-$(mch.coupon.coupon_discount)`:''</view> -->
+												<view class="box-grow-0">
+													<image
+														src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png"
+														style="width: 12rpx; height: 22rpx; margin-bottom: -2rpx;">
+													</image>
+												</view>
 											</view>
 										</view>
-									</view>
-									<app-bottom-modal :visible.sync="mch.showCouponPicker" title="优惠券">
-										<app-coupon-pick :plugin="plugin" :mch-index="mchIndex"
-											@change="loadPreviewData" :no-coupons.sync="mch.noCoupons" :theme="theme">
-										</app-coupon-pick>
-									</app-bottom-modal>
-								</template>
-								<!-- <view v-if="mch.member_discount > 0 || mch.member_discount < 0" class="dir-left-nowrap"
+										<app-bottom-modal :visible.sync="mch.showCouponPicker" title="优惠券"
+											:maxValueOfY="maxValueOfY">
+											<app-coupon-pick :plugin="plugin" :mch-index="mchIndex"
+												@change="loadPreviewData" :no-coupons.sync="mch.noCoupons"
+												:theme="theme">
+											</app-coupon-pick>
+										</app-bottom-modal>
+									</template>
+									<!-- <view v-if="mch.member_discount > 0 || mch.member_discount < 0" class="dir-left-nowrap"
 									style="padding: 16rpx 0;">
 									<view class="box-grow-1">会员价总优惠</view>
 									<view class="box-grow-0" :class="[themeTextClass]"
@@ -208,7 +216,7 @@
 										<template v-else>¥0.00</template>
 									</view>
 								</view> -->
-								<!-- <view v-if="mch.full_reduce_discount > 0 || mch.full_reduce_discount < 0"
+									<!-- <view v-if="mch.full_reduce_discount > 0 || mch.full_reduce_discount < 0"
 									class="dir-left-nowrap" style="padding: 16rpx 0;">
 									<view class="box-grow-1">满减总优惠</view>
 									<view class="box-grow-0" :class="[themeTextClass]"
@@ -219,7 +227,7 @@
 											v-else-if="mch.full_reduce_discount<0">+¥{{0-mch.full_reduce_discount}}</template>
 									</view>
 								</view> -->
-								<!-- <view v-if="mch.integral && mch.integral.can_use" class="dir-left-nowrap"
+									<!-- <view v-if="mch.integral && mch.integral.can_use" class="dir-left-nowrap"
 									style="padding: 16rpx 0;">
 									<view class="box-grow-1 dir-left-nowrap cross-center">
 										积分抵扣（使用 {{mch.integral.use_num}}积分）
@@ -239,7 +247,7 @@
 										</view>
 									</view>
 								</view> -->
-								<!-- <view v-if="mch.temp_vip_discount" style="padding: 16rpx 0;">
+									<!-- <view v-if="mch.temp_vip_discount" style="padding: 16rpx 0;">
 									<view :style="{
                             backgroundImage: `url(${appImg.order_submit.svip_bg})`,
                             }" class="svip dir-left-nowrap cross-center">
@@ -274,7 +282,7 @@
 										</view>
 									</view>
 								</view> -->
-								<!-- <view v-if="mch.insert_rows && mch.insert_rows.length"
+									<!-- <view v-if="mch.insert_rows && mch.insert_rows.length"
 									:class="[mch.showInsertRows?'show':'',]">
 									<view class="dir-left-nowrap cross-center" @click="reversalShowInsertRows(mchIndex)"
 										style="padding: 16rpx 0;">
@@ -301,65 +309,67 @@
 										</view>
 									</view>
 								</view> -->
-							</view>
-							<view class="line"></view>
-						</template>
-						<template>
-							<!-- <view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
+								</view>
+								<view class="line"></view>
+							</template>
+							<template>
+								<!-- <view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
 								<view class="box-grow-1">支付方式</view>
 								<view class="box-grow-0">
 									微信支付
 								</view>
 							</view> -->
-							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
-								<view class="box-grow-1">配送方式</view>
-								<view class="box-grow-0">
-									快递配送
+								<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
+									<view class="box-grow-1">配送方式</view>
+									<view class="box-grow-0">
+										快递配送
+									</view>
 								</view>
-							</view>
-						</template>
-						<template>
-							<!-- 申请发票start -->
-							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
-								<view class="box-grow-1">发票</view>
-								<view class="box-grow-0">
-									<label>
-										<checkbox @click="isNeedInvoice=!isNeedInvoice" :checked="isNeedInvoice"
-											color="#ffffff" style="transform:scale(0.7)" />
-									</label>
+							</template>
+							<template>
+								<!-- 申请发票start -->
+								<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
+									<view class="box-grow-1">发票</view>
+									<view class="box-grow-0">
+										<label>
+											<checkbox @click="isNeedInvoice=!isNeedInvoice" :checked="isNeedInvoice"
+												color="#ffffff" style="transform:scale(0.7)" />
+										</label>
+									</view>
 								</view>
-							</view>
-							<view v-show="isNeedInvoice"
-								style="font-size: 24rpx;font-weight: 500;color: #AE8445;line-height: 46rpx;text-align: right;padding: 0 32rpx;"
-								@click="navigateInvoice">编辑发票资料</view>
+								<view v-show="isNeedInvoice"
+									style="font-size: 24rpx;font-weight: 500;color: #AE8445;line-height: 46rpx;text-align: right;padding: 0 32rpx;"
+									@click="navigateInvoice">编辑发票资料</view>
 
-							<view v-show="isNeedInvoice" class="dir-left-nowrap cross-center"
-								style="height: 84rpx; padding: 0 32rpx;">
-								<view class="box-grow-1">发票收货地址</view>
-								<view class="box-grow-0">
-									<label>
-										<checkbox :value="1" checked="false" color="#ffffff"
-											style="transform:scale(0.7)" />
-									</label>
+								<view v-show="isNeedInvoice" class="dir-left-nowrap cross-center"
+									style="height: 84rpx; padding: 0 32rpx;">
+									<view class="box-grow-1">发票收货地址</view>
+									<view class="box-grow-0">
+										<label>
+											<checkbox :value="1" checked="false" color="#ffffff"
+												style="transform:scale(0.7)" />
+										</label>
+									</view>
 								</view>
-							</view>
-							<view v-show="isNeedInvoice"
-								style="font-size: 24rpx;font-weight: 500;color: #AE8445;line-height: 46rpx;text-align: right;padding: 0 32rpx;"
-								@click="navigateInvoiceAddr">选择收货地址</view>
-
-						</template><!-- 申请发票end -->
-						<template>
-							<!-- 买家留言start -->
-							<view class="dir-left-nowrap cross-center" style="min-height: 84rpx; padding: 0 32rpx;">
-								<view class="box-grow-1">买家留言</view>
-								<view class="box-grow-0">
-									<textarea type="text" style="width: 460rpx;" maxlength="50" auto-height placeholder="填写您想要备注的信息，50字以内" placeholder-style="font-size: 24rpx;color: #999999;" />
+								<view v-show="isNeedInvoice"
+									style="font-size: 24rpx;font-weight: 500;color: #AE8445;line-height: 46rpx;text-align: right;padding: 0 32rpx;"
+									@click="navigateInvoiceAddr">选择收货地址</view>
+
+							</template><!-- 申请发票end -->
+							<template>
+								<!-- 买家留言start -->
+								<view class="dir-left-nowrap cross-center" style="min-height: 84rpx; padding: 0 32rpx;">
+									<view class="box-grow-1">买家留言</view>
+									<view class="box-grow-0">
+										<textarea type="text" style="width: 460rpx;" maxlength="50" auto-height
+											placeholder="填写您想要备注的信息，50字以内"
+											placeholder-style="font-size: 24rpx;color: #999999;" />
+									</view>
 								</view>
-							</view>
-						</template><!-- 买家留言end -->
+							</template><!-- 买家留言end -->
 						</view>
-						
-						<view  class="group">
+
+						<view class="group">
 							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
 								<view class="box-grow-1">商品总额</view>
 								<view class="box-grow-0">
@@ -369,36 +379,36 @@
 								</view>
 								<!-- <view class="box-grow-0 font-gray mr-12">共{{mch.goods_count}}件</view> -->
 							</view>
-						<template v-if="mch.show_express_price !== false">
-							<!-- 运费信息start -->
-							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
-								<view class="box-grow-1">运费</view>
-								<view class="box-grow-0" :class="[themeTextClass]"
-									:style="{'color': !is_gift ? theme.color : '','text-align':'right'}">
-									<template v-if="mch.express_price_origin && mch.express_price_desc">
-										<view :style="{'color': theme.color}">￥{{mch.express_price_origin}}</view>
-										<view class="express-price-desc" :style="{'color': theme.color}">
-											{{mch.express_price_desc}}
-										</view>
-									</template>
-									<template v-else>￥{{mch.express_price}}</template>
+							<template v-if="mch.show_express_price !== false">
+								<!-- 运费信息start -->
+								<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
+									<view class="box-grow-1">运费</view>
+									<view class="box-grow-0" :class="[themeTextClass]"
+										:style="{'color': !is_gift ? theme.color : '','text-align':'right'}">
+										<template v-if="mch.express_price_origin && mch.express_price_desc">
+											<view :style="{'color': theme.color}">￥{{mch.express_price_origin}}</view>
+											<view class="express-price-desc" :style="{'color': theme.color}">
+												{{mch.express_price_desc}}
+											</view>
+										</template>
+										<template v-else>￥{{mch.express_price}}</template>
+									</view>
 								</view>
-							</view>
-						</template><!-- 运费信息end -->
+							</template><!-- 运费信息end -->
 
-						<template v-if="balance < 0">
-							<!-- 欠款金额start -->
-							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
-								<view class="box-grow-1">欠款金额</view>
-								<view class="box-grow-0" :class="[themeTextClass]"
-									:style="{'color': !is_gift ? theme.color : '','text-align':'right'}">
-									<template>￥{{Math.abs(balance)}}</template>
+							<template v-if="balance < 0">
+								<!-- 欠款金额start -->
+								<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
+									<view class="box-grow-1">欠款金额</view>
+									<view class="box-grow-0" :class="[themeTextClass]"
+										:style="{'color': !is_gift ? theme.color : '','text-align':'right'}">
+										<template>￥{{Math.abs(balance)}}</template>
+									</view>
 								</view>
-							</view>
-						</template>
-						<!-- 欠款金额end -->
+							</template>
+							<!-- 欠款金额end -->
 
-						<!-- <template v-if="
+							<!-- <template v-if="
                     !(mch.order_form && mch.order_form.status == '1')
                     && mch.show_remark !== false
                     && mch.has_goods_form !== true">
@@ -409,7 +419,7 @@
 							</view>
 						</template>
 						<view class="line"></view> -->
-						
+
 						</view>
 					</view><!-- 循环商户列表end -->
 				</template>
@@ -489,8 +499,7 @@
 			<view class="bd-bottom dir-left-nowrap">
 				<view class="box-grow-1 cross-center u-submit-bar-height">
 					<view class="price-info">
-						<view :class="[themeTextClass]"
-							:style="{'color': '#222222','font-size': '30rpx'}">
+						<view :class="[themeTextClass]" :style="{'color': '#222222','font-size': '30rpx'}">
 							{{totalTitle}}:
 							<text v-for="(custom_currency, ccIndex) in previewData.custom_currency_all" :key="ccIndex">
 								{{custom_currency}}+
@@ -507,7 +516,7 @@
 							:style="{'color': !is_gift ? theme.color : '','font-size': '20rpx'}">包含SVIP费用:
 							¥{{previewData.vip_card_price}}
 						</view> -->
-						<view v-if="previewData.mch_list[0].total_discounts_price > 0" 
+						<view v-if="previewData.mch_list[0].total_discounts_price > 0"
 							:style="{'color': '#999','font-size': '22rpx','margin-left':'74rpx'}">共优惠:
 							¥{{previewData.mch_list[0].total_discounts_price}}元
 						</view>
@@ -517,13 +526,17 @@
 					<view @click="subscribe" class="submit-btn u-submit-bar-height box-grow-0 main-center cross-center"
 						:class="[ submitLock? ' lock' : '', themeBgClass]"
 						:style="{'background-color': !is_gift ? theme.background : ''}">
-						<view style="background-color: transparent;color:#ffffff; text-align: center;">{{getIsEnterSales?'去下单':'去支付'}}</view>
+						<view style="background-color: transparent;color:#ffffff; text-align: center;">
+							{{getIsEnterSales?'去下单':'去支付'}}
+						</view>
 					</view>
 				</template>
 				<template v-else>
 					<view class="submit-btn u-submit-bar-height box-grow-0 main-center cross-center disabled"
 						:class="[themeTextClass]" :style="{'color': !is_gift ? theme.color : ''}">
-						<view style="background-color: transparent;color: #ffffff; text-align: center;">{{getIsEnterSales?'去下单':'去支付'}}</view>
+						<view style="background-color: transparent;color: #ffffff; text-align: center;">
+							{{getIsEnterSales?'去下单':'去支付'}}
+						</view>
 					</view>
 				</template>
 			</view>
@@ -587,15 +600,17 @@
 				is_open: false,
 				mchList: '',
 				p_pay_id: '', //重新提交处理
-				
-				customerInfo:null,
-				
+				customerInfo: null,
+				maxcpuponall: null,
+				// formData:null
 			};
 		},
 		computed: {
 			...mapState({
 				appImg: state => state.mallConfig.__wxapp_img,
-				info:state=> state.user.info
+				info: state => state.user.info,
+				maxcpuponall: state => state.orderSubmit.maxValueOfY,
+				formData: state => state.orderSubmit.formData,
 			}),
 			theme() {
 				return this.userTheme ? this.userTheme : this.getTheme;
@@ -603,6 +618,9 @@
 			...mapGetters('mallConfig', {
 				getTheme: 'getTheme'
 			}),
+			// ...mapGetters('orderSubmit', {
+			// 	formData: 'formData'
+			// }),
 			...mapGetters('user', {
 				getIsEnterSales: 'getIsEnterSales'
 			}),
@@ -618,6 +636,7 @@
 			},
 		},
 		onLoad(options) {
+			console.log(options,"6556")
 			this.$commonLoad.onload(options);
 			let mchList = JSON.parse(options.mch_list);
 			let list = [];
@@ -678,7 +697,7 @@
 			var currPage = pages[pages.length - 1]; //当前页面
 			'customerInfo' in currPage.$vm ? this.customerInfo = currPage.$vm.customerInfo : ''
 		},
-		onHide(){
+		onHide() {
 			this.$store.commit('user/isOrderBehalfBustomers', false);
 		},
 		onUnload() {
@@ -688,6 +707,10 @@
 			}
 		},
 		watch: {
+			 // formData(){
+				// this.formData= this.$store.state.orderSubmit.formData
+			 // },
+
 			'previewData.address.name': {
 				handler() {
 					this.changeZitiAddress();
@@ -698,35 +721,42 @@
 					this.changeZitiAddress();
 				},
 			},
-			customerInfo(nVal,oVal){ //获取客户token代客下单用
+			customerInfo(nVal, oVal) { //获取客户token代客下单用
 				this.$request({
-					url:this.$api.sale.get_token,
-					data:{
-						user_id:this.customerInfo.user_id
+					url: this.$api.sale.get_token,
+					data: {
+						user_id: this.customerInfo.user_id
 					},
-					method:'post'
-				}).then(res=>{
-					if(res.code===0){
+					method: 'post'
+				}).then(res => {
+					if (res.code === 0) {
 						this.$store.commit('user/customerAccessToken', res.data.access_token);
 						this.$store.commit('user/isOrderBehalfBustomers', true);
-						
+
 						delete this.previewData.address
 						const formData = this.$store.state.orderSubmit.formData;
-						formData.list[0].user_coupon_id = 0;
+						const mutusemaxCoup= this.$store.getters['orderSubmit/getusemaxCoup'];
+						console.log(mutusemaxCoup,"789789789")
+						if(mutusemaxCoup!=1){
+							formData.list[0].user_coupon_id = 0;
+						}
 						this.$store.commit('orderSubmit/mutSetFormData', formData);
-					}else{
+					} else {
 						uni.showToast({
-							title:res.msg,
-							icon:'none'
+							title: res.msg,
+							icon: 'none'
 						})
 					}
 				})
 			}
 		},
 		methods: {
-			navCustomer(){
+			maxValueOfY(e) {
+				this.maxcpuponall = e
+			},
+			navCustomer() {
 				uni.navigateTo({
-					url:'/pages/sale/cusmter/list?why=select_customer'
+					url: '/pages/sale/cusmter/list?why=select_customer'
 				})
 			},
 			getMall(e) {
@@ -870,17 +900,66 @@
 					this.$storage.setStorageSync(key, store_id ? store_id : 0);
 				}
 			},
+
 			loadPreviewData() {
+				// let obj = this.$store.state.orderSubmit.formData
+				// let formDateNew = JSON.stringify(obj)
+				setTimeout(() => {
+					let obj1 = this.$store.state.orderSubmit.formData
+					let formDateNew1 = JSON.stringify(obj1)
+			
+					this.$request({
+						url: this.previewUrl,
+						method: 'post',
+						data: {
+							form_data: JSON.stringify(this.formData),
+						},
+					}).then(response => {
+						this.loadingPreviewData = false;
+						uni.hideLoading();
+						if (response.code === 0) {
+							if (response.data.allZiti && !response.data.address) {
+								response.data.address = {
+									name: '',
+									mobile: '',
+								};
+							}
+							for (let i in response.data.mch_list) {
+								response.data.mch_list[i].showCouponPicker = false;
+								response.data.mch_list[i].noCoupons = false;
+								response.data.mch_list[i].showInsertRows = false;
+							}
+							this.previewData = response.data;
+							this.setDiyFormScrollStatus();
+							this.checkCouponError();
+							this.updateStoreDistance();
+							this.updateGoodsCount();
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: response.msg,
+								showCancel: false,
+								success: () => {
+									uni.navigateBack();
+								},
+							});
+						}
+					}).catch(() => {
+						this.loadingPreviewData = false;
+						uni.hideLoading();
+					});
+				}, 1600);
 				this.loadingPreviewData = true;
 				uni.showLoading({
 					mask: true,
 					title: '加载中',
 				});
+				
 				this.$request({
 					url: this.previewUrl,
 					method: 'post',
 					data: {
-						form_data: JSON.stringify(this.$store.state.orderSubmit.formData),
+						form_data: JSON.stringify(this.formData),
 					},
 				}).then(response => {
 					this.loadingPreviewData = false;
@@ -938,7 +1017,7 @@
 			navigateInvoiceAddr() {
 				uni.navigateTo({
 					// url: '/pages/order-submit/invoice/invoiceAddr'
-					url:'/pages/order-submit/address-pick?sign=invoice'
+					url: '/pages/order-submit/address-pick?sign=invoice'
 				})
 			},
 			navigateCoupon(mchIndex) {
@@ -965,6 +1044,7 @@
 				formData.list[mchIndex].send_type = value;
 				this.$store.commit('orderSubmit/mutSetFormData', formData);
 				this.previewData.mch_list[mchIndex].delivery.send_type = value;
+
 				this.loadPreviewData();
 			},
 			updateStoreDistance() {
@@ -1166,18 +1246,18 @@
 							}, 1000);
 						} else {
 							uni.hideLoading();
-							if(this.getIsEnterSales){
+							if (this.getIsEnterSales) {
 								uni.showModal({
 									title: '',
 									content: '代客下单成功',
 									showCancel: false,
-									success: function (res) {
-									        if (res.confirm) {
-									           uni.navigateBack()
-									        } 
-									    }
+									success: function(res) {
+										if (res.confirm) {
+											uni.navigateBack()
+										}
+									}
 								});
-							}else{
+							} else {
 								this.pay(response.data)
 							}
 						}
@@ -1323,7 +1403,7 @@
 					}
 				}
 				const formData = this.$store.state.orderSubmit.formData;
-				if(this.getIsEnterSales){
+				if (this.getIsEnterSales) {
 					// if(!this.customerInfo || !this.$store.state.user.customerAccessToken){
 					// 	uni.showModal({
 					// 		title: '提示',
@@ -1333,35 +1413,35 @@
 					// 	return
 					// }
 					//formData.place_sale_id=this.info.salesperson_id
-					
+
 					formData.place_sale_id = uni.getStorageSync('dk_sale_id');
 					formData.place_estate_id = uni.getStorageSync('dk_estate_id');
 				}
-				if(this.isNeedInvoice){ //判断是否选择发票，并设置发票信息
-					let invoice_info=this.$storage.getStorageSync('invoice_info')
-					if(invoice_info){
-						if(!invoice_info.amount){
+				if (this.isNeedInvoice) { //判断是否选择发票，并设置发票信息
+					let invoice_info = this.$storage.getStorageSync('invoice_info')
+					if (invoice_info) {
+						if (!invoice_info.amount) {
 							uni.showToast({
-								title:'请填写发票资料',
-								icon:'none'
+								title: '请填写发票资料',
+								icon: 'none'
 							})
 							return
 						}
-						if(!invoice_info.user_address_id){
+						if (!invoice_info.user_address_id) {
 							uni.showToast({
-								title:'请选择发票收货地址',
-								icon:'none'
+								title: '请选择发票收货地址',
+								icon: 'none'
 							})
 							return
 						}
-					}else{
+					} else {
 						uni.showToast({
-							title:'请填写发票资料',
-							icon:'none'
+							title: '请填写发票资料',
+							icon: 'none'
 						})
 						return
 					}
-					formData.invoice_info=invoice_info
+					formData.invoice_info = invoice_info
 				}
 				this.$store.commit('orderSubmit/mutSetFormData', formData);
 				if (this.submitLock) return;
@@ -1415,7 +1495,7 @@
 				}
 			},
 			handleAddressInput(e) {
-				this.previewData.address={}
+				this.previewData.address = {}
 				if (typeof e.name !== 'undefined') this.previewData.address.name = e.name;
 				if (typeof e.mobile !== 'undefined') this.previewData.address.mobile = e.mobile;
 			},
@@ -1456,17 +1536,17 @@
 	$borderColor: $uni-weak-color-one;
 	$xWidth: #{24rpx};
 	$yWidth: #{24rpx};
-	
-	.select-customer{
+
+	.select-customer {
 		margin: 20rpx 26rpx;
 		background: #fff;
 		border-radius: 16rpx;
 		overflow: hidden;
-		-webkit-box-shadow: 0 0 5rpx rgba(0,0,0,0.025);
-		box-shadow: 0 0 5rpx rgba(0,0,0,0.025);
+		-webkit-box-shadow: 0 0 5rpx rgba(0, 0, 0, 0.025);
+		box-shadow: 0 0 5rpx rgba(0, 0, 0, 0.025);
 		padding: 25rpx 32rpx;
 	}
-	
+
 	.page {
 		padding-bottom: $submitBarHeight;
 		font-size: #{28rpx};

src/pages/order-submit/pay-result.vue

@@ -2,7 +2,7 @@
     <app-layout>
         <template v-if="result">
             <view class="pay-result mb-24" :class="{'over-page' : community}">
-                <image class="top-pic mb-24" :src="appImg.mall.order_pay_success"></image>
+                <image class="top-pic mb-24" src="https://wechat.xcrjhuixiangjia.com/web/statics/image/new/order_success.png"></image>
                 <view class="mb-24" style="font-weight: bold;">订单提交成功</view>
                 <view class="pay-price mb-24">￥{{result.total_pay_price}}</view>
                 <view class="dir-left-nowrap main-center">
@@ -277,7 +277,7 @@
         }
         .top-pic {
             width: #{220rpx};
-            height: #{172rpx};
+            height: #{220rpx};
         }
 
         .pay-price {

src/pages/order/appraise-finish/index.vue

@@ -2,7 +2,7 @@
     <app-layout>
         <view class='finish-box'>
             <view class='top-box dir-top-nowrap cross-center main-center'>
-                <image class='img' src='https://shop.9026.com/web/statics/image/mall/static/icon/order/icon-comment.png'></image>
+                <image class='img' src='https://wechat.xcrjhuixiangjia.com/web/statics/image/new/order_success.png'></image>
                 <text class='comment'>评价成功</text>
                 <view class='dir-left-nowrap btn-box'>
                     <app-jump-button url="/pages/index/index" open_type="redirect">

src/pages/order/refund/order-refund.vue

@@ -426,7 +426,7 @@ export default {
     .btn {
         border-radius: 40#{rpx};
         height: 80#{rpx};
-        background: #ff4544;
+        background: #A18353;
         padding: 24#{rpx} 0;
         color: #ffffff;
         font-size: 32#{rpx};

src/pages/order/refund/refund.vue

@@ -411,7 +411,7 @@ export default {
     .btn {
         border-radius: 40#{rpx};
         height: 80#{rpx};
-        background: #ff4544;
+        background: #A18353;
         padding: 24#{rpx} 0;
         color: #ffffff;
         font-size: 32#{rpx};

src/pages/sale/cusmter/addCustomer.vue

@@ -30,7 +30,7 @@
 					<view class="cross-center curd-btn" @click="addOrDel()" v-if="index==form.estates.length-1">
 						<image src="https://t17.9026.com/web/statics/image/sale/tianjia.png" mode=""></image>添加
 					</view>
-					<view class="cross-center curd-btn" @click="addOrDel(index)" style="margin-left: 30rpx;" v-if="form.estates.length>1">
+					<view class="cross-center curd-btn" @click="addOrDel(index)" style="margin-left: 30rpx;" v-if="form.estates.length>1&&index>ele-1">
 						<image src="https://t17.9026.com/web/statics/image/sale/shanchu.png" mode=""></image>删除
 					</view>
 				</view>
@@ -80,7 +80,8 @@
 					name: '',
 					estates: []
 				},
-				setTimer:''
+				setTimer:'',
+				ele:''
 			};
 		},
 		onLoad(option) {
@@ -101,6 +102,7 @@
 						this.form.avatar=res.data.avatar
 						this.form.mobile=res.data.mobile
 						this.form.name=res.data.name
+						this.ele=res.data.userEstate.length
 						for (let i = 0; i < res.data.userEstate.length; i++) {
 							let item=res.data.userEstate[i]
 							let estateItem={
@@ -113,6 +115,7 @@
 								multiIndex:[item.estate.province_id,item.estate.city_id,item.estate.district_id],
 								estate_name: item.estate.name,
 							}
+							
 							this.form.estates.push(estateItem)
 						}
 						this.$hideLoading()
@@ -207,7 +210,7 @@
 			selectEstate(index) {
 				this.formIndex=index
 				uni.navigateTo({
-					url: '/pages/sale/properties/addProperties'
+					url: '/pages/sale/properties/addProperties?qid=2'
 				})
 			},
 			submit(){

src/pages/sale/mySaleOrder.vue

@@ -137,11 +137,12 @@
 				dataList:[],
 				options: [
 					[
+						// {
+						// 	text: '订单状态',
+						// 	value: 0,
+						// 	checked: true
+						// },
 						{
-							text: '订单状态',
-							value: 0,
-							checked: true
-						}, {
 							text: '全部',
 							value: 0
 						}, {

src/pages/sale/properties/addProperties.vue

@@ -46,6 +46,7 @@
 </template>
 
 <script>
+	let _this
 	import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vue';
 	import uPopup from '@/components/basic-component/u-popup/u-popup.vue';
 	export default {
@@ -59,17 +60,22 @@
 				show: false,
 				page:1,
 				name:'',
-				
+				qid:'',
 				dataList:[],
 				noMore:false,
 				selectIndex:-1,
 				regionId:{},
+				is_unbound:0
 			};
 		},
 		onLoad(option) {
+			_this=this
+			console.log(option)
+			'qid' in option?this.qid=JSON.parse(option.qid):''
 			'regionId' in option?this.regionId=JSON.parse(option.regionId):''
 			'type' in option?this.type=option.type:''
 			this.getData(1)
+			
 		},
 		methods:{
 			selectEstate(index,name,id,item){
@@ -109,6 +115,9 @@
 				},800)
 			},
 			getData(page){
+				if(this.qid==2){
+					this.is_unbound=1
+				}
 				this.$showLoading()
 				this.$request({
 					url: this.$api.sale.estate_list,
@@ -116,6 +125,8 @@
 						page: page,
 						is_myself: 0,
 						name: this.name,
+						audit_state:this.qid,
+						is_unbound:this.is_unbound,
 						...this.regionId
 					},
 					method: 'post'

src/pages/sale/properties/properties.vue

@@ -27,7 +27,7 @@
 			<view class="no-more" v-if="isNoMore && dataList.length>0">没有更多了...</view>
 			<app-no-goods v-if="dataList.length===0" :title="`暂无数据`" background="#f7f7f7"></app-no-goods>
 			<view style="100rpx"></view>
-			<navigator url="/pages/sale/properties/addProperties" hover-class="navigator-hover">
+			<navigator url="/pages/sale/properties/addProperties?qid=0" hover-class="navigator-hover">
 				<button class="addPro" :class="[`coupon-footer`,iphone_x? `iphone_x`:``]" type="default">添加楼盘</button>
 				<!-- <view :class="[`footer-space`,iphone_x? `iphone_x`:``]"></view>
 			<view :class="[`coupon-footer`,iphone_x? `iphone_x`:``]" @click="toList">去领券</view> -->

src/pages/sale/sale_login/sale_login.vue

@@ -61,12 +61,11 @@
 				    },
 				    method:'post'
 				})
-				console.log(loginRes)
+				
 				if(loginRes.code===0){
-					console.log('111')
+					
 					await this.refresh()
-					console.log('userRes')
-					console.log('222')
+					
 					uni.reLaunch({
 						url:'/pages/sale/sale-user-center'
 					})

src/pages/share/index/index.vue

@@ -111,7 +111,7 @@
 		</view>
 		<!-- 不是分销商 -->
 		<view class="no-pass" v-else-if="status == 2">
-			<image class="no-pass-img" src="https://shop.9026.com/web/statics/img/mall/share/icon-share-tip.png">
+			<image class="no-pass-img" src="../../../static/image/icon/allstore.png">
 			</image>
 			<view>
 				您还不是{{custom_setting.words.share_name.name ? custom_setting.words.share_name.name : custom_setting.words.share_name.default}}，请先提交申请！
@@ -683,8 +683,8 @@
 	}
 
 	.no-pass-img {
-		height: #{240rpx};
-		width: #{420rpx};
+		height: #{300rpx};
+		width: #{300rpx};
 		margin-bottom: #{80rpx};
 	}
 
@@ -696,7 +696,7 @@
 		color: #fff;
 		font-size: #{30rpx};
 		line-height: #{80rpx};
-		background: #ff4544;
+		background: #A18353;
 	}
 
 	.withdraw-btn:active {

src/pages/user-center/user-center.vue

@@ -7,13 +7,13 @@
             :top-style="4"
             :member-pic-url="userCenter.member_pic_url"
             :is_icon_super_vip="is_icon_super_vip"
-			:isRealname="userInfo.estate?true:false"
+			:isRealname="userInfo.is_verify==1?true:false"
             user-name-color="#262626"
         ></app-user-center-top>
 
         <view class="u-foot-box main-center" v-if="userCenter.is_foot_bar_status == 1">
             <view @click="router(item.name)" class="u-foot-item main-center" v-for="(item, key) in foot_bar" :key="key">
-                <!-- <image class="u-icon" :src="item.icon_url"></image> -->
+               
                 <view class="u-foot-info">
                     <view class="u-foot-num" style="font-weight: bold;">{{item.name | showNum(userInfo)}}</view>
                     <view>{{item.name}}</view>
@@ -45,10 +45,10 @@
                                   userCenter.menu_style=='2'?'dir-top-nowrap cross-center':'',
                               ]">
                             <view class="box-grow-0">
-                                <image :src="item.icon_url" class="icon"></image>
+                                <image :src="item.icon_url?item.icon_url:''" class="icon"></image>
                             </view>
                             <view class="box-grow-1" style="max-width: 100%">
-                                <view class="name">{{item.name}}</view>
+                                <view class="name">{{item.name?item.name:''}}</view>
                             </view>
                             <view class="box-grow-0" v-if="userCenter.menu_style=='1'">
                                 <image src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png" class="arrow"></image>
@@ -72,10 +72,10 @@
                                   userCenter.menu_style=='2'?'dir-top-nowrap cross-center':'',
                               ]">
                                 <view class="box-grow-0">
-                                    <image :src="item.icon_url" class="icon"></image>
+                                    <image :src="item.icon_url?item.icon_url:''" class="icon"></image>
                                 </view>
                                 <view class="box-grow-1" style="max-width: 100%">
-                                    <view class="name">{{item.name}}</view>
+                                    <view class="name">{{item.name?item.name:''}}</view>
                                 </view>
                                 <view class="box-grow-0" v-if="userCenter.menu_style=='1'">
                                     <image src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png" class="arrow"></image>

src/plugins/composition/components/app-add-subtract/app-add-subtract.vue

@@ -36,6 +36,7 @@
 				step: 1,
 				disabled: false,
 				is_loading: false,
+
 			}
 		},
 		props: {
@@ -70,7 +71,9 @@
 				}
 			},
 			good_id: [String, Number],
-			theme: Object
+			theme: Object,
+			goods_you:Object,
+			list_goodsyou:Number,
 		},
 		created() {
 			this.inputValue = +this.value;
@@ -80,12 +83,32 @@
 				if (this.disabled) {
 					return;
 				}
+				
+				if(!this.goods_you&&this.list_goodsyou==2){
+					uni.showModal({
+					    title: '提示',
+					    content: '请选择规格',
+					    success: function (res) {
+					    }
+					});
+					return
+				}
 				const scale = this._getDecimalScale();
 				let value = this.inputValue * scale;
 				let step = this.step * scale;
 				if (type === "minus") {
+					
 					value -= step;
 				} else if (type === "plus") {
+					if(!this.goods_you&&this.list_goodsyou==1){
+						uni.showModal({
+						    title: '提示',
+						    content: '请选择规格',
+						    success: function (res) {
+						    }
+						});
+						return
+					}
 					value += step;
 				}
 				if (value < this.min || value > this.stock) {

src/plugins/composition/components/app-bd-info/app-bd-info.vue

@@ -8,7 +8,7 @@
 					<view>
 						<text class="price">
 							<text class="dw">￥</text>
-							<text class="rmb">{{total}}</text>
+							<text class="rmb">{{total?total:info.discount_amount}}</text>
 							<text class="decimal">.00</text>
 						</text>
 						<text class="price-line"><text v-if="info.min_composition_price">￥</text>{{info.min_composition_price}}</text>

src/plugins/composition/components/app-list/app-list.vue

@@ -25,7 +25,7 @@
 							<view class="price"><text class="ought_price">￥{{goods.choose_attr?goods.choose_attr.price*goods.goods_num:goods.min_price}}</text><text class="paid_price" v-show="goods.total_price>=0">实付:￥<text>{{goods.total_price}}</text></text></view>
 						</view>
 					</view>
-					<app-add-subtract :xStyle="2" :stock="goods.stock" :good_id="goods.id" :min="1" :value="goods.goods_num" @change="addsubChange($event,goods,index,index1,0)"></app-add-subtract>
+					<app-add-subtract :xStyle="2" :stock="goods.stock" :good_id="goods.id" :min="1" :value="goods.goods_num" @change="addsubChange($event,goods,index,index1,0)" :goods_you="goods.choose_attr" :list_goodsyou="2"></app-add-subtract>
                 </view>                    
                 <view class="item-goods main-between" v-for="(goods,idx) in item.goods_list" :key="goods.id">
 					<view class="main-left">
@@ -52,7 +52,7 @@
                         <view class="price"><text class="ought_price">￥{{goods.choose_attr?goods.choose_attr.price*goods.goods_num:goods.min_price}}</text><text class="paid_price" v-show="goods.total_price>=0">实付:￥<text>{{goods.total_price}}</text></text></view>
                     </view>
 					</view>
-					<app-add-subtract :xStyle="2" :stock="goods.stock" :good_id="goods.id" :min="0" :value="goods.goods_num" @change="addsubChange($event,goods,index,idx,1)"></app-add-subtract>
+					<app-add-subtract :xStyle="2" :stock="goods.stock" :good_id="goods.id" :min="0" :value="goods.goods_num" @change="addsubChange($event,goods,index,idx,1)" :goods_you="goods.choose_attr" :list_goodsyou="1"></app-add-subtract>
                 </view>
                 <view class="app-price">
                     <template v-if="item.total_price && hidden">
@@ -340,9 +340,9 @@
                                 that.list[i].total_price += +item.total_price
                             }
                         }
-                        if(item.choose_goods && item.choose_attr == null ) {
-                            that.noAttrList.push(item)
-                        }
+                        // if(item.choose_goods && item.choose_attr == null ) {
+                        //     that.noAttrList.push(item)
+                        // }
                     }
                     if(that.list[i].total_price < 0) {
                         that.list[i].total_price = 0.00
@@ -437,8 +437,8 @@
                 // border-bottom: #{2rpx} solid #e2e2e2;
                 position: relative;
                 .out-dialog {
-                    width: #{180rpx};
-                    height: #{180rpx};
+                    width: #{150rpx};
+                    height: #{150rpx};
                     border-radius: #{16rpx};
                     position: absolute;
                     top: 0;
@@ -446,8 +446,8 @@
                     z-index: 10;
                     background-color: rgba(0,0,0,.5);
                     image {
-                        width: #{180rpx};
-                        height: #{180rpx};
+                        width: #{150rpx};
+                        height: #{150rpx};
                         border-radius: #{16rpx};
                     }
                 }

src/plugins/composition/detail/detail.vue

@@ -117,6 +117,7 @@
 					mch_id: 0,
 					composition_list: []
 				}]
+				
 				if (that.noAttrList.length > 0) {
 					that.showNoAttr = true;
 				} else {
@@ -142,6 +143,7 @@
 									attr: []
 								})
 							}
+							
 							let goods_attr = [];
 							for (let y in that.list[i].goods_list) {
 								if (that.list[i].goods_list[y].choose_attr && that.list[i].goods_list[y].choose_attr
@@ -186,51 +188,65 @@
 										})
 									}
 								}
+								// if (arr.goods_list.length > 0) {
+								// 	list[0].composition_list.push(arr);
+									
+								// }
 							}
-							let noChoose = true;
-							for (let y in that.list[i].goods_list) {
-								if (that.list[i].goods_list[y].choose_goods && that.list[i].goods_list[y].choose_attr
-									.attr_list && that.list[i].goods_list[y].choose_attr.number>=1) {
-									noChoose = false;
-									for (let x in that.list[i].goods_list[y].choose_attr.attr_list) {
-										attr.push({
-											attr_id: that.list[i].goods_list[y].choose_attr.attr_list[x].attr_id,
-											attr_group_id: that.list[i].goods_list[y].choose_attr.attr_list[x]
-												.attr_group_id,
+								
+								
+							if(that.list[i].goods_list.length>0){
+								for (let y in that.list[i].goods_list) {
+									if (that.list[i].goods_list[y].choose_goods && that.list[i].goods_list[y].choose_attr
+										.attr_list && that.list[i].goods_list[y].choose_attr.number>=1) {
+										
+										for (let x in that.list[i].goods_list[y].choose_attr.attr_list) {
+											attr.push({
+												attr_id: that.list[i].goods_list[y].choose_attr.attr_list[x].attr_id,
+												attr_group_id: that.list[i].goods_list[y].choose_attr.attr_list[x]
+													.attr_group_id,
+											})
+										}
+										arr.goods_list.push({
+											id: that.list[i].goods_list[y].goods_id,
+											num: that.list[i].goods_list[y].choose_attr.number,
+											goods_attr_id: that.list[i].goods_list[y].choose_attr.goods_attr_id,
+											attr: attr
 										})
 									}
-									arr.goods_list.push({
-										id: that.list[i].goods_list[y].goods_id,
-										num: that.list[i].goods_list[y].choose_attr.number,
-										goods_attr_id: that.list[i].goods_list[y].choose_attr.goods_attr_id,
-										attr: attr
-									})
 								}
+								
 							}
+							
 							if (arr.goods_list.length > 0) {
-								list[0].composition_list.push(arr);
+								list[0].composition_list.push(arr); 
+								console.log(list,"101")
 							}
+							
+							// return
 						}
 					}
+					
 					// if (list[0].composition_list.length == 0) {
 					// 	uni.showToast({
-					// 		title: '请选择套装',
+					// 		title: '请选择套装',x
 					// 		icon: 'none',
 					// 		duration: 1000
 					// 	});
 					// } else {
-						for (let i in list[0].composition_list) {
-							if (list[0].composition_list[i].goods_list.length == 1) {
-								list[0].composition_list.splice(i, 1)
-							}
-						}
-						if (list[0].composition_list.length == 0) {
-							uni.showToast({
-								title: '请选择至少一个搭配商品',
-								icon: 'none',
-								duration: 1000
-							});
-						} else {
+						// for (let i in list[0].composition_list) {
+						// 	if (list[0].composition_list[i].goods_list.length == 1) {
+						// 		list[0].composition_list.splice(i, 1)
+						// 	}
+						// }
+					
+						// if (list[0].composition_list.length == 0) {
+						// 	uni.showToast({
+						// 		title: '请选择至少一个搭配商品',
+						// 		icon: 'none',
+						// 		duration: 1000
+						// 	});
+						// } else {
 							list[0].goods_list = [];
 							for (let j in list[0].composition_list) {
 								for (let y in list[0].composition_list[j].goods_list) {
@@ -238,6 +254,7 @@
 									list[0].goods_list.push(list[0].composition_list[j].goods_list[y])
 								}
 							}
+							console.log(list,"789")
 							let jump_url = `/pages/order-submit/order-submit?mch_list=${JSON.stringify(list)}`;
 							jump_url +=
 								`&preview_url=${encodeURIComponent(this.$api.composition.order_preview)}&submit_url=${encodeURIComponent(this.$api.composition.order_submit)}&plugin=composition`;
@@ -247,7 +264,7 @@
 							});
 						}
 					// }
-				}
+				// }
 			},
 			close() {
 				this.showNoAttr = false;

src/plugins/pt/index/index.vue

@@ -210,8 +210,8 @@
             width: #{108rpx};
             height: #{92rpx};
             .app-icon {
-                width: #{60rpx};
-                height: #{60rpx};
+                width: #{35rpx};
+                height: #{35rpx};
                 background-image: url("https://t17.9026.com/web/statics/image/index/search.png");
                 background-size: 100% 100%;
                 background-repeat: no-repeat;