From 617697841a591022feff92b0cd02ed01fad9a8b2 Mon Sep 17 00:00:00 2001 From: xubin <865453422@qq.com> Date: Mon, 18 Jan 2021 00:14:21 +0800 Subject: [PATCH] =?UTF-8?q?mac=20=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/unishop/uniapp/uni-shop/App.vue | 6 +- .../uni-shop/node_modules/.package-lock.json | 21 + .../node_modules/jweixin-module/package.json | 74 +- .../node_modules/mpvue-citypicker/package.json | 77 +- .../mpvue-citypicker/src/city-data/area.js | 12542 +++++++++++++++++++ .../mpvue-citypicker/src/city-data/city.js | 1503 +++ .../mpvue-citypicker/src/city-data/province.js | 139 + .../mpvue-citypicker/src/mpvueCityPicker.vue | 438 +- addons/unishop/uniapp/uni-shop/package-lock.json | 23 +- addons/unishop/uniapp/uni-shop/package.json | 1 + addons/unishop/uniapp/uni-shop/pages.json | 12 +- addons/unishop/uniapp/uni-shop/pages/cart/cart.vue | 8 +- .../unishop/uniapp/uni-shop/pages/index/index.vue | 28 +- .../uniapp/uni-shop/pages/product/product.vue | 8 +- addons/unishop/uniapp/uni-shop/pages/user/user.vue | 2 +- .../uni-shop/unpackage/dist/build/h5/index.html | 2 +- .../build/h5/static/js/chunk-vendors.150a6da4.js | 13 + .../build/h5/static/js/chunk-vendors.52b1d904.js | 13 - .../dist/build/h5/static/js/index.2ac6fc09.js | 1 - .../dist/build/h5/static/js/index.4daf6cc0.js | 1 + .../h5/static/js/pages-address-address.b2dd4e24.js | 1 + .../h5/static/js/pages-address-address.c4c4560e.js | 1 - .../js/pages-address-addressManage.3fb848bd.js | 1 - .../js/pages-address-addressManage.42c1c151.js | 1 + .../build/h5/static/js/pages-cart-cart.4c1a65e5.js | 1 + .../build/h5/static/js/pages-cart-cart.76adba07.js | 1 - .../static/js/pages-category-category.7ae6a4fd.js | 1 - .../static/js/pages-category-category.b1a17057.js | 1 + .../static/js/pages-favorite-favorite.418b81fe.js | 1 - .../static/js/pages-favorite-favorite.bff8b218.js | 1 + ...~pages-flash-list~pages-order-order.12bf7fcc.js | 1 + ...~pages-flash-list~pages-order-order.a4266497.js | 1 - .../h5/static/js/pages-flash-list.36d8cf71.js | 1 - .../h5/static/js/pages-flash-list.f3e8a167.js | 1 + ...es-flash-list~pages-product-product.a0034486.js | 1 + .../h5/static/js/pages-index-index.001034b2.js | 1 - .../h5/static/js/pages-index-index.02a0db72.js | 1 + .../h5/static/js/pages-money-money.4a87dbad.js | 1 + .../h5/static/js/pages-money-money.bfe775db.js | 1 - .../build/h5/static/js/pages-money-pay.4a91c516.js | 1 + .../build/h5/static/js/pages-money-pay.9850f487.js | 1 - .../static/js/pages-money-paySuccess.0e9a0053.js | 1 + .../static/js/pages-money-paySuccess.bda41083.js | 1 - .../h5/static/js/pages-notice-notice.8fd7d67f.js | 1 - .../h5/static/js/pages-notice-notice.b2039864.js | 1 + .../static/js/pages-order-createOrder.092d8a53.js | 1 - .../static/js/pages-order-createOrder.d2d7176e.js | 1 + .../h5/static/js/pages-order-delivery.0257bd0c.js | 1 - .../h5/static/js/pages-order-delivery.dee45b7b.js | 1 + .../h5/static/js/pages-order-evaluate.3873b72f.js | 1 + .../h5/static/js/pages-order-evaluate.486831b0.js | 1 - ...s-order-evaluate~pages-order-refund.20e86104.js | 1 + ...s-order-evaluate~pages-order-refund.ad19d126.js | 1 - .../h5/static/js/pages-order-order.3675c468.js | 1 + .../h5/static/js/pages-order-order.c8e39736.js | 1 - .../static/js/pages-order-orderDetail.04e4befb.js | 1 + .../static/js/pages-order-orderDetail.46bfd906.js | 1 - .../h5/static/js/pages-order-refund.a9243739.js | 1 + .../h5/static/js/pages-order-refund.f0fbc18d.js | 1 - .../h5/static/js/pages-product-list.65d3dad0.js | 1 + .../h5/static/js/pages-product-list.6fc72f5e.js | 1 - .../h5/static/js/pages-product-product.5dd1f4a1.js | 1 - .../h5/static/js/pages-product-product.61fe7b15.js | 1 + .../h5/static/js/pages-public-login.8e38544b.js | 1 - .../h5/static/js/pages-public-login.c0468edd.js | 1 + .../h5/static/js/pages-public-register.53bcf764.js | 1 - .../h5/static/js/pages-public-register.a8022a03.js | 1 + .../h5/static/js/pages-public-webview.91694759.js | 1 + .../h5/static/js/pages-public-webview.db675485.js | 1 - .../build/h5/static/js/pages-set-set.13969aef.js | 1 - .../build/h5/static/js/pages-set-set.6bd03c9b.js | 1 + .../build/h5/static/js/pages-user-user.21dcbd27.js | 1 - .../build/h5/static/js/pages-user-user.aa5e50c0.js | 1 + .../static/js/pages-userinfo-userinfo.4c17f3b5.js | 1 - .../static/js/pages-userinfo-userinfo.ecb71f38.js | 1 + 75 files changed, 14558 insertions(+), 409 deletions(-) create mode 100644 addons/unishop/uniapp/uni-shop/node_modules/.package-lock.json create mode 100644 addons/unishop/uniapp/uni-shop/node_modules/mpvue-citypicker/src/city-data/area.js create mode 100644 addons/unishop/uniapp/uni-shop/node_modules/mpvue-citypicker/src/city-data/city.js create mode 100644 addons/unishop/uniapp/uni-shop/node_modules/mpvue-citypicker/src/city-data/province.js create mode 100644 addons/unishop/uniapp/uni-shop/package.json create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.150a6da4.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.52b1d904.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.2ac6fc09.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.4daf6cc0.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.b2dd4e24.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.c4c4560e.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-addressManage.3fb848bd.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-addressManage.42c1c151.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-cart-cart.4c1a65e5.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-cart-cart.76adba07.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-category-category.7ae6a4fd.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-category-category.b1a17057.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-favorite-favorite.418b81fe.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-favorite-favorite.bff8b218.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-favorite-favorite~pages-flash-list~pages-order-order.12bf7fcc.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-favorite-favorite~pages-flash-list~pages-order-order.a4266497.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list.36d8cf71.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list.f3e8a167.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list~pages-product-product.a0034486.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.001034b2.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.02a0db72.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-money.4a87dbad.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-money.bfe775db.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.4a91c516.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.9850f487.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-paySuccess.0e9a0053.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-paySuccess.bda41083.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-notice-notice.8fd7d67f.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-notice-notice.b2039864.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-createOrder.092d8a53.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-createOrder.d2d7176e.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-delivery.0257bd0c.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-delivery.dee45b7b.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate.3873b72f.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate.486831b0.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate~pages-order-refund.20e86104.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate~pages-order-refund.ad19d126.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.3675c468.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.c8e39736.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-orderDetail.04e4befb.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-orderDetail.46bfd906.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-refund.a9243739.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-refund.f0fbc18d.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-list.65d3dad0.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-list.6fc72f5e.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.5dd1f4a1.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.61fe7b15.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-login.8e38544b.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-login.c0468edd.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-register.53bcf764.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-register.a8022a03.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-webview.91694759.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-webview.db675485.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.13969aef.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.6bd03c9b.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-user-user.21dcbd27.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-user-user.aa5e50c0.js delete mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-userinfo-userinfo.4c17f3b5.js create mode 100644 addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-userinfo-userinfo.ecb71f38.js diff --git a/addons/unishop/uniapp/uni-shop/App.vue b/addons/unishop/uniapp/uni-shop/App.vue index 0b231ed..88bbacb 100644 --- a/addons/unishop/uniapp/uni-shop/App.vue +++ b/addons/unishop/uniapp/uni-shop/App.vue @@ -50,10 +50,14 @@ diff --git a/addons/unishop/uniapp/uni-shop/package-lock.json b/addons/unishop/uniapp/uni-shop/package-lock.json index afe6fd3..b1fa23e 100644 --- a/addons/unishop/uniapp/uni-shop/package-lock.json +++ b/addons/unishop/uniapp/uni-shop/package-lock.json @@ -1,15 +1,30 @@ { + "name": "uni-shop", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, - "dependencies": { - "jweixin-module": { + "packages": { + "node_modules/jweixin-module": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==" }, - "mpvue-citypicker": { + "node_modules/mpvue-citypicker": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/mpvue-citypicker/-/mpvue-citypicker-1.0.6.tgz", + "integrity": "sha512-V8TuUILYw7pFV0ii02tXKUtLmoa+mTxxJS85dEIc4sp85dVTLNi2GmXqBoz9MkT+QwKeOf3fPvFZzoucERz5rA==", + "engines": { + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + } + } + }, + "dependencies": { + "jweixin-module": { + "version": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", + "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==" + }, + "mpvue-citypicker": { + "version": "https://registry.npmjs.org/mpvue-citypicker/-/mpvue-citypicker-1.0.6.tgz", "integrity": "sha512-V8TuUILYw7pFV0ii02tXKUtLmoa+mTxxJS85dEIc4sp85dVTLNi2GmXqBoz9MkT+QwKeOf3fPvFZzoucERz5rA==" } } diff --git a/addons/unishop/uniapp/uni-shop/package.json b/addons/unishop/uniapp/uni-shop/package.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/addons/unishop/uniapp/uni-shop/package.json @@ -0,0 +1 @@ +{} diff --git a/addons/unishop/uniapp/uni-shop/pages.json b/addons/unishop/uniapp/uni-shop/pages.json index 9882b51..5b101d5 100644 --- a/addons/unishop/uniapp/uni-shop/pages.json +++ b/addons/unishop/uniapp/uni-shop/pages.json @@ -264,12 +264,12 @@ "selectedIconPath": "static/tab-home-current.png", "text": "Home" }, - { - "pagePath": "pages/product/list", - "iconPath": "static/tab-cate.png", - "selectedIconPath": "static/tab-cate-current.png", - "text": "Catagory" - }, + // { + // "pagePath": "pages/product/list", + // "iconPath": "static/tab-cate.png", + // "selectedIconPath": "static/tab-cate-current.png", + // "text": "Catagory" + // }, { "pagePath": "pages/cart/cart", "iconPath": "static/tab-cart.png", diff --git a/addons/unishop/uniapp/uni-shop/pages/cart/cart.vue b/addons/unishop/uniapp/uni-shop/pages/cart/cart.vue index 83249f1..61a649b 100644 --- a/addons/unishop/uniapp/uni-shop/pages/cart/cart.vue +++ b/addons/unishop/uniapp/uni-shop/pages/cart/cart.vue @@ -293,7 +293,7 @@