diff --git a/package-lock.json b/package-lock.json index 23b94c9..e5eddd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4099,8 +4099,7 @@ "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.2.0.tgz?cache=0&sync_timestamp=1610299308660&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-2.2.0.tgz", - "integrity": "sha1-dfUC7q+f/eQvyYgpZFvk6na9ni0=", - "optional": true + "integrity": "sha1-dfUC7q+f/eQvyYgpZFvk6na9ni0=" }, "bindings": { "version": "1.5.0", @@ -4686,7 +4685,6 @@ "version": "3.5.1", "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-3.5.1.tgz?cache=0&sync_timestamp=1610719440699&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-3.5.1.tgz", "integrity": "sha1-7pznu+vSt59J8wR5nVRo4x4U5oo=", - "optional": true, "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", @@ -4702,7 +4700,6 @@ "version": "3.0.2", "resolved": "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz", "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=", - "optional": true, "requires": { "fill-range": "^7.0.1" } @@ -4711,7 +4708,6 @@ "version": "7.0.1", "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz", "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=", - "optional": true, "requires": { "to-regex-range": "^5.0.1" } @@ -4720,7 +4716,6 @@ "version": "5.1.1", "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.1.tgz", "integrity": "sha1-tsHvQXxOVmPqSY8cRa+saRa7wik=", - "optional": true, "requires": { "is-glob": "^4.0.1" } @@ -4728,14 +4723,12 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-7.0.0.tgz", - "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=", - "optional": true + "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=" }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz", "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=", - "optional": true, "requires": { "is-number": "^7.0.0" } @@ -7901,7 +7894,6 @@ "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-2.1.0.tgz", "integrity": "sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk=", - "optional": true, "requires": { "binary-extensions": "^2.0.0" } @@ -10157,6 +10149,11 @@ "integrity": "sha1-p5yezIbuHOP6YgbRIWxQHxR/wH4=", "dev": true }, + "klona": { + "version": "2.0.4", + "resolved": "https://registry.npm.taobao.org/klona/download/klona-2.0.4.tgz", + "integrity": "sha1-e7Hjr/sMuGJFR+9+j2cI6i4538A=" + }, "koa": { "version": "2.13.1", "resolved": "https://registry.npm.taobao.org/koa/download/koa-2.13.1.tgz?cache=0&sync_timestamp=1609771319929&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fkoa%2Fdownload%2Fkoa-2.13.1.tgz", @@ -12579,7 +12576,6 @@ "version": "3.5.0", "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-3.5.0.tgz?cache=0&sync_timestamp=1602584331621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-3.5.0.tgz", "integrity": "sha1-m6dMAZsV02UnjS6Ru4xI17TULJ4=", - "optional": true, "requires": { "picomatch": "^2.2.1" } @@ -13017,6 +13013,77 @@ } } }, + "sass": { + "version": "1.32.8", + "resolved": "https://registry.npm.taobao.org/sass/download/sass-1.32.8.tgz", + "integrity": "sha1-8WqavY3FMK3Yg05QaHiigIwDe9w=", + "requires": { + "chokidar": ">=2.0.0 <4.0.0" + } + }, + "sass-loader": { + "version": "10.1.1", + "resolved": "https://registry.npm.taobao.org/sass-loader/download/sass-loader-10.1.1.tgz", + "integrity": "sha1-Td1aPXY455SQZd1unHwEA39+Zj0=", + "requires": { + "klona": "^2.0.4", + "loader-utils": "^2.0.0", + "neo-async": "^2.6.2", + "schema-utils": "^3.0.0", + "semver": "^7.3.2" + }, + "dependencies": { + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-2.2.0.tgz", + "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=", + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", + "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz?cache=0&sync_timestamp=1599054167787&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-6.0.0.tgz", + "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=", + "requires": { + "yallist": "^4.0.0" + } + }, + "schema-utils": { + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-3.0.0.tgz", + "integrity": "sha1-Z1AvaqK2ai1AMrQnmilEl4oJE+8=", + "requires": { + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + }, + "semver": { + "version": "7.3.4", + "resolved": "https://registry.npm.taobao.org/semver/download/semver-7.3.4.tgz?cache=0&sync_timestamp=1606852064928&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.3.4.tgz", + "integrity": "sha1-J6qn0uTKdkUvmNOt0JOnLJQ+3Jc=", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-4.0.0.tgz", + "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=" + } + } + }, "sax": { "version": "1.2.4", "resolved": "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz", @@ -14644,6 +14711,11 @@ "resolved": "https://registry.npm.taobao.org/uuid/download/uuid-3.4.0.tgz", "integrity": "sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4=" }, + "uview-ui": { + "version": "1.8.3", + "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.8.3.tgz", + "integrity": "sha1-wmAqa/ez7vYD/WMpWes0UK1KC5s=" + }, "v8-to-istanbul": { "version": "4.1.4", "resolved": "https://registry.npm.taobao.org/v8-to-istanbul/download/v8-to-istanbul-4.1.4.tgz", diff --git a/package.json b/package.json index 3baff47..21ed4d6 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,9 @@ "core-js": "^3.6.5", "flyio": "^0.6.2", "regenerator-runtime": "^0.12.1", + "sass": "^1.32.8", + "sass-loader": "^10.1.1", + "uview-ui": "^1.8.3", "vue": "^2.6.11", "vuex": "^3.2.0" }, diff --git a/src/App.vue b/src/App.vue index 8c2b732..69a540e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,6 @@ } - diff --git a/src/main.js b/src/main.js index 7f88dd0..4dbe6fc 100644 --- a/src/main.js +++ b/src/main.js @@ -1,6 +1,7 @@ import Vue from 'vue' import App from './App' - +import uView from "uview-ui"; +Vue.use(uView); Vue.config.productionTip = false App.mpType = 'app' diff --git a/src/manifest.json b/src/manifest.json index 972bd1e..57489e4 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -54,9 +54,10 @@ }, "mp-weixin": { /* 微信小程序特有相关 */ - "appid": "", + "appid": "wx9d48c930e338ad4c", "setting": { - "urlCheck": false + "urlCheck": false, + "enhance": true }, "usingComponents": true }, diff --git a/src/pages.json b/src/pages.json index 1aea851..8b52ddc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,4 +1,7 @@ { + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { "path": "pages/index/index", diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index bd118ba..d1ef61a 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,9 +1,6 @@ @@ -23,27 +20,6 @@ } - diff --git a/src/uni.scss b/src/uni.scss index 845142d..e5c773c 100644 --- a/src/uni.scss +++ b/src/uni.scss @@ -73,4 +73,5 @@ $uni-font-size-title:40rpx; $uni-color-subtitle: #555555; // 二级标题颜色 $uni-font-size-subtitle:36rpx; $uni-color-paragraph: #3F536E; // 文章段落颜色 -$uni-font-size-paragraph:30rpx; \ No newline at end of file +$uni-font-size-paragraph:30rpx; +@import 'uview-ui/theme.scss'; \ No newline at end of file